2612 files changed, 131126 insertions, 104723 deletions

diff --git a/.gitignore b/.gitignore
index efd7b62c2c..e255a15be3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 # git files that we don't want to ignore even it they are dot-files
 #
 !.gitignore
+configs
diff --git a/96boards-b2260-u-boot.yaml b/96boards-b2260-u-boot.yaml
deleted file mode 100644
index 3d16484267..0000000000
--- a/96boards-b2260-u-boot.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-- job:
-    name: 96boards-b2260-u-boot
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - STiH410 B2260 U-Boot'
-    scm:
-        - git:
-            url: https://github.com/cpriouzeau/STi-U-Boot.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out
-              git clean -fdx
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y libssl-dev python-requests
-
-            # Use pre-installed linaro toolchain
-            export PATH="${HOME}/srv/toolchain/arm-tc-16.02/bin:$PATH"
-            export CROSS_COMPILE=arm-linux-gnueabihf-
-
-            make st_b2260_stxh410_sd_defconfig
-            make -j$(getconf _NPROCESSORS_ONLN) CONFIG_STM_ENV_OFFSET=0x1C0000 MEM_MAP=992MB u-boot.bin
-
-            # Publish
-            mkdir out
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            EOF
-
-            cp -a u-boot.bin out/
-            cp -a .config out/u-boot.config
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Build information (textile, for the web view)
-            cat > out/HEADER.textile << EOF
-
-            h4. 96Boards - STiH410 B2260 - U-Boot
-
-            U-Boot development build for STiH410 B2260
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * U-Boot tree: "$GIT_URL":$GIT_URL
-            * U-Boot branch: $GIT_BRANCH
-            * U-Boot commit: $GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/b2260/linaro/u-boot/${BUILD_NUMBER}
-        - trigger-builds:
-            - project:
-                - '96boards-b2260'
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org lee.jones@linaro.org patrice.chotard@linaro.org'
diff --git a/96boards-b2260.yaml b/96boards-b2260.yaml
deleted file mode 100644
index 6c85dc4fa3..0000000000
--- a/96boards-b2260.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-- job:
-    name: 96boards-b2260
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: ROOTFS
-            default: 'alip developer'
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - STiH410 B2260'
-    scm:
-        - git:
-            url: https://github.com/Linaro/rpk.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell:
-            !include-raw: 96boards-b2260/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            #
-            # Publish to the server
-            #
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/b2260/linaro/debian/${BUILD_NUMBER}
-
-            rm -rf out
-        - shell:  |
-            #!/bin/bash -e
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            VERSION=$(date +%Y%m%d)-${BUILD_NUMBER}
-            NFSROOTFS="b2260-stretch_developer_${VERSION}.img.gz"
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${NFSROOTFS}|${NFSROOTFS}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                < configs/96boards-b2260/lava-job-definitions/b2260/template.yaml \
-                > custom_lava_job_definition.yaml
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=b2260
-            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org lee.jones@linaro.org patrice.chotard@linaro.org'
diff --git a/96boards-b2260/boot/b2260/u-bootrom.script b/96boards-b2260/boot/b2260/u-bootrom.script
deleted file mode 100644
index f9b76cfc9d..0000000000
--- a/96boards-b2260/boot/b2260/u-bootrom.script
+++ /dev/null
@@ -1,69 +0,0 @@
-# u-bootrom supports u-boot.2015 commands plus few extras.
-#
-# Extra variables:
-#   script_dev_usb    'usb X.Y'  default usb instance:partition to boot from.
-#   script_dev_mmc    'mmc X.Y'  default mmc instance:partition to boot from.
-#   script_dev        $script_usb|mmc_dev depending on media where boot script was found.
-#   script_fsload     'fatload' or 'ext2load' depending on which was used to load boot script.
-#   dram_base         DDR start address
-#   dram_size         DDR size (in bytes)
-#   load_addr         default load address (DDR start)
-#   board             board id ("b2120", "b2260", ...)
-#
-# Extra commands:
-#   hpen              holding pen reconfiguration and kick support, for SMP boot.
-#   boot_optee        OPTEE specific boot command
-#
-# >
-# > help boot_optee
-#
-#    boot_optee s_entry [s_arg0 [s_arg1 [s_arg2 [s_arg3]]]] ns_entry
-#
-#    - boot a secure and a non secure application
-#    's_entry' is the secure application entry point
-#    's_arg0-3' are the 4 parameters passed to the secure application
-#    'ns_entry' is the non-secure application entry point.
-#               ns_entry has no argument. Secure application is
-#               expected to provide args, if any. Secure expects
-#               only an physical entry point from non secure.
-# >
-# > help hpen
-#
-# hpen prepare <addr> [1stage|2stage]
-#
-#    - prepare a 1stage or a 2stage hpen sequence.
-#      <addr> specifies the address of the hpen kicker to use. hexa.
-#
-# hpen kick hpen|<entrypoint>
-#
-#    - kick the loaded hpen. returns only once cores have all left
-#      the current hpen loop.
-#
-#      <entrypoint> is the target address core shall branch to.
-#
-#      Using string "hpen" allows to enter back to the hpen sequence.
-#      It allows to reprogram a specific hpen setup.
-#
-#     At u-boot entry, secondary boot core are placed in a 1stage hpen
-#     sequence with a local ERAM cell address as hpen kicker: 0x094100A4.
-#     magic value!
-# >
-#
-# Traces considerations:
-#
-# u-bootrom enables silent console. To get some logs from this script one
-# can disable silent mode ("setenv silent;") and re-enable silent mode
-# ("setenv silent 1") in this script.
-# -----------------------------------------------------------------------
-#
-# This is the default install: by default, boot the kernel for current board
-#
-
-script_path="b2260/u-bootrom.script-uboot"
-
-setenv silent;
-echo "[bootscript] boot from $script_path"
-setenv silent 1
-
-$script_fsload $script_dev $load_addr $script_path
-source $load_addr $filesize
diff --git a/96boards-b2260/boot/b2260/u-bootrom.script-kernel b/96boards-b2260/boot/b2260/u-bootrom.script-kernel
deleted file mode 100644
index 6c9c3dfae5..0000000000
--- a/96boards-b2260/boot/b2260/u-bootrom.script-kernel
+++ /dev/null
@@ -1,60 +0,0 @@
-# u-bootrom supports u-boot.2015 commands plus few extras.
-#
-# Extra variables:
-#   script_dev_usb    'usb X.Y'  default usb instance:partition to boot from.
-#   script_dev_mmc    'mmc X.Y'  default mmc instance:partition to boot from.
-#   script_dev        $script_usb|mmc_dev depending on media where boot script was found.
-#   script_fsload     'fatload' or 'ext2load' depending on which was used to load boot script.
-#   dram_base         DDR start address
-#   dram_size         DDR size (in bytes)
-#   load_addr         default load address (DDR start)
-#   board             board id ("b2120", "b2260", ...)
-#
-# Extra commands:
-#   hpen              holding pen reconfiguration and kick support, for SMP boot.
-#   boot_optee        OPTEE specific boot command
-#
-# u-bootrom enables silent console. To get some logs from this script one
-# can disable silent mode ("setenv silent;") and re-enable silent mode
-# ("setenv silent 1") in this script.
-
-# disable silent mode to log kernel boot attempt
-setenv silent;
-
-# images location
-
-fdt_path="stih410-b2260.dtb"
-fdt_addr=0x47000000
-
-kernel_path="uImage"
-kernel_addr=0x60000000
-
-# load images
-echo "[bootscript] loadbooting from $script_dev using $script_fsload"
-
-$script_fsload $script_dev $fdt_addr $fdt_path
-$script_fsload $script_dev $kernel_addr $kernel_path
-
-# boot images
-
-dcache flush;
-
-echo "[bootscript] prepare secondaries in holding pen: kicker at 0x094100A4"
-
-hpen prepare 0x094100A4
-hpen kick hpen
-
-setenv bootargs_sd 'console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m '
-setenv bootargs_usb 'console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/sda2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m '
-
-setenv bootargs $bootargs_sd
-if test "$script_dev" = "$script_dev_usb"; then setenv bootargs $bootargs_usb; fi
-
-setenv fdt_high 0xFFFFFFFF
-
-echo "[bootscript] kernel bootargs:"
-echo $bootargs
-echo
-echo "[bootscript] booting kernel $kernel_addr, fdt $fdt_addr"
-
-bootm $kernel_addr - $fdt_addr
diff --git a/96boards-b2260/boot/b2260/u-bootrom.script-netboot b/96boards-b2260/boot/b2260/u-bootrom.script-netboot
deleted file mode 100644
index 4cc017a7ca..0000000000
--- a/96boards-b2260/boot/b2260/u-bootrom.script-netboot
+++ /dev/null
@@ -1,42 +0,0 @@
-# u-bootrom supports u-boot.2015 commands plus few extras.
-#
-# Extra variables:
-#   script_dev_usb    'usb X.Y'  default usb instance:partition to boot from.
-#   script_dev_mmc    'mmc X.Y'  default mmc instance:partition to boot from.
-#   script_dev        $script_usb|mmc_dev depending on media where boot script was found.
-#   script_fsload     'fatload' or 'ext2load' depending on which was used to load boot script.
-#   dram_base         DDR start address
-#   dram_size         DDR size (in bytes)
-#   load_addr         default load address (DDR start)
-#   board             board id ("b2120", "b2260", ...)
-#
-# Extra commands:
-#   hpen              holding pen reconfiguration and kick support, for SMP boot.
-#   boot_optee        OPTEE specific boot command
-#
-# u-bootrom enables silent console. To get some logs from this script one
-# can disable silent mode ("setenv silent;") and re-enable silent mode
-# ("setenv silent 1") in this script.
-
-# disable silent mode to log where we attemp to boot from
-setenv silent;
-
-# images location
-
-setenv serverip 'X.X.X.X'
-
-script_path="boot_network_${board}.scr"
-
-# load images
-
-echo "[bootscript] fetching $script_path from tftp:$serverip"
-
-setenv autoload no
-dhcp
-tftp $load_addr $script_path
-
-# boot images
-
-echo "[bootscript] script found, source it."
-
-source $load_addr
diff --git a/96boards-b2260/boot/b2260/u-bootrom.script-uboot b/96boards-b2260/boot/b2260/u-bootrom.script-uboot
deleted file mode 100644
index 5420661622..0000000000
--- a/96boards-b2260/boot/b2260/u-bootrom.script-uboot
+++ /dev/null
@@ -1,39 +0,0 @@
-# u-bootrom supports u-boot.2015 commands plus few extras.
-#
-# Extra variables:
-#   script_dev_usb    'usb X.Y'  default usb instance:partition to boot from.
-#   script_dev_mmc    'mmc X.Y'  default mmc instance:partition to boot from.
-#   script_dev        $script_usb|mmc_dev depending on media where boot script was found.
-#   script_fsload     'fatload' or 'ext2load' depending on which was used to load boot script.
-#   dram_base         DDR start address
-#   dram_size         DDR size (in bytes)
-#   load_addr         default load address (DDR start)
-#   board             board id ("b2120", "b2260", ...)
-#
-# Extra commands:
-#   hpen              holding pen reconfiguration and kick support, for SMP boot
-#   load_optee        OPTEE specific formated image intallation command
-#   boot_optee        OPTEE specific boot command
-#
-# u-bootrom enables silent console. To get some logs from this script one
-# can disable silent mode ("setenv silent;") and re-enable silent mode
-# ("setenv silent 1") in this script.
-
-# u-boot shall be loaded 10MB before the begining of the last 32MB of the DDR.
-setexpr.l uboot_addr $dram_base + $dram_size
-setexpr.l uboot_addr $uboot_addr - 0x02000000
-setexpr.l uboot_addr $uboot_addr - 0x00A00000
-uboot_path="$board/u-boot.bin"
-
-# load images
-
-$script_fsload $script_dev $uboot_addr $uboot_path
-
-# boot images
-
-dcache flush;
-
-hpen prepare 0x094100A4
-hpen kick hpen
-
-go $uboot_addr
diff --git a/96boards-b2260/boot/b2260/uEnv_sd.txt b/96boards-b2260/boot/b2260/uEnv_sd.txt
deleted file mode 100644
index 498e9f528f..0000000000
--- a/96boards-b2260/boot/b2260/uEnv_sd.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-# Init kernel and fdt config
-fdt_high=0xFFFFFFFF
-fdt_file=stih410-b2260.dtb
-fdt_load_addr=0x47000000
-kernel_file=uImage
-kernel_load_addr=0x60000000
-
-# Init device settings
-device_part=0:1
-
-# Init error message when filesystem load or read fails
-read_error_message=echo <ERROR> Unable to read \${part} filesystem on mmc at ${device_part} partition
-load_error_message=echo <ERROR> ${file} not available on mmc at ${device_part} partition
-
-# Check device interface availability and run load action if ok
-read_from_device=if \${part}ls mmc ${device_part}; then run load_kernel; else run read_error_message; fi
-
-# Load kernel and fdt, then launch boot action if ok
-load_kernel=if \${part}load mmc ${device_part} ${kernel_load_addr} ${kernel_file}; then run load_fdt ; else setenv file ${kernel_file}; run load_error_message; fi
-load_fdt=if \${part}load mmc ${device_part} ${fdt_load_addr} ${fdt_file}; then run run_boot; else setenv file ${fdt_file}; run load_error_message; fi
-
-# Check ethaddr and set it for kernel
-check_ethaddr=if test "x$ethaddr" = "x"; then echo <INFO> Set ethaddr...; readmac; if test "x$ethaddr" = "x"; then askenv ethaddr; fi; fi
-
-# Set bootargs and then boot
-run_boot=setenv bootargs console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m ; bootm ${kernel_load_addr} - ${fdt_load_addr}
-
-# Set boot command
-bootcmd=run check_ethaddr; echo <INFO> Load kernel and fdt to RAM...; run read_from_device
-
-boot
diff --git a/96boards-b2260/boot/update_default_boot.sh b/96boards-b2260/boot/update_default_boot.sh
deleted file mode 100644
index 18a18fe96a..0000000000
--- a/96boards-b2260/boot/update_default_boot.sh
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash
-#===============================================================================
-#
-#          FILE: update_default_boot.sh
-#
-#         USAGE: ./update_default_boot.sh [TYPE]
-#         [TYPE]: kernel, uboot, optee, netboot
-#
-#        AUTHOR: Christophe Priouzeau
-#  ORGANIZATION: STMicroelectronics
-#     COPYRIGHT: Copyright (C) 2016, STMicroelectronics - All Rights Reserved
-#       CREATED: 08/23/2016 11:53
-#===============================================================================
-_DEFAULT_BOOTSCRIPT=u-bootrom.script
-_DEFAULT_TYPE=kernel
-
-_TYPE=
-
-usage() {
-    echo "Usage:"
-    echo "  $1 <type>"
-    echo "  type: type of boot can be \"kernel\", \"uboot\" or \"optee\" or \"netboot\""
-    echo ""
-}
-parse_argument() {
-    case $1 in
-    kernel)
-        _TYPE=kernel
-        ;;
-    uboot)
-        _TYPE=uboot
-        ;;
-    optee)
-        _TYPE=optee_uboot
-        ;;
-    netboot)
-        _TYPE=netboot
-        ;;
-    esac
-}
-
-ask_tftp_ip_address() {
-    IP_ETH0=`ifconfig eth0 | awk '/inet addr/{print substr($2,6)}'`
-    echo "Please enter the IP address of your TFTP server [$IP_ETH0]: "
-    read _ip
-
-    if [ -z "$_ip" ];
-    then
-        #use ip address of eth0
-        IP_ADDRESS=$IP_ETH0
-    else
-        echo "Would you like to use this IP address '$_ip' ? [Y/n] "
-        read answer
-        if [ -z "$answer" ]
-        then
-            # yes selected
-            IP_ADDRESS=$_ip
-        elif (echo -n $answer | grep -q -e "^[yY][a-zA-Z]*$")
-        then
-            # yes selected
-            IP_ADDRESS=$_ip
-        else
-            echo "[EXIT] you don't validate the ip address entered."
-            echo ""
-            exit 1
-        fi
-    fi
-}
-# -----------------------------------
-# Parse option
-
-case $# in
-0)
-    parse_argument kernel
-    ;;
-1)
-    case $1 in
-    -h|--help)
-        usage $1
-        exit 1
-        ;;
-    kernel|uboot|optee|netboot)
-        parse_argument $1
-        shift
-        ;;
-    *)
-        usage $1
-        exit 1
-        ;;
-    esac
-
-    ;;
-*)
-    #error
-    usage $1
-    exit 1
-    ;;
-esac
-
-if [ -z $_TYPE ];
-then
-    echo "FORCE type of boot to : $_DEFAULT_TYPE"
-    _TYPE=$_DEFAULT_TYPE
-fi
-
-echo ""
-echo " Type of boot:            $_TYPE"
-echo ""
-
-if [ "$_TYPE" == "netboot" ];
-then
-    ask_tftp_ip_address
-    echo "IP ADDRESS $IP_ADDRESS"
-fi
-
-# generate script of mkimage
-#for f in `find . -name *.script -print`;
-#do
-#    filename="$f"
-#    mkimage -A arm -T script -C none -n "Open SDK Boot Script" -d $f ${filename%.*}.scr > /dev/null
-#done
-
-for d in `find . -maxdepth 1 -type d | grep "./" | sort`;
-do
-    BOOTSCRIPT_ROOT=`basename $d`
-    if [ -f $d/$_DEFAULT_BOOTSCRIPT ];
-    then
-        # apply default configuration
-        if [ -f $d/$_DEFAULT_BOOTSCRIPT-$_TYPE ];
-        then
-            echo "INFO: update $BOOTSCRIPT_ROOT/$_DEFAULT_BOOTSCRIPT script"
-            sed -i 's#\(script_path=\".*/'"$_DEFAULT_BOOTSCRIPT"'\).*$#\1-$_TYPE\"#g' $d/$_DEFAULT_BOOTSCRIPT
-            if [ "$_TYPE" == "netboot" ];
-            then
-                if [ -f $d/$_DEFAULT_BOOTSCRIPT-$_TYPE ];
-                then
-                    sed -i 's#setenv serverip '\(.*\)'#setenv serverip '$IP_ADDRESS'#g' $d/$_DEFAULT_BOOTSCRIPT-$_TYPE
-                fi
-            fi
-        else
-            echo "ERROR: missing '$_DEFAULT_BOOTSCRIPT-$_TYPE' in $BOOTSCRIPT_ROOT folder."
-            echo "ERROR: skip update in $BOOTSCRIPT_ROOT/$_DEFAULT_BOOTSCRIPT script"
-        fi
-    else
-        echo "ERROR: missing '$_DEFAULT_BOOTSCRIPT' in $BOOTSCRIPT_ROOT folder"
-        echo "ERROR: cannot update default boot for $BOOTSCRIPT_ROOT folder"
-    fi
-done
diff --git a/96boards-b2260/builders.sh b/96boards-b2260/builders.sh
deleted file mode 100755
index 598b777743..0000000000
--- a/96boards-b2260/builders.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  cd ${WORKSPACE}
-  sudo umount boot rootfs || true
-  sudo kpartx -dv out/b2260-stretch_*.img || true
-  sudo rm -rf boot rootfs || true
-  rm -rf lci-build-tools
-  rm -rf builddir*
-  sudo git clean -fdx --exclude=out
-}
-
-#
-# Pull required tooling into Docker container
-#
-sudo apt-get -q=2 update
-sudo apt-get -q=2 install -y kpartx python-requests linaro-image-tools
-
-export LANG=C
-export make_bootwrapper=false
-export make_install=true
-export kernel_flavour=multi-v7
-export use_config_fragment=1
-export conf_filenames="arch/arm/configs/multi_v7_defconfig arch/arm/configs/bluetooth_6lowpan.conf"
-export MAKE_DTBS=true
-export tcbindir="${HOME}/srv/toolchain/arm-tc-16.02/bin"
-export toolchain_url=http://releases.linaro.org/components/toolchain/binaries/5.3-2016.02/arm-linux-gnueabihf/gcc-linaro-5.3-2016.02-x86_64_arm-linux-gnueabihf.tar.xz
-
-# Enable bluetooth 6lowpan
-cat << EOF > arch/arm/configs/bluetooth_6lowpan.conf
-CONFIG_6LOWPAN=m
-CONFIG_6LOWPAN_DEBUGFS=y
-CONFIG_IEEE802154=m
-CONFIG_IEEE802154_NL802154_EXPERIMENTAL=y
-CONFIG_IEEE802154_6LOWPAN=m
-CONFIG_MAC802154=m
-CONFIG_BT_BNEP=m
-CONFIG_BT_BNEP_MC_FILTER=y
-CONFIG_BT_BNEP_PROTO_FILTER=y
-CONFIG_BT_6LOWPAN=m
-CONFIG_IEEE802154_FAKELB=m
-CONFIG_IEEE802154_AT86RF230=m
-CONFIG_IEEE802154_AT86RF230_DEBUGFS=y
-CONFIG_IEEE802154_MRF24J40=m
-CONFIG_IEEE802154_CC2520=m
-CONFIG_IEEE802154_ATUSB=m
-EOF
-
-rm -rf configs lci-build-tools
-git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-wget -q http://snapshots.linaro.org/96boards/b2260/linaro/u-boot/latest/u-boot.bin \
-     -O configs/96boards-b2260/boot/b2260/u-boot.bin
-bash -x lci-build-tools/jenkins_kernel_build_inst
-rm -rf out/dtbs
-cp -a linux-*.deb out/
-cp -a configs/96boards-b2260/boot out/
-
-mkimage -A arm -O linux -C none -T kernel -a 0x40080000 -e 0x40080000 -n Linux -d out/zImage out/uImage
-
-#
-# Create the hardware pack
-#
-cp -a configs/96boards-b2260/hwpacks/linaro-b2260 .
-
-VERSION=$(date +%Y%m%d)-${BUILD_NUMBER}
-linaro-hwpack-create --debug linaro-b2260 ${VERSION}
-linaro-hwpack-replace -t `ls hwpack_linaro-b2260_*_armhf_supported.tar.gz` -p `ls linux-image-*-linaro-multi-v7_*.deb` -r linux-image -d -i
-linaro-hwpack-replace -t `ls hwpack_linaro-b2260_*_armhf_supported.tar.gz` -p `ls linux-headers-*-linaro-multi-v7_*.deb` -r linux-headers -d -i
-
-#
-# Generate build information
-#
-cat > out/HEADER.textile << EOF
-
-h4. 96boards STiH410 B2260 - CE Debian
-
-Build description:
-* Build URL: "${BUILD_URL}":${BUILD_URL}
-* Kernel tree: "${GIT_URL}":${GIT_URL}
-* Kernel branch: ${GIT_BRANCH}
-* Kernel commit: "${GIT_COMMIT}":https://github.com/Linaro/rpk/commit/${GIT_COMMIT}
-* Kernel config: multi_v7_defconfig
-EOF
-
-for rootfs in ${ROOTFS}; do
-  # Get rootfs
-  export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/stretch-armhf-rootfs/label=docker-jessie-armhf,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-  export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/stretch-armhf-rootfs/label=docker-jessie-armhf,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-  export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/stretch/${rootfs}-armhf/${ROOTFS_BUILD_NUMBER}/linaro-stretch-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-  wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-  cat >> out/HEADER.textile << EOF
-* Rootfs (${rootfs}): "${rootfs}":http://snapshots.linaro.org/debian/images/stretch/${rootfs}-armhf/${ROOTFS_BUILD_NUMBER}
-EOF
-
-  # Create pre-built image(s)
-  linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file b2260-stretch_${rootfs}_${VERSION}.img --image-size 3G --binary linaro-stretch-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-b2260_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-  # Customize image(s)
-  mkdir -p boot rootfs
-  for device in $(sudo kpartx -avs out/b2260-stretch_${rootfs}_${VERSION}.img | cut -d' ' -f3); do
-    partition=$(echo ${device} | cut -d'p' -f3)
-    [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-    [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-  done
-
-  sudo cp -a configs/96boards-b2260/boot/b2260 boot/ || true
-  sudo cp -a configs/96boards-b2260/boot/update_default_boot.sh boot/ || true
-  sudo cp -a out/uImage boot/ || true
-
-  sudo rm -rf rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
-  sudo mkdir rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
-
-  sudo umount boot rootfs
-  sudo kpartx -dv out/b2260-stretch_*.img
-
-  # Compress image(s)
-  gzip -9 out/b2260-stretch_${rootfs}_${VERSION}.img
-done
-
-# Create MD5SUMS file
-find out -type f | xargs md5sum > MD5SUMS.txt
-sed -i "s|out/||" MD5SUMS.txt
-mv MD5SUMS.txt out
diff --git a/96boards-b2260/hwpacks/linaro-b2260 b/96boards-b2260/hwpacks/linaro-b2260
deleted file mode 100644
index 0d67de0204..0000000000
--- a/96boards-b2260/hwpacks/linaro-b2260
+++ /dev/null
@@ -1,44 +0,0 @@
-format: '3.0'
-name: linaro-b2260
-architectures:
-- armhf
-origin: Linaro
-maintainer: Linaro Platform <linaro-dev@lists.linaro.org>
-support: supported
-serial_tty: ttyAS0
-kernel_addr: '0x60000000'
-initrd_addr: '0x00000000'
-load_addr: '0x40000000'
-dtb_addr: '0x47000000'
-partition_layout: bootfs_rootfs
-mmc_id: '0:1'
-kernel_file: boot/vmlinuz-*-multi-v7
-initrd_file: boot/initrd.img-*-multi-v7
-dtb_file: lib/firmware/*-multi-v7/device-tree/stih410-b2260.dtb
-boot_script: boot.scr
-boot_min_size: 32
-extra_serial_options:
-- console=tty0
-- console=ttyAS0,115200n8
-assume_installed:
-- adduser
-- apt
-- apt-utils
-- debconf-i18n
-- debian-archive-keyring
-- gcc-6
-- gnupg
-- ifupdown
-- initramfs-tools
-- iproute2
-- irqbalance
-- isc-dhcp-client
-- kmod
-- netbase
-- udev
-packages:
-- linux-image-armmp
-- linux-headers-armmp
-sources:
-  debian: http://http.debian.net/debian/ stretch main
-  repo: http://repo.linaro.org/ubuntu/linaro-overlay stretch main
diff --git a/96boards-b2260/lava-job-definitions/b2260/template.yaml b/96boards-b2260/lava-job-definitions/b2260/template.yaml
deleted file mode 100644
index df915f63f5..0000000000
--- a/96boards-b2260/lava-job-definitions/b2260/template.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-device_type: b2260
-job_name: '96boards-b2260'
-
-timeouts:
-  job:
-    minutes: 10
-  action:
-    minutes: 5
-  connection:
-    minutes: 2
-
-priority: medium
-visibility: public
-
-actions:
-- deploy:
-    timeout:
-      minutes: 4
-    to: tftp
-    os: debian
-    kernel:
-      url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/uImage'
-      type: uimage
-    dtb:
-      url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/stih410-b2260.dtb'
-    nfsrootfs:
-      url: 'https://snapshots.linaro.org/96boards/b2260/linaro/debian/${BUILD_NUMBER}/${NFSROOTFS}'
-      compression: gz
-
-- boot:
-    method: u-boot
-    commands: nfs
-    prompts:
-    - 'linaro-test'
-    - 'root@debian:~#'
-    - '/ #'
-
-- test:
-    timeout:
-      minutes: 5
-    definitions:
-    - repository: http://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/smoke/smoke.yaml
-      name: smoke-tests
-
-metadata:
-  build-url: ${BUILD_URL}
-  build-log: ${BUILD_URL}consoleText
-  git-url: https://github.com/Linaro/rpk.git
-  git-commit: ${GIT_COMMIT}
diff --git a/96boards-bubblegum-kernel.yaml b/96boards-bubblegum-kernel.yaml
deleted file mode 100644
index fd7182b31c..0000000000
--- a/96boards-bubblegum-kernel.yaml
+++ /dev/null
@@ -1,131 +0,0 @@
-- job:
-    name: 96boards-bubblegum-kernel
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'bubblegum96-3.10'
-        - string:
-            name: KERNEL_CONFIG
-            default: 'owl_evb_linux_hdmi_defconfig'
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - Actions Semi Bubblegum - Linux Kernel'
-    scm:
-        - git:
-            url: https://github.com/96boards-bubblegum/linux.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            sudo apt-get update
-            sudo apt-get install -y ccache python-requests
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=bubblegum
-            export kernel_config="${KERNEL_CONFIG}"
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-
-            # Export the kernel packaging version
-            kernel_version=`make kernelversion`
-            kernel_release=${kernel_version}-linaro-${kernel_flavour}
-            export KDEB_PKGVERSION="${kernel_release}-${BUILD_NUMBER}"
-
-            # Build the kernel
-            rm -rf lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            # Final preparation for publishing
-            cp -a *.dsc *.changes *.deb out/
-            cp linux*orig.tar.gz out/
-
-            # Create MD5SUMS file
-            (cd out && md5sum *.tar.gz *.deb > MD5SUMS.txt)
-
-            cat > out/HEADER.textile << EOF
-
-            h4. 96Boards - Actions Semi Bubblegum - Kernel
-
-            Linux Kernel development build for Actions Semi Bubblegum
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Kernel tree: "$GIT_URL":$GIT_URL
-            * Kernel branch: $KERNEL_BRANCH
-            * Kernel version: $kernel_version
-            * Kernel release: $kernel_release
-            * Kernel deb version: $KDEB_PKGVERSION
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/bubblegum/linaro/linux/${BUILD_NUMBER}/
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Create post-build parameters (useful for other jobs)
-            cat << EOF >> post_build_parameters
-            KERNEL_VERSION=${kernel_version}
-            KERNEL_RELEASE=${kernel_release}
-            KDEB_PKGVERSION=${KDEB_PKGVERSION}
-            EOF
-        - inject:
-            properties-file: post_build_parameters
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org daniel.thompson@linaro.org'
diff --git a/96boards-bubblegum-u-boot.yaml b/96boards-bubblegum-u-boot.yaml
deleted file mode 100644
index 08ffc563ea..0000000000
--- a/96boards-bubblegum-u-boot.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-- job:
-    name: 96boards-bubblegum-u-boot
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - uCRobotics Bubblegum-96 U-Boot'
-    scm:
-        - git:
-            url: https://github.com/96boards-bubblegum/u-boot.git
-            refspec: +refs/heads/bubblegum96-2015.07:refs/remotes/origin/bubblegum96-2015.07
-            name: origin
-            branches:
-                - refs/heads/bubblegum96-2015.07
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out
-              git clean -fdx
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y libssl-dev python-requests
-
-            # Use pre-installed linaro toolchain
-            export PATH="${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-            export CROSS_COMPILE="aarch64-linux-gnu-"
-
-            make s900_96board_defconfig
-            make -j$(getconf _NPROCESSORS_ONLN) u-boot-dtb.img
-
-            # Publish
-            mkdir out
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            EOF
-
-            cp -a u-boot-dtb.img out/
-            cp -a .config out/u-boot.config
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Build information (textile, for the web view)
-            cat > out/HEADER.textile << EOF
-
-            h4. 96Boards - uCRobotics Bubblegum-96 - U-Boot
-
-            U-Boot development build for uCRobotics Bubblegum-96
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * U-Boot tree: "$GIT_URL":$GIT_URL
-            * U-Boot branch: $GIT_BRANCH
-            * U-Boot commit: $GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/bubblegum/linaro/u-boot/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org daniel.thompson@linaro.org'
diff --git a/96boards-bubblegum.yaml b/96boards-bubblegum.yaml
deleted file mode 100644
index b57aa018ca..0000000000
--- a/96boards-bubblegum.yaml
+++ /dev/null
@@ -1,182 +0,0 @@
-- job:
-    name: 96boards-bubblegum
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: ROOTFS
-            default: 'alip developer'
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - uCRobotics Bubblegum-96'
-    scm:
-        - git:
-            url: https://github.com/96boards-bubblegum/linux.git
-            refspec: +refs/heads/bubblegum96-3.10:refs/remotes/origin/bubblegum96-3.10
-            name: origin
-            branches:
-                - refs/heads/bubblegum96-3.10
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv out/bubblegum-jessie_*.img || true
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y kpartx python-requests
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb \
-              http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/m/multipath-tools/kpartx_0.5.0-7ubuntu7.1_amd64.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=bubblegum
-            export kernel_config=owl_evb_linux_hdmi_defconfig
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-14.09/bin"
-            export toolchain_url=http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-            rm -rf out/dtbs
-            cp -a linux-*.deb out/
-
-            # Create the hardware pack
-            cp -a configs/96boards-bubblegum/hwpacks/linaro-bubblegum .
-
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug linaro-bubblegum ${VERSION}
-            linaro-hwpack-replace -t `ls hwpack_linaro-bubblegum_*_arm64_supported.tar.gz` -p `ls linux-image-*-linaro-bubblegum_*.deb` -r linux-image -d -i
-            linaro-hwpack-replace -t `ls hwpack_linaro-bubblegum_*_arm64_supported.tar.gz` -p `ls linux-headers-*-linaro-bubblegum_*.deb` -r linux-headers -d -i
-
-            cat > out/HEADER.textile << EOF
-            Build information:
-            * build: "${BUILD_URL}":${BUILD_URL}
-            * git URL: "${GIT_URL}":${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            EOF
-
-            for rootfs in ${ROOTFS}; do
-              # Get rootfs
-              export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-              export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-              wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-              cat >> out/HEADER.textile << EOF
-            * rootfs (${rootfs}): "${rootfs}":http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
-            EOF
-
-              # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file bubblegum-jessie_${rootfs}_${VERSION}.img --image-size 2G --binary linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-bubblegum_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-              # Create eMMC rootfs image(s)
-              mkdir boot rootfs
-              for device in $(sudo kpartx -avs out/bubblegum-jessie_${rootfs}_${VERSION}.img | cut -d' ' -f3); do
-                partition=$(echo ${device} | cut -d'p' -f3)
-                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} boot
-                [ "${partition}" = "3" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-              done
-
-               cat << EOF | sudo tee rootfs/etc/modprobe.d/blacklist-pvrsrvkm.conf
-            blacklist pvrsrvkm
-            EOF
-
-               cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/SYSTEM / ext4 errors=remount-ro 0 1
-            EOF
-
-              sudo rm -rf rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
-              sudo mkdir rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
-
-              sudo mkfs.ext4 -L rootfs out/bubblegum-jessie_${rootfs}_${VERSION}.emmc.img.ext4 2G
-              mkdir rootfs-ext4
-              sudo mount -o loop out/bubblegum-jessie_${rootfs}_${VERSION}.emmc.img.ext4 rootfs-ext4
-              sudo cp -a rootfs/* rootfs-ext4
-              sudo umount boot rootfs rootfs-ext4
-              sudo kpartx -dv out/bubblegum-jessie_${rootfs}_${VERSION}.img
-              sudo ext2simg -v out/bubblegum-jessie_${rootfs}_${VERSION}.emmc.img.ext4 out/bubblegum-jessie_${rootfs}_${VERSION}.emmc.img
-              sudo rm -rf boot rootfs rootfs-ext4 out/*.ext4
-
-              # Compress image(s)
-              gzip -9 out/bubblegum-jessie_${rootfs}_${VERSION}.emmc.img
-              gzip -9 out/bubblegum-jessie_${rootfs}_${VERSION}.img
-            done
-
-            # Create boot image(s)
-            cat > boot.txt << EOF
-            setenv initrd_high "0xffffffffffffffff"
-            setenv fdt_high "0xffffffffffffffff"
-            setenv bootpart "2"
-            setenv bootcmd "fatload mmc 1:2 0x00080000 Image; fatload mmc 1:2 0x01ffffc0 uInitrd; fatload mmc 1:2 0x10000000 s900_96board.dtb; booti 0x00080000 0x01ffffc0 0x10000000"
-            setenv bootargs "console=tty0 console=ttyS5,115200n8 root=/dev/disk/by-partlabel/SYSTEM rootwait rw"
-            run bootcmd
-            boot
-            EOF
-
-            mkdir boot-fat
-
-            dd if=/dev/zero of=out/boot.emmc.img bs=512 count=102400
-            /sbin/mkfs.fat -F32 -n "BOOT" out/boot.emmc.img
-            sudo mount -o loop,rw,sync out/boot.emmc.img boot-fat
-            sudo cp -a out/Image out/s900_96board.dtb boot-fat/ || true
-            sudo mkimage -A arm64 -O linux -C none -T ramdisk -a 0 -e 0 -n "initramfs" -d out/initrd.img-* boot-fat/uInitrd || true
-            sudo mkimage -A arm -O linux -C none -T script -a 0 -e 0 -n "boot script" -d boot.txt boot-fat/boot.scr || true
-            sudo umount boot-fat
-            sudo chmod 777 out/boot.emmc.img
-
-            rm -rf boot-fat
-
-            # Compress boot partition image(s)
-            gzip -9 out/boot.emmc.img
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/bubblegum/linaro/debian/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org daniel.thompson@linaro.org'
diff --git a/96boards-dragonboard-aosp-master/builders.sh b/96boards-dragonboard-aosp-master/builders.sh
new file mode 100755
index 0000000000..bb3e94bb0a
--- /dev/null
+++ b/96boards-dragonboard-aosp-master/builders.sh
@@ -0,0 +1,37 @@
+# Early test
+if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
+  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
+  echo "in android-build-configs.git"
+  exit 1
+fi
+
+# Cleanup sources from other builds
+cd build
+rm -rf out art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ clang-src/
+cd -
+
+# Build Android
+build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
+cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
+
+cd build/out
+for image in "boot.img" "system.img" "userdata.img"  "cache.img"; do
+  if [ -f ${image} ]; then
+    echo "Compressing ${image}"
+    xz ${image}
+  fi
+done
+cd -
+
+rm -rf build/out/BUILD-INFO.txt
+wget https://git.linaro.org/ci/job/configs.git/plain/android-lcr/generic/build-info/public-template.txt -O build/out/BUILD-INFO.txt
+
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_SRC=${PWD}/build/out
+PUB_EXTRA_INC=^[^/]+zip
+EOF
+
+# Delete sources after build to save space
+cd build
+rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* .repo/local_manifests
+cd -
diff --git a/96boards-dragonboard410c-android.yaml b/96boards-dragonboard410c-android.yaml
index 20181f2ffb..79eaafc70d 100644
--- a/96boards-dragonboard410c-android.yaml
+++ b/96boards-dragonboard410c-android.yaml
@@ -9,7 +9,7 @@
         - authorization:
             anonymous:
                 - job-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     parameters:
@@ -22,8 +22,8 @@
         - string:
             name: USERDATA_OVERLAY_URL
             default: http://snapshots.linaro.org/96boards/dragonboard410c/binaries/20160523/userdata.tar.bz2
-    disabled: false
-    node: docker-utopic-aosp
+    disabled: true
+    node: docker-xenial-aosp
     display-name: '96boards - DragonBoard 410c (Android)'
     concurrent: true
     wrappers:
@@ -164,7 +164,7 @@
             artifacts: '*.xml'
             latest-only: true
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
diff --git a/96boards-dragonboard410c-aosp-master.yaml b/96boards-dragonboard410c-aosp-master.yaml
index 434e184b05..1b94a3d3df 100644
--- a/96boards-dragonboard410c-aosp-master.yaml
+++ b/96boards-dragonboard410c-aosp-master.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -21,12 +21,18 @@
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
-    disabled: false
+        - string:
+            name: BUILD_DIR
+            default: 'aosp-master'
+        - string:
+            name: PUB_DEST
+            default: '96boards/dragonboard410c/linaro/aosp-master/${BUILD_NUMBER}'
+    disabled: true
     node: docker-xenial-aosp
     display-name: '96boards - AOSP Master - dragonboard410c'
     concurrent: true
     triggers:
-        - timed : '@daily'
+        - timed : '@weekly'
     wrappers:
         - timestamps
         - timeout:
@@ -48,7 +54,7 @@
         - shell:
             !include-raw:
                 - android-lcr/common/builders.sh
-                - 96boards-dragonboard410c-aosp-master/builders.sh
+                - 96boards-dragonboard-aosp-master/builders.sh
         - inject:
             properties-file: publish_parameters
         - linaro-publish-token
@@ -60,10 +66,10 @@
             artifacts: '*.xml,*.json'
             latest-only: true
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
             files: 'build/fingerprints/*'
         - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org nicolas.dechesne@linaro.org todor.tomov@linaro.org'
+            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org nicolas.dechesne@linaro.org amit.pundir@linaro.org loic.poulain@linaro.org'
diff --git a/96boards-dragonboard410c-aosp-master/builders.sh b/96boards-dragonboard410c-aosp-master/builders.sh
deleted file mode 100755
index b1ee6dcc72..0000000000
--- a/96boards-dragonboard410c-aosp-master/builders.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-# Early test
-if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-  echo "in android-build-configs.git"
-  exit 1
-fi
-
-# Clean android-patchsets and repositories in device
-rm -rf build/out build/android-patchsets build/device
-
-# Build Android
-build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
-
-cd build/out
-for image in "boot.img" "system.img" "userdata.img"  "cache.img"; do
-  if [ -f ${image} ]; then
-    echo "Compressing ${image}"
-    xz ${image}
-  fi
-done
-cd -
-
-rm -rf build/out/BUILD-INFO.txt
-wget https://git.linaro.org/ci/job/configs.git/plain/android-lcr/generic/build-info/public-template.txt -O build/out/BUILD-INFO.txt
-
-cat << EOF > ${WORKSPACE}/publish_parameters
-PUB_DEST=96boards/dragonboard410c/linaro/aosp-master/${BUILD_NUMBER}
-PUB_SRC=${PWD}/build/out
-PUB_EXTRA_INC=^[^/]+zip
-EOF
-
-# Delete sources after build to save space
-cd build
-rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* .repo/local_manifests
-cd -
diff --git a/96boards-dragonboard845c-aosp-master.yaml b/96boards-dragonboard845c-aosp-master.yaml
new file mode 100644
index 0000000000..ec9f68716b
--- /dev/null
+++ b/96boards-dragonboard845c-aosp-master.yaml
@@ -0,0 +1,76 @@
+- job:
+    name: 96boards-dragonboard845c-aosp-master
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: BUILD_CONFIG_FILENAME
+            default: 'dragonboard845c-aosp-master'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: BUILD_DIR
+            default: 'aosp-master'
+        - string:
+            name: PUB_DEST
+            default: '96boards/dragonboard845c/linaro/aosp-master/${BUILD_NUMBER}'
+    disabled: false
+    node: docker-focal-aosp
+    display-name: '96boards - AOSP Master - dragonboard845c'
+    concurrent: true
+    triggers:
+        - timed : '@daily'
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: ARTIFACTORIAL_TOKEN
+                variable: ARTIFACTORIAL_TOKEN
+            - text:
+                credential-id: AP_SSID
+                variable: AP_SSID
+            - text:
+                credential-id: AP_KEY
+                variable: AP_KEY
+            # needed to publish to snapshots
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw:
+                - android-lcr/common/builders.sh
+                - 96boards-dragonboard845c-aosp-master/builders.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+    publishers:
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org amit.pundir@linaro.org'
diff --git a/96boards-dragonboard845c-aosp-master/builders.sh b/96boards-dragonboard845c-aosp-master/builders.sh
new file mode 100644
index 0000000000..eeb1d01943
--- /dev/null
+++ b/96boards-dragonboard845c-aosp-master/builders.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+
+# Here is for packages not listed by the source.android.com site below.
+# But the following packages might not be really necessary,
+# as the docker image for docker-focal-aosp labelled nodes is linaro/jenkins-amd64-ubuntu:focal
+# which is defined here: https://git.linaro.org/infrastructure/ci-yadp-builder.git/tree/docker_templates_aosp_amd64.yml#n2
+# And the packages listed here might be already defined there.
+sudo apt-get install -y --allow-change-held-packages wget sudo python3 python-is-python3 openjdk-11-jdk-headless
+java -version
+
+## https://source.android.com/docs/setup/start/requirements#hardware-requirements
+sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev libc6-dev-i386 libncurses5 x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
+
+## keep the same package as listed here before
+sudo apt-get install -y python-mako gperf time genisoimage patch mtools rsync liblz4-tool lzop libssl-dev libdrm-intel1 python3-pip
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+java -version
+
+BUILD_DIR=aosp-master/build
+if [ ! -d "/home/buildslave/srv/${BUILD_DIR}" ]; then
+  sudo mkdir -p /home/buildslave/srv/${BUILD_DIR}
+  sudo chmod 777 /home/buildslave/srv/${BUILD_DIR}
+fi
+cd /home/buildslave/srv/${BUILD_DIR}
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+repo init -u https://android.googlesource.com/platform/manifest -b main --repo-branch=master --no-repo-verify
+repo sync -j$(nproc) -c -f
+./device/linaro/dragonboard/fetch-vendor-package.sh
+rm -rf build-info
+source build/envsetup.sh
+lunch db845c-trunk_staging-userdebug
+make -j$(nproc)
+repo manifest -r -o out/target/product/db845c/pinned-manifest.xml
+
+wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O ${PWD}/out/target/product/db845c/BUILD-INFO.txt
+
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_DEST=96boards/dragonboard845c/linaro/aosp-master/${BUILD_NUMBER}
+PUB_SRC=${PWD}/out/target/product/db845c/
+PUB_EXTRA_INC=^[^/]+\.(dtb|dtbo|zip)$|MLO|vmlinux|System.map
+EOF
diff --git a/96boards-grub-efi-arm64.yaml b/96boards-grub-efi-arm64.yaml
deleted file mode 100644
index 5c75bd81fe..0000000000
--- a/96boards-grub-efi-arm64.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-- job:
-    name: 96boards-grub-efi-arm64
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: '96boards - GRUB EFI'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends grub-efi-arm64-bin python-requests
-
-            mkdir out
-
-            cat << EOF > out/grub.configfile
-            search.fs_label boot root
-            set prefix=(\$root)'/EFI/BOOT'
-            configfile \$prefix/grub.cfg
-            EOF
-
-            grub-mkimage \
-              --verbose \
-              --config=out/grub.configfile \
-              --output=out/grubaa64.efi \
-              --format=arm64-efi \
-              boot chain configfile efinet ext2 fat gettext help linux loadenv lsefi normal part_gpt part_msdos read search search_fs_file search_fs_uuid search_label terminal terminfo tftp time
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/hikey/linaro/grub/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/96boards-helium-u-boot.yaml b/96boards-helium-u-boot.yaml
deleted file mode 100644
index 69b07b44d5..0000000000
--- a/96boards-helium-u-boot.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-- job:
-    name: 96boards-helium-u-boot
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - Marvell PXA1928 Helium U-Boot'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/rob.herring/u-boot.git
-            refspec: +refs/heads/v2015.07-pxa1928:refs/remotes/origin/v2015.07-pxa1928
-            name: origin
-            branches:
-                - refs/heads/v2015.07-pxa1928
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out
-              git clean -fdx
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y libssl-dev python-requests
-
-            # Use pre-installed linaro toolchain
-            export PATH="${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-            export CROSS_COMPILE="aarch64-linux-gnu-"
-
-            make pxa1928_helium_defconfig
-            make -j$(getconf _NPROCESSORS_ONLN)
-
-            # Generate padded binary to clear the existing environment variables
-            dd if=/dev/zero of=u-boot.padded.bin bs=1024 count=1024
-            dd if=u-boot.bin of=u-boot.padded.bin conv=notrunc
-            mv u-boot.padded.bin u-boot.bin
-
-            # Publish
-            mkdir out
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            EOF
-
-            cp -a u-boot.bin out/
-            cp -a .config out/u-boot.config
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/helium/linaro/u-boot/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/96boards-helium.yaml b/96boards-helium.yaml
deleted file mode 100644
index 5976b514d8..0000000000
--- a/96boards-helium.yaml
+++ /dev/null
@@ -1,173 +0,0 @@
-- job:
-    name: 96boards-helium
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: ROOTFS
-            default: 'developer'
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - Marvell PXA1928 Helium'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/rob.herring/linux.git
-            refspec: +refs/heads/v4.1-pxa1928:refs/remotes/origin/v4.1-pxa1928
-            name: origin
-            branches:
-                - refs/heads/v4.1-pxa1928
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv out/helium-jessie_*.img || true
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y kpartx python-requests
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb \
-              http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/m/multipath-tools/kpartx_0.5.0-7ubuntu7.1_amd64.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=helium
-            export kernel_config=pxa1928_defconfig
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-            export toolchain_url=http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz
-
-            # FIXME - enable wl18xx driver
-            sed -i "/^CONFIG_RFKILL/d" arch/arm64/configs/pxa1928_defconfig
-            cat << EOF >> arch/arm64/configs/pxa1928_defconfig
-            CONFIG_CFG80211=m
-            CONFIG_MAC80211=m
-            CONFIG_RFKILL=m
-            CONFIG_RFKILL_REGULATOR=m
-            CONFIG_RFKILL_GPIO=m
-            CONFIG_WL18XX=m
-            CONFIG_WLCORE_SDIO=m
-            EOF
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-            rm -rf out/dtbs
-            cp -a linux-*.deb out/
-
-            # Create the hardware pack
-            cp -a configs/96boards-helium/hwpacks/linaro-helium .
-
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug linaro-helium ${VERSION}
-            linaro-hwpack-replace -t `ls hwpack_linaro-helium_*_arm64_supported.tar.gz` -p `ls linux-image-*-linaro-helium_*.deb` -r linux-image -d -i
-            linaro-hwpack-replace -t `ls hwpack_linaro-helium_*_arm64_supported.tar.gz` -p `ls linux-headers-*-linaro-helium_*.deb` -r linux-headers -d -i
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            EOF
-
-            for rootfs in ${ROOTFS}; do
-              # Get rootfs
-              export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-              export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-              wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-              cat >> out/README.txt << EOF
-            * rootfs (${rootfs}): http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
-            EOF
-
-              # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file helium-jessie_${rootfs}_${VERSION}.img --image-size 2G --binary linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-helium_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-              # Create eMMC rootfs image(s)
-              mkdir boot rootfs
-              for device in $(sudo kpartx -avs out/helium-jessie_${rootfs}_${VERSION}.img | cut -d' ' -f3); do
-                partition=$(echo ${device} | cut -d'p' -f3)
-                [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-              done
-
-              cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/userdata /     ext4 errors=remount-ro 0 1
-            EOF
-
-              sudo rm -rf rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
-              sudo mkdir rootfs/dev rootfs/boot rootfs/var/lib/apt/lists
-
-              sudo make_ext4fs -o -L rootfs -l 5400M -s out/helium-jessie_${rootfs}_${VERSION}.emmc.img rootfs/
-              sudo umount boot rootfs
-              sudo kpartx -dv out/helium-jessie_${rootfs}_${VERSION}.img
-              sudo rm -rf boot rootfs
-
-              # Compress image(s)
-              gzip -9 out/helium-jessie_${rootfs}_${VERSION}.emmc.img
-              gzip -9 out/helium-jessie_${rootfs}_${VERSION}.img
-            done
-
-            # Create boot image(s)
-            wget -q https://android.googlesource.com/platform/system/core.git/+/master/mkbootimg/mkbootimg?format=text -O mkbootimg.txt
-            cat mkbootimg.txt | base64 -d > mkbootimg
-            python mkbootimg \
-              --kernel out/Image \
-              --ramdisk out/initrd.img-* \
-              --cmdline "console=tty0 console=ttyS3,115200n8 root=/dev/disk/by-partlabel/userdata rootwait rw" \
-              --base "0x01200000" \
-              --kernel_offset "0x00080000" \
-              --output out/boot.emmc.img
-
-            # Compress boot partition image(s)
-            gzip -9 out/boot.emmc.img
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/helium/linaro/debian/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/96boards-hikey-4.1.yaml b/96boards-hikey-4.1.yaml
deleted file mode 100644
index 5da9c2ac41..0000000000
--- a/96boards-hikey-4.1.yaml
+++ /dev/null
@@ -1,258 +0,0 @@
-- job:
-    name: 96boards-hikey-4.1
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: ROOTFS
-            default: 'alip developer'
-    disabled: true
-    node: docker-jessie-amd64
-    display-name: '96boards - HiKey (android-hikey-linaro-4.1)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/linux.git
-            refspec: +refs/heads/android-hikey-linaro-4.1:refs/remotes/origin/android-hikey-linaro-4.1
-            name: origin
-            branches:
-                - refs/heads/android-hikey-linaro-4.1
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv out/hikey-jessie_*.img || true
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y android-tools-fsutils kpartx python-requests
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=hikey
-            export kernel_config=hikey_defconfig
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.08/bin"
-            export toolchain_url=http://releases.linaro.org/components/toolchain/binaries/5.1-2015.08/aarch64-linux-gnu/gcc-linaro-5.1-2015.08-x86_64_aarch64-linux-gnu.tar.xz
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-            rm -rf out/dtbs
-            cp -a linux-*.deb out/
-
-            git clone --depth 1 https://github.com/OP-TEE/optee_linuxdriver.git
-            export PATH=${WORKSPACE}/srv/toolchain/arm64-tc-15.08/bin:${PATH}
-            export CROSS_COMPILE=aarch64-linux-gnu-
-            #make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver modules
-            #make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver INSTALL_MOD_PATH=${WORKSPACE}/build-utilites/fs modules_install
-            cd ${WORKSPACE}
-
-            # Create the hardware pack
-            cp -a configs/96boards-hikey/hwpacks/linaro-hikey .
-
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug linaro-hikey ${VERSION}
-            linaro-hwpack-replace -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p `ls linux-image-*-linaro-hikey_*.deb` -r linux-image -d -i
-            linaro-hwpack-replace -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p `ls linux-headers-*-linaro-hikey_*.deb` -r linux-headers -d -i
-
-            FASTBOOT_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-hikey-uefi/lastSuccessfulBuild/buildNumber`
-            FASTBOOT_EFI_URL="http://snapshots.linaro.org/96boards/hikey/linaro/uefi/${FASTBOOT_EFI_BUILD_NUMBER}/AndroidFastbootApp.efi"
-            wget --progress=dot ${FASTBOOT_EFI_URL} -O fastboot.efi
-
-            GRUB_EFI_URL="http://snapshots.linaro.org/96boards/hikey/linaro/grub/latest"
-            wget --progress=dot ${GRUB_EFI_URL}/grubaa64.efi -O grubaa64.efi
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            * uefi: http://snapshots.linaro.org/96boards/hikey/linaro/uefi/${FASTBOOT_EFI_BUILD_NUMBER}
-            EOF
-
-            for rootfs in ${ROOTFS}; do
-              # Get rootfs
-              export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-              export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-              wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-              cat >> out/README.txt << EOF
-            * rootfs (${rootfs}): http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
-            EOF
-
-              if [ "${rootfs}" = "alip" ]; then
-                mali_pkg="libmali-450_0.0.1-1_all.deb"
-                wget https://snapshots.linaro.org/96boards/hikey/linaro/binaries/20150825/${mali_pkg} -O ${mali_pkg}
-                linaro-hwpack-append -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p ${mali_pkg} -d -i
-                rm -f ${mali_pkg}
-                armsoc_pkg="xserver-xorg-video-armsoc_1.4.0-0linaro1.linarojessie.4_arm64.deb"
-                wget http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/x/xf86-video-armsoc/${armsoc_pkg} -O ${armsoc_pkg}
-                linaro-hwpack-append -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p ${armsoc_pkg} -d -i
-                rm -f ${armsoc_pkg}
-              fi
-
-              # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file hikey-jessie_${rootfs}_${VERSION}.img --image-size 2G --binary linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-hikey_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-              # Create eMMC rootfs image(s)
-              mkdir boot rootfs
-              for device in $(sudo kpartx -avs out/hikey-jessie_${rootfs}_${VERSION}.img | cut -d' ' -f3); do
-                partition=$(echo ${device} | cut -d'p' -f3)
-                [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-              done
-
-              if [ "${rootfs}" = "developer" ]; then
-                sed -e "s|^PULSEAUDIO_SYSTEM_START=0|PULSEAUDIO_SYSTEM_START=1|" \
-                    -e "s|^DISALLOW_MODULE_LOADING=1|DISALLOW_MODULE_LOADING=0|" \
-                    < rootfs/usr/share/doc/pulseaudio/examples/pulseaudio.default.example \
-                    | sudo tee rootfs/etc/default/pulseaudio
-                sudo install -D -p -m0755 \
-                  rootfs/usr/share/doc/pulseaudio/examples/pulseaudio.init.example \
-                  rootfs/etc/init.d/pulseaudio
-                cat << EOF | sudo tee -a rootfs/etc/pulse/system.pa
-
-            ### Automatically load driver modules for Bluetooth hardware
-            .ifexists module-bluetooth-policy.so
-            load-module module-bluetooth-policy
-            .endif
-
-            .ifexists module-bluetooth-discover.so
-            load-module module-bluetooth-discover
-            .endif
-            EOF
-              else
-                sudo install -D -p -m0644 \
-                  rootfs/etc/xdg/lxsession/LXDE/autostart \
-                  rootfs/home/linaro/.config/lxsession/LXDE/autostart
-                cat << EOF | sudo tee -a rootfs/home/linaro/.config/lxsession/LXDE/autostart
-            @bash -c /home/linaro/bin/xmms2-output-plugin-pulse
-            EOF
-              fi
-
-              sudo mkdir rootfs/boot/grub
-              (cd rootfs/boot/grub && sudo ln -sf /boot/efi/EFI/BOOT/grub.cfg)
-              (cd rootfs/boot && sudo ln -s Image-* Image)
-              sudo cp -a out/hi6220-hikey.dtb rootfs/boot/
-              (cd rootfs/boot && sudo ln -s initrd.img-* initrd.img)
-
-              cat << EOF | sudo tee rootfs/etc/NetworkManager/dispatcher.d/99hikey
-            #!/bin/sh
-
-            if [ "$1" = "wlan0" -a "$2" = "pre-up" ]; then
-              /sbin/iw wlan0 set power_save off
-              echo 0 > /sys/kernel/debug/ieee80211/phy0/wlcore/sleep_auth
-            fi
-            EOF
-
-              cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/system /         ext4 errors=remount-ro 0 1
-            /dev/disk/by-partlabel/boot   /boot/efi vfat defaults          0 0
-            EOF
-
-              sudo rm -rf rootfs/dev rootfs/var/lib/apt/lists
-              sudo mkdir rootfs/dev rootfs/var/lib/apt/lists rootfs/home/linaro/bin
-
-              sudo wget https://raw.githubusercontent.com/96boards/usb_speed_switch/master/usb_speed -O rootfs/home/linaro/bin/usb_speed
-              cat << EOF | sudo tee -a rootfs/home/linaro/bin/xmms2-output-plugin-pulse
-            #!/bin/sh
-
-            [ ! -f "\$HOME/.config/xmms2/xmms2.conf" ] && xmms2 server config output.plugin pulse
-            EOF
-              cat << EOF | sudo tee -a rootfs/home/linaro/.profile
-
-            /home/linaro/bin/xmms2-output-plugin-pulse
-            EOF
-              sudo chmod a+x rootfs/home/linaro/bin/* \
-                             rootfs/etc/NetworkManager/dispatcher.d/99hikey
-              sudo chown -R 1000:1000 rootfs/home/linaro
-
-              # ******** TI wl18xx R8.6 - out of tree firmware ********
-              git clone -b R8.6 --depth 1 git://git.ti.com/wilink8-wlan/wl18xx_fw.git
-              sudo cp -a ./wl18xx_fw/wl18xx-fw-4.bin rootfs/lib/firmware/ti-connectivity/
-              rm -rf wl18xx_fw
-              # ******** TI wl18xx R8.6 - out of tree firmware ********
-
-              sudo mkfs.ext4 -L rootfs out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 2G
-              mkdir rootfs-ext4
-              sudo mount -o loop out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 rootfs-ext4
-              sudo cp -a rootfs/* rootfs-ext4
-              sudo umount boot rootfs rootfs-ext4
-              sudo kpartx -dv out/hikey-jessie_${rootfs}_${VERSION}.img
-              sudo ext2simg -v out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 out/hikey-jessie_${rootfs}_${VERSION}.emmc.img
-              sudo rm -rf boot rootfs rootfs-ext4 out/*.ext4
-
-              # Compress image(s)
-              gzip -9 out/hikey-jessie_${rootfs}_${VERSION}.emmc.img
-              gzip -9 out/hikey-jessie_${rootfs}_${VERSION}.img
-            done
-
-            # Create boot image(s)
-            mkdir boot-fat
-
-            dd if=/dev/zero of=out/boot-fat.uefi.img bs=512 count=131072
-            sudo mkfs.fat -F32 -n "boot" out/boot-fat.uefi.img
-            sudo mount -o loop,rw,sync out/boot-fat.uefi.img boot-fat
-            sudo mkdir -p boot-fat/EFI/BOOT
-            sudo cp -a fastboot.efi boot-fat/EFI/BOOT/fastboot.efi || true
-            sudo cp -a grubaa64.efi boot-fat/EFI/BOOT/grubaa64.efi || true
-            sudo cp -a configs/96boards-hikey/boot/grub.cfg boot-fat/EFI/BOOT/grub.cfg || true
-            sudo umount boot-fat
-            sudo chmod 777 out/boot-fat.uefi.img
-
-            rm -rf boot-fat
-
-            # Compress boot partition image(s)
-            gzip -9 out/boot-fat.uefi.img
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/96boards-hikey/build-info/template.txt -O out/BUILD-INFO.txt
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out 96boards/hikey/community/hikey-4.1/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/96boards-hikey-4.4-android.yaml b/96boards-hikey-4.4-android.yaml
deleted file mode 100644
index 187dd154ce..0000000000
--- a/96boards-hikey-4.4-android.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-- job:
-    name: 96boards-hikey-4.4-android
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'armv8-android-hikey-4.4'
-    disabled: true
-    node: docker-utopic-aosp
-    display-name: '96boards - HiKey (Android) with 4.4 kernel'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            java -version
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools
-
-            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
-            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            chmod a+x ${HOME}/bin/*
-            export PATH=${HOME}/bin:${PATH}
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            # Runs as ubuntu
-            set -xe
-            rm -rf build-tools jenkins-tools build/out build/android-patchsets build-configs
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-android-build-tools.git build-tools
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-jenkins-tools.git jenkins-tools
-            git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git build-configs
-
-            # Early test
-            if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-              echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-              echo "in android-build-configs.git"
-              exit 1
-            fi
-
-            cat << EOF > config.txt
-            BUILD_CONFIG_REPO=http://android-git.linaro.org/git/android-build-configs.git
-            BUILD_CONFIG_BRANCH=master
-            EOF
-            echo config.txt
-            export CONFIG=`base64 -w 0 config.txt`
-
-            build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-            cp -a /home/buildslave/srv/${JOB_NAME}/build/out/*.xml ${WORKSPACE}/
-
-            # Create bigger userdata partition for 8gb emmc
-            cd build/
-            out/host/linux-x86/bin/make_ext4fs -s -T -1 -S out/root/file_contexts -L data -l 5588893184 -a data out/userdata-8gb.img out/data
-            cd -
-
-            cd build/out
-            rm -f boot.img ramdisk.img
-            for image in "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-8gb.img" "cache.img"; do
-              echo "Compressing ${image}"
-              tar -Jcf ${image}.tar.xz ${image}
-              rm -f ${image}
-            done
-            cd -
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_DEST=96boards/hikey/linaro/aosp-4.4-kernel/${BUILD_NUMBER}
-            PUB_SRC=${PWD}/build/out
-            EOF
-
-            # Construct post-build-lava parameters
-            source build-configs/${BUILD_CONFIG_FILENAME}
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
-            TARGET_PRODUCT=${TARGET_PRODUCT}
-            MAKE_TARGETS=${MAKE_TARGETS}
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            IMAGE_EXTENSION=img.tar.xz
-            LAVA_STREAM=${BUNDLE_STREAM_NAME}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            FRONTEND_JOB_NAME=${JOB_NAME}
-            DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
-            CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template.json
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - archive:
-            artifacts: '*.xml'
-            latest-only: true
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org'
diff --git a/96boards-hikey-android.yaml b/96boards-hikey-android.yaml
deleted file mode 100644
index 495ae9d95c..0000000000
--- a/96boards-hikey-android.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-- job:
-    name: 96boards-hikey-android
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'armv8-android-hikey-3.18'
-    disabled: true
-    node: docker-utopic-aosp
-    display-name: '96boards - HiKey (Android)'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            java -version
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools
-
-            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
-            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            chmod a+x ${HOME}/bin/*
-            export PATH=${HOME}/bin:${PATH}
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            # Runs as ubuntu
-            set -xe
-            rm -rf build-tools jenkins-tools build/out build/android-patchsets
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-android-build-tools.git build-tools
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-jenkins-tools.git jenkins-tools
-
-            cat << EOF > config.txt
-            BUILD_CONFIG_REPO=http://android-git.linaro.org/git/android-build-configs.git
-            BUILD_CONFIG_BRANCH=master
-            EOF
-            echo config.txt
-            export CONFIG=`base64 -w 0 config.txt`
-
-            # Build Android
-            build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-            cp -a /home/buildslave/srv/${JOB_NAME}/build/out/*.xml ${WORKSPACE}/
-
-            # Create bigger userdata partition for 8gb emmc
-            cd build/
-            out/host/linux-x86/bin/make_ext4fs -s -T -1 -S out/root/file_contexts -L data -l 5588893184 -a data out/userdata-8gb.img out/data
-            cd -
-
-            cd build/out
-            mv userdata.img userdata-4gb.img
-            rm -f boot.img ramdisk.img
-            for image in "boot_fat.uefi.img" "system.img" "userdata-4gb.img" "userdata-8gb.img" "cache.img"; do
-              echo "Compressing ${image}"
-              tar -Jcf ${image}.tar.xz ${image}
-              rm -f ${image}
-            done
-            cd -
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_DEST=96boards/hikey/linaro/aosp/${BUILD_NUMBER}
-            PUB_SRC=${PWD}/build/out
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - shell:
-            cd /home/buildslave/srv/${JOB_NAME}
-            build-tools/node/lava-submit "${CONFIG}"
-
-            for f in $(ls -1 build/out/lava-job-info* 2>/dev/null); do
-              time linaro-cp.py \
-                --no-build-info \
-                --split-job-owner \
-                --server ${PUBLISH_SERVER} \
-                ${f} \
-                ${PUB_DEST}
-            done
-
-            echo "Build finished"
-    publishers:
-        - archive:
-            artifacts: '*.xml'
-            latest-only: true
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org'
diff --git a/96boards-hikey-aosp-master.yaml b/96boards-hikey-aosp-master.yaml
index 99505ade9c..1224a29a82 100644
--- a/96boards-hikey-aosp-master.yaml
+++ b/96boards-hikey-aosp-master.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     parameters:
@@ -22,7 +22,7 @@
             default: 'https://qa-reports.linaro.org'
         - string:
             name: QA_SERVER_PROJECT
-            default: 'aosp-master-vts-tracking'
+            default: 'aosp-master-tracking'
         - string:
             name: ANDROID_VERSION
             default: 'AOSP MASTER'
@@ -32,7 +32,10 @@
         - string:
             name: SRCREV_kernel
             default: 'dummy'
-    disabled: false
+        - string:
+            name: TOOLCHAIN
+            default: 'clang-r353983d'
+    disabled: true
     node: docker-xenial-aosp
     display-name: '96boards - AOSP Master - HiKey'
     concurrent: true
@@ -41,7 +44,7 @@
     wrappers:
         - timestamps
         - timeout:
-            timeout: 500
+            timeout: 800
         - credentials-binding:
             - text:
                 credential-id: QA_REPORTS_TOKEN
@@ -64,7 +67,7 @@
             java -version
 
             sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-pip
+            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-pip pxz libssl-dev
 
             wget -q http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
               http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
@@ -76,18 +79,18 @@
             chmod a+x ${HOME}/bin/*
             export PATH=${HOME}/bin:${PATH}
 
-            if [ ! -d "/home/buildslave/srv/96boards-hikey-aosp-master" ]; then
-              sudo mkdir -p /home/buildslave/srv/96boards-hikey-aosp-master
-              sudo chmod 777 /home/buildslave/srv/96boards-hikey-aosp-master
+            if [ ! -d "aosp-master" ]; then
+              sudo mkdir -p /home/buildslave/srv/aosp-master
+              sudo chmod 777 /home/buildslave/srv/aosp-master
             fi
-            cd /home/buildslave/srv/96boards-hikey-aosp-master
+            cd /home/buildslave/srv/aosp-master
 
             git config --global user.email "ci_notify@linaro.org"
             git config --global user.name "Linaro CI"
 
             # Runs as ubuntu
             set -xe
-            rm -rf build-tools jenkins-tools build/out build/android-patchsets build-configs
+            rm -rf .repo/manifests* .repo/local_manifests build-tools jenkins-tools build/out build/android-patchsets build-configs
             git clone --depth 1 https://git.linaro.org/infrastructure/linaro-android-build-tools.git build-tools
             git clone --depth 1 https://git.linaro.org/infrastructure/linaro-jenkins-tools.git jenkins-tools
             git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git build-configs
@@ -104,52 +107,298 @@
             cat << EOF > config.txt
             BUILD_CONFIG_REPO=http://android-git.linaro.org/git/android-build-configs.git
             BUILD_CONFIG_BRANCH=master
+            TARGET_KERNEL_USE=4.19
             EOF
             echo config.txt
             export CONFIG=`base64 -w 0 config.txt`
 
-            # Download vendor binaries for hikey.
             mkdir -p build
+            ANDROID_ROOT=/home/buildslave/srv/aosp-master/build
+
+            # Delete sources before build to save space
             cd build/
-            wget https://dl.google.com/dl/android/aosp/linaro-hikey-20170523-4b9ebaff.tgz
-            tar -xvf linaro-hikey-20170523-4b9ebaff.tgz
-            yes "I ACCEPT" | ./extract-linaro-hikey.sh
+            rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* clang-src/ hikey-linaro/configs hikey-linaro-4.19
+            rm -fr optee/optee_os
+            # delete this kernel repository as we have patches applied
+            rm -fr hikey-linaro
             cd -
 
             # Build Android
             build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-            cp -a /home/buildslave/srv/${JOB_NAME}/build/out/*.xml /home/buildslave/srv/${JOB_NAME}/build/out/*.json ${WORKSPACE}/
+            cp -a /home/buildslave/srv/aosp-master/build/out/*.xml /home/buildslave/srv/aosp-master/build/out/*.json ${WORKSPACE}/
 
             cd build/out
-            for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img"  "cache.img"; do
-              echo "Compressing ${image}"
-              xz ${image}
+            for image in "boot.img" "vendor.img" "boot_fat.uefi.img" "system.img" "userdata.img"  "cache.img"; do
+              if [ -f ${image} ]; then
+                echo "Compressing ${image}"
+                xz ${image}
+              fi
             done
             cd -
-
             pushd build/
             source build/envsetup.sh
             lunch hikey-userdebug
-            pushd cts
-            git fetch http://android-review.linaro.org/platform/cts refs/changes/07/18007/5 && git cherry-pick FETCH_HEAD
+            pushd test/suite_harness
+            git fetch http://android-review.linaro.org/platform/test/suite_harness refs/changes/23/19623/1 && git cherry-pick FETCH_HEAD 
             popd
+            lunch aosp_arm64-userdebug
             make -j"$(nproc)" vts cts
             cp out/host/linux-x86/vts/android-vts.zip out/
             cp out/host/linux-x86/cts/android-cts.zip out/
             rm -rf out/host/
 
-            # Delete sources after build to save space
-            rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
             popd
 
             rm -rf build/out/BUILD-INFO.txt
             wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O build/out/BUILD-INFO.txt
 
+            # Build latest boot.img with latest kernel from source for 4.4, 4.9, 4.14, 4.19 versions
+            cd build/
+            export PATH=${PWD}/prebuilts/clang/host/linux-x86/${TOOLCHAIN}/bin/:${PWD}/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9/bin/:${PATH}
+
+            export CLANG_TRIPLE=aarch64-linux-gnu-
+            export CROSS_COMPILE=aarch64-linux-android-
+            CMDLINE="console=ttyAMA3,115200 androidboot.console=ttyAMA3"
+            CMDLINE="${CMDLINE} androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime"
+            CMDLINE="${CMDLINE} init=/init androidboot.boot_devices=soc/f723d000.dwmmc0"
+            CMDLINE="${CMDLINE} printk.devkmsg=on buildvariant=userdebug"
+
+            ######################################################################
+            # common for 4.9/4.14/4.19
+            if [ ! -d hikey-linaro ]; then
+               git clone https://android.googlesource.com/kernel/hikey-linaro
+            fi
+            cd hikey-linaro
+
+            # need to use fetch to get all the new changes
+            git fetch --all
+
+            # get the mkbootimg command which will be used to create the boot image by all kernel versions
+            wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg.py -O mkbootimg
+
+            # Build 4.19 kernel
+            git checkout android-hikey-linaro-4.19
+            git pull
+            export KERNEL_DESCRIBE_4_19=$(git rev-parse --short HEAD)
+            export KERNEL_VERSION_4_19=$(make kernelversion)
+
+            ARCH=arm64 scripts/kconfig/merge_config.sh arch/arm64/configs/hikey_defconfig
+            make ARCH=arm64 CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
+            python mkbootimg \
+               --kernel arch/arm64/boot/Image.gz-dtb \
+               --ramdisk ../out/ramdisk.img \
+               --cmdline "${CMDLINE}" \
+               --os_version Q \
+               --os_patch_level 2019-01-05 \
+               --output ../out/boot-4.19-${KERNEL_DESCRIBE_4_19}.img
+            cp vmlinux ../out/4.19_vmlinux
+            cp .config ../out/4.19_defconfig
+            xz ../out/boot-4.19-${KERNEL_DESCRIBE_4_19}.img
+
+            # common for 4.9 and 4.14
+            # set verity and system-as-root kernel boot parameters for 4.14 and 4.9
+            CMDLINE="${CMDLINE} overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab_v2"
+            CMDLINE="${CMDLINE} rootwait ro root=/dev/dm-0"
+            CMDLINE="${CMDLINE} dm=\"system none ro,0 1 android-verity 179:9\""
+            CMDLINE="${CMDLINE} veritykeyid=id:7e4333f9bba00adfe0ede979e28ed1920492b40f"
+
+            # Build 4.14 kernel
+            git checkout android-hikey-linaro-4.14
+            git pull
+            export KERNEL_DESCRIBE_4_14=$(git rev-parse --short HEAD)
+            export KERNEL_VERSION_4_14=$(make kernelversion)
+
+            ARCH=arm64 scripts/kconfig/merge_config.sh arch/arm64/configs/hikey_defconfig
+            make ARCH=arm64 CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
+            python mkbootimg \
+              --kernel arch/arm64/boot/Image.gz-dtb \
+              --cmdline "${CMDLINE}" \
+              --os_version Q \
+              --os_patch_level 2019-01-05 \
+              --output ../out/boot-4.14-${KERNEL_DESCRIBE_4_14}.img
+            cp vmlinux ../out/4.14_vmlinux
+            cp .config ../out/4.14_defconfig
+            xz ../out/boot-4.14-${KERNEL_DESCRIBE_4_14}.img
+
+            # Build 4.9 kernel
+            git checkout android-hikey-linaro-4.9
+            git pull
+            export KERNEL_DESCRIBE_4_9=$(git rev-parse --short HEAD)
+            export KERNEL_VERSION_4_9=$(make kernelversion)
+            ARCH=arm64 scripts/kconfig/merge_config.sh arch/arm64/configs/hikey_defconfig
+            make ARCH=arm64 CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
+            python mkbootimg \
+               --kernel arch/arm64/boot/Image.gz-dtb \
+               --cmdline "${CMDLINE}" \
+               --os_version Q \
+               --os_patch_level 2019-01-05 \
+               --output ../out/boot-4.9-${KERNEL_DESCRIBE_4_9}.img
+            cp vmlinux ../out/4.9_vmlinux
+            cp .config ../out/4.9_defconfig
+            xz ../out/boot-4.9-${KERNEL_DESCRIBE_4_9}.img
+
+            rm -rf configs
+            cd ../
+            rm -fr hikey-linaro
+
+            # build kernel for x15
+            X15_KERNEL_DIR=${ANDROID_ROOT}/kernel/ti/x15
+            rm -fr ${X15_KERNEL_DIR} && mkdir -p ${X15_KERNEL_DIR}
+            git clone -b android-beagle-x15-4.14 https://android.googlesource.com/kernel/omap ${X15_KERNEL_DIR}
+
+            # compile x15 4.14 kernel
+            cd ${X15_KERNEL_DIR}
+            export PATH=~/srv/toolchain/gcc-linaro-7.2.1-2017.11-x86_64_arm-eabi/bin:$PATH
+            export KERNEL_DESCRIBE_X15_4_14=$(git rev-parse --short HEAD)
+            export KERNEL_VERSION_X15_4_14=$(make kernelversion)
+
+            make ARCH=arm CROSS_COMPILE=arm-eabi- ti_sdk_am57x_android_release_defconfig
+            make ARCH=arm CROSS_COMPILE=arm-eabi- -j$(nproc) zImage dtbs modules
+            cd -
+
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/dts/ti/am57xx-beagle-x15-revc.dtb device/ti/beagle_x15-kernel/4.14/am57xx-beagle-x15-revc.dtb
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/zImage device/ti/beagle_x15-kernel/4.14/zImage
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/dts/ti/am57xx-evm-common.dtbo device/ti/beagle_x15-kernel/4.14/am57xx-evm-common.dtbo
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/dts/ti/am57xx-evm-reva3.dtbo device/ti/beagle_x15-kernel/4.14/am57xx-evm-reva3.dtbo
+
+            # compile pvrsrvkm.ko
+            # defined OUT according to info from modules/eurasia_km/eurasiacon/build/linux2/config/core.mk
+            PVR_MODULE_OUT=${X15_KERNEL_DIR}/modules/eurasia_km/eurasiacon/binary2_omap_android_release
+            PVRSRVKM_KO_PATH=${PVR_MODULE_OUT}/target_armv7-a/pvrsrvkm.ko
+            KERNEL_PVR_DIR=${X15_KERNEL_DIR}/modules/eurasia_km/eurasiacon/build/linux2/omap_android
+            unset CROSS_COMPILE
+            PVR_CROSS_COMPILE=${ANDROID_ROOT}/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-
+            cd ${KERNEL_PVR_DIR} && \
+                make -j$(nproc) \
+                     JAVAC=/bin/true \
+                     ARCH=arm \
+                     TARGET_DEVICE=am57xevm \
+                     CROSS_COMPILE=${PVR_CROSS_COMPILE} \
+                     KERNEL_CROSS_COMPILE=${PVR_CROSS_COMPILE} \
+                     EXCLUDED_APIS="composerhal,camerahal,unittests,sensorhal" \
+                     BUILD_PROP=${X15_KERNEL_DIR}/modules/eurasia_km/build.prop \
+                     OUT=${PVR_MODULE_OUT} \
+                     KERNELDIR=${X15_KERNEL_DIR} && \
+                cd -
+
+            cp -v ${PVRSRVKM_KO_PATH} device/ti/beagle_x15-kernel/4.14/pvrsrvkm.ko
+
+            source build/envsetup.sh
+            lunch beagle_x15-userdebug
+            make -j$(nproc) droidcore bootfitimage
+            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O ${PWD}/out/target/product/beagle_x15/BUILD-INFO.txt
+
+            X15_KERNEL_FILES="
+            arch/arm/boot/zImage
+            arch/arm/boot/dts/ti/am57xx-beagle-x15-revc.dtb
+            arch/arm/boot/dts/ti/am57xx-evm-common.dtbo
+            arch/arm/boot/dts/ti/am57xx-evm-reva3.dtbo
+            vmlinux
+            System.map
+            "
+            for f in ${X15_KERNEL_FILES}; do
+                if [ -f ${X15_KERNEL_DIR}/${f} ]; then
+                    cp -vf ${X15_KERNEL_DIR}/${f} out/x15-4.14-$(basename ${f})
+                fi
+            done
+
+            X15_IMAGE_FILE="
+            MLO
+            u-boot.img
+            boot_fit.img
+            userdata.img
+            system.img
+            vendor.img
+            recovery.img
+            ramdisk.img
+            "
+            for f in ${X15_IMAGE_FILE}; do
+                if [ -f out/target/product/beagle_x15/${f} ]; then
+                    cp -vf out/target/product/beagle_x15/${f} out/x15-${f}
+                fi
+            done
+            mv out/x15-boot_fit.img out/x15-boot_fit-4.14-${KERNEL_DESCRIBE_X15_4_14}.img
+            mv out/x15-vendor.img out/x15-vendor-4.14-${KERNEL_DESCRIBE_X15_4_14}.img
+
+            #######################################
+            # compile x15 4.19 kernel
+            #######################################
+            DIR_PREBUILT_KERNEL=device/ti/beagle_x15-kernel/4.19
+            mkdir -p ${DIR_PREBUILT_KERNEL}
+            cd ${X15_KERNEL_DIR}
+            git checkout android-beagle-x15-4.19 && git pull
+            make mrproper
+
+            export KERNEL_DESCRIBE_X15_4_19=$(git rev-parse --short HEAD)
+            export KERNEL_VERSION_X15_4_19=$(make kernelversion)
+
+
+            ## revert the change of Revert "usb: gadget: ffs: Fix BUG when userland exits with submitted AIO transfers"
+            git revert --no-edit 8b87305f816cf58b7a4c840b2bedfd37a8c06254
+
+            make ARCH=arm CROSS_COMPILE=arm-eabi- ti_sdk_am57x_android_release_defconfig
+            make ARCH=arm CROSS_COMPILE=arm-eabi- -j$(nproc) zImage dtbs modules
+            cd -
+
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/dts/ti/am57xx-beagle-x15-revc.dtb ${DIR_PREBUILT_KERNEL}/am57xx-beagle-x15-revc.dtb
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/zImage ${DIR_PREBUILT_KERNEL}/zImage
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/dts/ti/am57xx-evm-common.dtbo ${DIR_PREBUILT_KERNEL}/am57xx-evm-common.dtbo
+            cp -vf ${X15_KERNEL_DIR}/arch/arm/boot/dts/ti/am57xx-evm-reva3.dtbo ${DIR_PREBUILT_KERNEL}/am57xx-evm-reva3.dtbo
+            cp -v ${X15_KERNEL_DIR}/drivers/gpu/pvr/pvrsrvkm.ko ${DIR_PREBUILT_KERNEL}/pvrsrvkm.ko
+
+            source build/envsetup.sh
+            lunch beagle_x15-userdebug
+            TARGET_KERNEL_USE=4.19 make -j$(nproc) bootfitimage vendorimage
+
+            X15_KERNEL_FILES="
+            arch/arm/boot/zImage
+            arch/arm/boot/dts/ti/am57xx-beagle-x15-revc.dtb
+            arch/arm/boot/dts/ti/am57xx-evm-common.dtbo
+            arch/arm/boot/dts/ti/am57xx-evm-reva3.dtbo
+            vmlinux
+            System.map
+            "
+            for f in ${X15_KERNEL_FILES}; do
+                if [ -f ${X15_KERNEL_DIR}/${f} ]; then
+                    cp -vf ${X15_KERNEL_DIR}/${f} out/x15-4.19-$(basename ${f})
+                fi
+            done
+
+            X15_IMAGE_FILE="
+            boot_fit.img
+            vendor.img
+            "
+            for f in ${X15_IMAGE_FILE}; do
+                if [ -f out/target/product/beagle_x15/${f} ]; then
+                    cp -vf out/target/product/beagle_x15/${f} out/x15-${f}
+                fi
+            done
+            mv out/x15-boot_fit.img out/x15-boot_fit-4.19-${KERNEL_DESCRIBE_X15_4_19}.img
+            mv out/x15-vendor.img out/x15-vendor-4.19-${KERNEL_DESCRIBE_X15_4_19}.img
+
+            # Delete sources after build to save space
+            rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
+            rm -fr ${X15_KERNEL_DIR}
+
             # Publish parameters
             cat << EOF > ${WORKSPACE}/publish_parameters
             PUB_DEST=96boards/hikey/linaro/aosp-master/${BUILD_NUMBER}
-            PUB_SRC=${PWD}/build/out
-            PUB_EXTRA_INC=^[^/]+zip
+            PUB_SRC=${PWD}/out
+            PUB_EXTRA_INC=^[^/]+\.(dtb|dtbo|zip)$|MLO|vmlinux|System.map
+
+            KERNEL_DESCRIBE_4_19=${KERNEL_DESCRIBE_4_19}
+            KERNEL_DESCRIBE_4_14=${KERNEL_DESCRIBE_4_14}
+            KERNEL_DESCRIBE_4_9=${KERNEL_DESCRIBE_4_9}
+            KERNEL_DESCRIBE_4_4=${KERNEL_DESCRIBE_4_4}
+            KERNEL_DESCRIBE_X15_4_14=${KERNEL_DESCRIBE_X15_4_14}
+            KERNEL_DESCRIBE_X15_4_19=${KERNEL_DESCRIBE_X15_4_19}
+
+            KERNEL_VERSION_4_19=${KERNEL_VERSION_4_19}
+            KERNEL_VERSION_4_14=${KERNEL_VERSION_4_14}
+            KERNEL_VERSION_4_9=${KERNEL_VERSION_4_9}
+            KERNEL_VERSION_4_4=${KERNEL_VERSION_4_4}
+            KERNEL_VERSION_X15_4_14=${KERNEL_VERSION_X15_4_14}
+            KERNEL_VERSION_X15_4_19=${KERNEL_VERSION_X15_4_19}
             EOF
         - inject:
             properties-file: publish_parameters
@@ -160,37 +409,154 @@
         - inject:
             properties-file: publish_parameters
         - shell: |
-            # Install ruamel.yaml
-            pip install --user --force-reinstall ruamel.yaml
+            # Install ruamel.yaml==0.16.13
+            pip install --user --force-reinstall ruamel.yaml==0.16.13
             pip install --user --force-reinstall Jinja2
             export PUB_DEST=96boards/hikey/linaro/aosp-master/${BUILD_NUMBER}
-            export VTS_URL=https://snapshots.linaro.org/${PUB_DEST}
-            export CTS_URL=https://snapshots.linaro.org/${PUB_DEST}
+            export VTS_URL=http://snapshots.linaro.org/${PUB_DEST}
+            export CTS_URL=http://snapshots.linaro.org/${PUB_DEST}
             export DEVICE_TYPE=hi6220-hikey
             export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
-            export DOWNLOAD_URL=https://snapshots.linaro.org/${PUB_DEST}
-            export REFERENCE_BUILD_URL=https://snapshots.linaro.org/${PUB_DEST}
+            export DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
+            export REFERENCE_BUILD_URL=http://snapshots.linaro.org/${PUB_DEST}
             export KERNEL_COMMIT=${BUILD_NUMBER}
-            export KERNEL_BRANCH=android-hikey-linaro-4.9
-            export KERNEL_REPO=android-hikey-linaro-4.9
+            export TOOLCHAIN=${TOOLCHAIN}
+            export KERNEL_REPO=hikey-linaro
             export ANDROID_VERSION=aosp-master-$(date --iso-8601)
             export VTS_VERSION=$(echo $VTS_URL | awk -F"/" '{print$(NF-1)}')
             export CTS_VERSION=$(echo $CTS_URL | awk -F"/" '{print$(NF-1)}')
             export QA_BUILD_VERSION=${BUILD_NUMBER}
+            export KERNEL_DESCRIBE=${KERNEL_DESCRIBE_4_4}
+            export SRCREV_kernel=${KERNEL_DESCRIBE_4_4}
 
             rm -rf configs
             git clone --depth 1 http://git.linaro.org/ci/job/configs.git
 
+            # Submit jobs for 4.9 kernel
+            cd configs
+            git reset --hard
+            cd -
+            sed -i "s|boot.img.xz|boot-4.9-${KERNEL_DESCRIBE_4_9}.img.xz|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+
+            export KERNEL_BRANCH="android-hikey-linaro-${KERNEL_VERSION_4_9}-${KERNEL_DESCRIBE_4_9}"
+            export KERNEL_DESCRIBE=${KERNEL_DESCRIBE_4_9}
+            export SRCREV_kernel=${KERNEL_DESCRIBE_4_9}
+            python configs/openembedded-lkft/submit_for_testing.py \
+                --device-type ${DEVICE_TYPE} \
+                --build-number ${BUILD_NUMBER} \
+                --lava-server ${LAVA_SERVER} \
+                --qa-server ${QA_SERVER} \
+                --qa-server-team android-lkft \
+                --env-suffix "_4.9" \
+                --qa-server-project ${QA_SERVER_PROJECT} \
+                --git-commit ${QA_BUILD_VERSION} \
+                --template-path configs/lkft/lava-job-definitions \
+                --template-names template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
+                --quiet
+
+            # Submit jobs for 4.14 kernel
+            cd configs
+            git reset --hard
+            cd -
+            sed -i "s|boot.img.xz|boot-4.14-${KERNEL_DESCRIBE_4_14}.img.xz|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+
+            export KERNEL_BRANCH="android-hikey-linaro-${KERNEL_VERSION_4_14}-${KERNEL_DESCRIBE_4_14}"
+            export KERNEL_DESCRIBE=${KERNEL_DESCRIBE_4_14}
+            export SRCREV_kernel=${KERNEL_DESCRIBE_4_14}
+            # submit 4.14 jobs to v.l.o to reduce load on production lkft
+            export LAVA_SERVER=https://validation.linaro.org/RPC2/
+            python configs/openembedded-lkft/submit_for_testing.py \
+                --device-type ${DEVICE_TYPE} \
+                --build-number ${BUILD_NUMBER} \
+                --lava-server ${LAVA_SERVER} \
+                --qa-server ${QA_SERVER} \
+                --qa-server-team android-lkft \
+                --env-suffix "_4.14" \
+                --qa-server-project ${QA_SERVER_PROJECT} \
+                --git-commit ${QA_BUILD_VERSION} \
+                --template-path configs/lkft/lava-job-definitions \
+                --template-names template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
+                --quiet
+
+            # Submit jobs for 4.19 kernel
+            cd configs && git reset --hard && cd -
+            sed -i "s|boot.img.xz|boot-4.19-${KERNEL_DESCRIBE_4_19}.img.xz|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+
+            export KERNEL_BRANCH="android-hikey-linaro-${KERNEL_VERSION_4_19}-${KERNEL_DESCRIBE_4_19}"
+            export KERNEL_DESCRIBE=${KERNEL_DESCRIBE_4_19}
+            export SRCREV_kernel=${KERNEL_DESCRIBE_4_19}
+            # submit 4.19 jobs to v.l.o to reduce load on production lkft
+            export LAVA_SERVER=https://validation.linaro.org/RPC2/
             python configs/openembedded-lkft/submit_for_testing.py \
                 --device-type ${DEVICE_TYPE} \
                 --build-number ${BUILD_NUMBER} \
                 --lava-server ${LAVA_SERVER} \
                 --qa-server ${QA_SERVER} \
-                --qa-server-team staging-lkft \
+                --qa-server-team android-lkft \
+                --env-suffix "_4.19" \
                 --qa-server-project ${QA_SERVER_PROJECT} \
                 --git-commit ${QA_BUILD_VERSION} \
                 --template-path configs/lkft/lava-job-definitions \
-                --template-names template-boot.yaml template-vts-kernel-part1.yaml template-vts-kernel-part2.yaml template-vts-kernel-part3.yaml template-vts-kernel-part4.yaml template-vts-staging-kernel.yaml template-cts-armeabi-v7a.yaml template-cts-arm64-v8a.yaml \
+                --template-names template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
+                --quiet
+
+            # submit jobs for X15 4.14 kernel build
+            export DEVICE_TYPE=x15
+            export TOOLCHAIN=gcc-linaro-7.2.1-2017.11-x86_64_arm-eabi
+            export KERNEL_REPO=omap
+            export KERNEL_DESCRIBE=${KERNEL_DESCRIBE_X15_4_14}
+            export SRCREV_kernel=${KERNEL_DESCRIBE_X15_4_14}
+            export KERNEL_BRANCH="android-beagle-x15-${KERNEL_VERSION_X15_4_14}-${KERNEL_DESCRIBE_X15_4_14}"
+            # submit x15 jobs to lkf.v.l.o instance
+            export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
+
+            # reset the changes done before
+            cd configs && git reset --hard && cd -
+
+            # update templates to use the new image names
+            sed -i "s|boot_fit.img|x15-boot_fit-4.14-${KERNEL_DESCRIBE_X15_4_14}.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+            sed -i "s|vendor.img|x15-vendor-4.14-${KERNEL_DESCRIBE_X15_4_14}.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+            sed -i "s|system.img|x15-system.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+            sed -i "s|userdata.img|x15-userdata.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+
+            python configs/openembedded-lkft/submit_for_testing.py \
+                --device-type ${DEVICE_TYPE} \
+                --build-number ${BUILD_NUMBER} \
+                --lava-server ${LAVA_SERVER} \
+                --qa-server ${QA_SERVER} \
+                --qa-server-team android-lkft \
+                --env-suffix "_4.14" \
+                --qa-server-project ${QA_SERVER_PROJECT} \
+                --git-commit ${QA_BUILD_VERSION} \
+                --testplan-path configs/lkft/lava-job-definitions/x15 \
+                --test-plan template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
+                --quiet
+
+            # submit jobs for x15 4.19 kernel build
+            # reset the changes done before
+            cd configs && git reset --hard && cd -
+
+            export KERNEL_DESCRIBE=${KERNEL_DESCRIBE_X15_4_19}
+            export SRCREV_kernel=${KERNEL_DESCRIBE_X15_4_19}
+            export KERNEL_BRANCH="android-beagle-x15-${KERNEL_VERSION_X15_4_19}-${KERNEL_DESCRIBE_X15_4_19}"
+
+            # update templates to use the new image names
+            sed -i "s|boot_fit.img|x15-boot_fit-4.19-${KERNEL_DESCRIBE_X15_4_19}.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+            sed -i "s|vendor.img|x15-vendor-4.19-${KERNEL_DESCRIBE_X15_4_19}.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+            sed -i "s|system.img|x15-system.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+            sed -i "s|userdata.img|x15-userdata.img|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+
+            python configs/openembedded-lkft/submit_for_testing.py \
+                --device-type ${DEVICE_TYPE} \
+                --build-number ${BUILD_NUMBER} \
+                --lava-server ${LAVA_SERVER} \
+                --qa-server ${QA_SERVER} \
+                --qa-server-team android-lkft \
+                --env-suffix "_4.19" \
+                --qa-server-project ${QA_SERVER_PROJECT} \
+                --git-commit ${QA_BUILD_VERSION} \
+                --testplan-path configs/lkft/lava-job-definitions/x15 \
+                --test-plan template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
                 --quiet
 
     publishers:
@@ -198,10 +564,10 @@
             artifacts: '*.xml,*.json'
             latest-only: true
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
             files: 'build/fingerprints/*'
         - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org'
+            recipients: 'tom.gall@linaro.org bero@linaro.org yongqin.liu@linaro.org'
diff --git a/96boards-hikey-debian.yaml b/96boards-hikey-debian.yaml
deleted file mode 100644
index 262e00c1a0..0000000000
--- a/96boards-hikey-debian.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-- job:
-    name: 96boards-hikey-debian
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: VENDOR
-            default: 'linaro'
-        - string:
-            name: OS_FLAVOUR
-            default: 'stretch'
-        - string:
-            name: PLATFORM_NAME
-            default: 'hikey'
-        - string:
-            name: ROOTFS
-            default: 'developer,1800M alip,3G'
-        - string:
-            name: PUB_DEST
-            default: '96boards/hikey/${VENDOR}/debian/${BUILD_NUMBER}'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Debian based images for HiKey'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/fai.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell:
-            !include-raw: 96boards-hikey-debian/builders-fai.sh
-        - linaro-publish-token
-        - shell: |
-            # Publish to snapshots
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-                 --server ${PUBLISH_SERVER} \
-                 --link-latest \
-                 out ${PUB_DEST}
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'riku.voipio@linaro.org fathi.boudra@linaro.org'
diff --git a/96boards-hikey-linux.yaml b/96boards-hikey-linux.yaml
index fbd220edcf..00311eeea1 100644
--- a/96boards-hikey-linux.yaml
+++ b/96boards-hikey-linux.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -34,7 +34,7 @@
         - string:
             name: KDEB_CHANGELOG_DIST
             default: 'stretch'
-    disabled: false
+    disabled: true
     node: docker-stretch-arm64
     display-name: '96boards-hikey Linux kernel build'
     scm:
diff --git a/96boards-hikey-mainline-rebase.yaml b/96boards-hikey-mainline-rebase.yaml
deleted file mode 100644
index 8b908e2738..0000000000
--- a/96boards-hikey-mainline-rebase.yaml
+++ /dev/null
@@ -1,253 +0,0 @@
-- job:
-    name: 96boards-hikey-mainline-rebase
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: ROOTFS
-            default: 'alip developer'
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: '96boards - HiKey (hikey-mainline-rebase)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/linux.git
-            refspec: +refs/heads/hikey-mainline-rebase:refs/remotes/origin/hikey-mainline-rebase
-            name: origin
-            branches:
-                - refs/heads/hikey-mainline-rebase
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv out/hikey-jessie_*.img || true
-              rm -rf builddir*
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y android-tools-fsutils kpartx mtools python-requests linaro-image-tools libssl-dev
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=hikey
-            export kernel_config=defconfig
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-16.11/bin"
-            export toolchain_url=http://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz
-
-            # FIXME pull the kernel config from meta-96boards
-            wget -q https://raw.githubusercontent.com/96boards/meta-96boards/master/recipes-kernel/linux/linux-hikey/defconfig -O arch/arm64/configs/defconfig
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-            rm -rf out/dtbs
-            cp -a linux-*.deb out/
-
-            git clone --depth 1 https://github.com/OP-TEE/optee_linuxdriver.git
-            export PATH=${tcbindir}:${PATH}
-            export CROSS_COMPILE=aarch64-linux-gnu-
-            #make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver modules
-            #make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver INSTALL_MOD_PATH=${WORKSPACE}/build-utilites/fs modules_install
-            cd ${WORKSPACE}
-
-            # Create the hardware pack
-            cp -a configs/96boards-hikey/hwpacks/linaro-hikey .
-            sed -i '/- ti-uim/d' linaro-hikey
-
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug linaro-hikey ${VERSION}
-            linaro-hwpack-replace -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p `ls linux-image-*-linaro-hikey_*.deb` -r linux-image -d -i
-            linaro-hwpack-replace -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p `ls linux-headers-*-linaro-hikey_*.deb` -r linux-headers -d -i
-
-            FASTBOOT_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-hikey-uefi-openplatformpkg/lastSuccessfulBuild/buildNumber`
-            FASTBOOT_EFI_URL="http://snapshots.linaro.org/96boards/hikey/linaro/uefi-openplatformpkg/${FASTBOOT_EFI_BUILD_NUMBER}/AndroidFastbootApp.efi"
-            wget --progress=dot ${FASTBOOT_EFI_URL} -O fastboot.efi
-
-            GRUB_EFI_URL="http://snapshots.linaro.org/96boards/hikey/linaro/grub/latest"
-            wget --progress=dot ${GRUB_EFI_URL}/grubaa64.efi -O grubaa64.efi
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            * uefi: http://snapshots.linaro.org/96boards/hikey/linaro/uefi-openplatformpkg/${FASTBOOT_EFI_BUILD_NUMBER}
-            EOF
-
-            for rootfs in ${ROOTFS}; do
-              # Get rootfs
-              export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-              export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-              wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-              cat >> out/README.txt << EOF
-            * rootfs (${rootfs}): http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
-            EOF
-
-              if [ "${rootfs}" = "alip" ]; then
-                mali_pkg="libmali-450_0.0.1-1_all.deb"
-                wget https://snapshots.linaro.org/96boards/hikey/linaro/binaries/20150825/${mali_pkg} -O ${mali_pkg}
-                linaro-hwpack-append -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p ${mali_pkg} -d -i
-                rm -f ${mali_pkg}
-                armsoc_pkg="xserver-xorg-video-armsoc_1.4.0-0linaro1.linarojessie.4_arm64.deb"
-                wget http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/x/xf86-video-armsoc/${armsoc_pkg} -O ${armsoc_pkg}
-                linaro-hwpack-append -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p ${armsoc_pkg} -d -i
-                rm -f ${armsoc_pkg}
-              fi
-
-              # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file hikey-jessie_${rootfs}_${VERSION}.img --image-size 2G --binary linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-hikey_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-              # Create eMMC rootfs image(s)
-              mkdir boot rootfs
-              for device in $(sudo kpartx -avs out/hikey-jessie_${rootfs}_${VERSION}.img | cut -d' ' -f3); do
-                partition=$(echo ${device} | cut -d'p' -f3)
-                [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-              done
-
-              if [ "${rootfs}" = "developer" ]; then
-                sed -e "s|^PULSEAUDIO_SYSTEM_START=0|PULSEAUDIO_SYSTEM_START=1|" \
-                    -e "s|^DISALLOW_MODULE_LOADING=1|DISALLOW_MODULE_LOADING=0|" \
-                    < rootfs/usr/share/doc/pulseaudio/examples/pulseaudio.default.example \
-                    | sudo tee rootfs/etc/default/pulseaudio
-                sudo install -D -p -m0755 \
-                  rootfs/usr/share/doc/pulseaudio/examples/pulseaudio.init.example \
-                  rootfs/etc/init.d/pulseaudio
-                cat << EOF | sudo tee -a rootfs/etc/pulse/system.pa
-
-            ### Automatically load driver modules for Bluetooth hardware
-            .ifexists module-bluetooth-policy.so
-            load-module module-bluetooth-policy
-            .endif
-
-            .ifexists module-bluetooth-discover.so
-            load-module module-bluetooth-discover
-            .endif
-            EOF
-              else
-                sudo install -D -p -m0644 \
-                  rootfs/etc/xdg/lxsession/LXDE/autostart \
-                  rootfs/home/linaro/.config/lxsession/LXDE/autostart
-                cat << EOF | sudo tee -a rootfs/home/linaro/.config/lxsession/LXDE/autostart
-            @bash -c /home/linaro/bin/xmms2-output-plugin-pulse
-            EOF
-              fi
-
-              sudo mkdir rootfs/boot/grub
-              (cd rootfs/boot/grub && sudo ln -sf /boot/efi/EFI/BOOT/grub.cfg)
-              (cd rootfs/boot && sudo ln -s Image-* Image)
-              sudo cp -a out/hi6220-hikey.dtb rootfs/boot/
-              (cd rootfs/boot && sudo ln -s initrd.img-* initrd.img)
-
-              cat << EOF | sudo tee rootfs/etc/NetworkManager/dispatcher.d/99hikey
-            #!/bin/sh
-
-            if [ "$1" = "wlan0" -a "$2" = "pre-up" ]; then
-              /sbin/iw wlan0 set power_save off
-              echo 0 > /sys/kernel/debug/ieee80211/phy0/wlcore/sleep_auth
-            fi
-            EOF
-
-              cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/system /         ext4 errors=remount-ro 0 1
-            /dev/disk/by-partlabel/boot   /boot/efi vfat defaults          0 0
-            EOF
-
-              sudo rm -rf rootfs/dev rootfs/var/lib/apt/lists
-              sudo mkdir rootfs/dev rootfs/var/lib/apt/lists rootfs/home/linaro/bin
-
-              sudo wget https://raw.githubusercontent.com/96boards/usb_speed_switch/master/usb_speed -O rootfs/home/linaro/bin/usb_speed
-              cat << EOF | sudo tee -a rootfs/home/linaro/bin/xmms2-output-plugin-pulse
-            #!/bin/sh
-
-            [ ! -f "\$HOME/.config/xmms2/xmms2.conf" ] && xmms2 server config output.plugin pulse
-            EOF
-              cat << EOF | sudo tee -a rootfs/home/linaro/.profile
-
-            /home/linaro/bin/xmms2-output-plugin-pulse
-            EOF
-              sudo chmod a+x rootfs/home/linaro/bin/* \
-                             rootfs/etc/NetworkManager/dispatcher.d/99hikey
-              sudo chown -R 1000:1000 rootfs/home/linaro
-
-              # Get TI wl18xx 8.9.0.0.69 - linux-firmware tree
-              wget -q https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/plain/ti-connectivity/wl18xx-fw-4.bin?id=dbb85a5154a5da7fa94bf9caa3658d4b6999cee6 -O wl18xx-fw-4.bin
-              sudo cp -a wl18xx-fw-4.bin rootfs/lib/firmware/ti-connectivity/
-              rm -f wl18xx-fw-4.bin
-
-              sudo mkfs.ext4 -L rootfs out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 2G
-              mkdir rootfs-ext4
-              sudo mount -o loop out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 rootfs-ext4
-              sudo cp -a rootfs/* rootfs-ext4
-              sudo umount boot rootfs rootfs-ext4
-              sudo kpartx -dv out/hikey-jessie_${rootfs}_${VERSION}.img
-              sudo ext2simg -v out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 out/hikey-jessie_${rootfs}_${VERSION}.emmc.img
-              sudo rm -rf boot rootfs rootfs-ext4 out/*.ext4
-
-              # Compress image(s)
-              gzip -9 out/hikey-jessie_${rootfs}_${VERSION}.emmc.img
-              gzip -9 out/hikey-jessie_${rootfs}_${VERSION}.img
-            done
-
-            # Create boot image(s)
-            /sbin/mkfs.fat -F32 -n "boot" -C out/boot-fat.uefi.img 65536
-            mmd -i out/boot-fat.uefi.img ::EFI
-            mmd -i out/boot-fat.uefi.img ::EFI/BOOT
-            mcopy -i out/boot-fat.uefi.img fastboot.efi ::EFI/BOOT/fastboot.efi
-            mcopy -i out/boot-fat.uefi.img grubaa64.efi ::EFI/BOOT/grubaa64.efi
-            mcopy -i out/boot-fat.uefi.img configs/96boards-hikey/boot/grub.cfg ::EFI/BOOT/grub.cfg
-            chmod 644 out/boot-fat.uefi.img
-
-            # Compress boot partition image(s)
-            gzip -9 out/boot-fat.uefi.img
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/96boards-hikey/build-info/template.txt -O out/BUILD-INFO.txt
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out 96boards/hikey/community/hikey-mainline-rebase/${BUILD_NUMBER}
-
-            rm -rf out
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org guodong.xu@linaro.org'
diff --git a/96boards-hikey-uefi-openplatformpkg.yaml b/96boards-hikey-uefi-openplatformpkg.yaml
deleted file mode 100644
index 04fa518b3b..0000000000
--- a/96boards-hikey-uefi-openplatformpkg.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-- job:
-    name: 96boards-hikey-uefi-openplatformpkg
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    disabled: false
-    node: docker-stretch-amd64
-    display-name: '96boards - HiKey UEFI (OpenPlatformPkg)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/edk2.git
-            refspec: +refs/heads/hikey-aosp:refs/remotes/origin/hikey-aosp
-            name: origin
-            branches:
-                - refs/heads/hikey-aosp
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf arm64-tc
-              rm -rf arm-trusted-firmware
-              rm -rf linaro-edk2/OpenPlatformPkg
-              rm -rf uefi-tools
-              rm -rf LinaroPkg
-              rm -rf l-loader
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y libssl-dev python-requests python-crypto
-
-            # sbin isn't in the PATH by default and prevent to find sgdisk
-            export PATH="/usr/sbin:/sbin:$PATH"
-
-            # Use pre-installed linaro toolchain
-            export PATH="${HOME}/srv/toolchain/arm-tc-15.02/bin:${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-            export CROSS_COMPILE_ta_arm64=aarch64-linux-gnu-
-            export CROSS_COMPILE_ta_arm32=arm-linux-gnueabihf-
-
-            # Check out arm-trusted-firmware
-            git clone -b hikey --depth 1 https://github.com/96boards-hikey/arm-trusted-firmware.git
-
-            # Check out OpenPlatformPkg
-            git clone -b hikey-aosp --depth 1 https://github.com/96boards-hikey/OpenPlatformPkg.git linaro-edk2/OpenPlatformPkg
-
-            git clone -b hikey-aosp --depth 1 https://github.com/96boards-hikey/uefi-tools.git
-
-            git clone -b hikey-aosp --depth 1 https://github.com/96boards/LinaroPkg.git
-            cp -a LinaroPkg/platforms.config uefi-tools/platforms.config
-
-            export AARCH64_TOOLCHAIN=GCC49
-            export EDK2_DIR=${WORKSPACE}/linaro-edk2
-            export UEFI_TOOLS_DIR=${WORKSPACE}/uefi-tools
-            export JENKINS_WORKSPACE=${WORKSPACE}
-            unset WORKSPACE
-
-            cd ${EDK2_DIR}
-            ${UEFI_TOOLS_DIR}/uefi-build.sh -b RELEASE -a ../arm-trusted-firmware hikey
-
-            unset WORKSPACE
-            export WORKSPACE=${JENKINS_WORKSPACE}
-
-            cd ${WORKSPACE}
-            mkdir out
-            cp -a ${EDK2_DIR}/Build/HiKey/RELEASE_GCC49/FV/*.bin out/
-            cp -a ${EDK2_DIR}/Build/HiKey/RELEASE_GCC49/AARCH64/AndroidFastbootApp.efi out/
-            # Don't ship BL33_AP_UEFI.fd, mcuimage.bin and tee.bin
-            # (already included in the firmware image package - fip)
-            #cp -a ${EDK2_DIR}/Build/HiKey/RELEASE_GCC49/FV/*.fd out/
-            #cp -a ${EDK2_DIR}/HisiPkg/HiKeyPkg/NonFree/mcuimage.bin out/
-
-            # Ship nvme.img with UEFI binaries for convenience
-            dd if=/dev/zero of=out/nvme.img bs=128 count=1024
-
-            git clone -b master --depth 1 https://github.com/96boards-hikey/l-loader.git
-            cd l-loader
-            ln -s ${WORKSPACE}/out/bl1.bin
-            ln -s ${WORKSPACE}/out/bl2u.bin
-            make
-            cp -a l-loader.bin ptable*.img ${WORKSPACE}/out/
-            cd ${WORKSPACE}
-
-            cat > out/HEADER.textile << EOF
-            Build information:
-            * build: "${BUILD_URL}":${BUILD_URL}
-            * UEFI tools git URL: "$(cd uefi-tools && git config remote.origin.url)":$(cd uefi-tools && git config remote.origin.url)
-            * UEFI tools git branch: $(cd uefi-tools && git branch | grep -e '*'  | cut -d' ' -f2)
-            * UEFI tools git commit: $(cd uefi-tools && git log -n1 --pretty=format:%H)
-            * EDK2 git URL: "${GIT_URL}":${GIT_URL}
-            * EDK2 git branch: ${GIT_BRANCH}
-            * EDK2 git commit: ${GIT_COMMIT}
-            * ATF git URL: "$(cd arm-trusted-firmware && git config remote.origin.url)":$(cd arm-trusted-firmware && git config remote.origin.url)
-            * ATF git branch: $(cd arm-trusted-firmware && git branch | grep -e '*'  | cut -d' ' -f2)
-            * ATF git commit: $(cd arm-trusted-firmware && git log -n1 --pretty=format:%H)
-            * OpenPlatformPkg git URL: "$(cd linaro-edk2/OpenPlatformPkg && git config remote.origin.url)":$(cd linaro-edk2/OpenPlatformPkg && git config remote.origin.url)
-            * OpenPlatformPkg git branch: $(cd linaro-edk2/OpenPlatformPkg && git branch | grep -e '*'  | cut -d' ' -f2)
-            * OpenPlatformPkg git commit: $(cd linaro-edk2/OpenPlatformPkg && git log -n1 --pretty=format:%H)
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/hikey/linaro/uefi-openplatformpkg/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org haojian.zhuang@linaro.org'
diff --git a/96boards-hikey-uefi.yaml b/96boards-hikey-uefi.yaml
deleted file mode 100644
index f0dc65c075..0000000000
--- a/96boards-hikey-uefi.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-- job:
-    name: 96boards-hikey-uefi
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    disabled: true
-    node: docker-jessie-amd64
-    display-name: '96boards - HiKey UEFI'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/edk2.git
-            refspec: +refs/heads/hikey:refs/remotes/origin/hikey
-            name: origin
-            branches:
-                - refs/heads/hikey
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf arm64-tc
-              rm -rf arm-trusted-firmware
-              rm -rf uefi-tools
-              rm -rf l-loader
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y python-requests python-crypto
-
-            # Use pre-installed linaro toolchain
-            export PATH="${HOME}/srv/toolchain/arm-tc-15.02/bin:${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-            export CROSS_COMPILE_ta_arm64=aarch64-linux-gnu-
-            export CROSS_COMPILE_ta_arm32=arm-linux-gnueabihf-
-
-            # Check out arm-trusted-firmware
-            git clone -b hikey --depth 1 https://github.com/96boards-hikey/arm-trusted-firmware.git
-
-            # Check out optee_os
-            git clone --depth 1 https://github.com/OP-TEE/optee_os.git
-
-            git clone git://git.linaro.org/uefi/uefi-tools.git
-
-            export AARCH64_TOOLCHAIN=GCC49
-            export EDK2_DIR=${WORKSPACE}/linaro-edk2
-            export UEFI_TOOLS_DIR=${WORKSPACE}/uefi-tools
-            export JENKINS_WORKSPACE=${WORKSPACE}
-            unset WORKSPACE
-
-            cd ${EDK2_DIR}
-            ${UEFI_TOOLS_DIR}/uefi-build.sh -b RELEASE -a ../arm-trusted-firmware -s ../optee_os hikey
-
-            unset WORKSPACE
-            export WORKSPACE=${JENKINS_WORKSPACE}
-
-            cd ${WORKSPACE}
-            mkdir -p out/optee
-            cp -a ${EDK2_DIR}/Build/HiKey/RELEASE_GCC49/FV/*.bin out/
-            cp -a ${EDK2_DIR}/Build/HiKey/RELEASE_GCC49/AARCH64/AndroidFastbootApp.efi out/
-            # Don't ship BL33_AP_UEFI.fd, mcuimage.bin and tee.bin
-            # (already included in the firmware image package - fip)
-            #cp -a ${EDK2_DIR}/Build/HiKey/RELEASE_GCC49/FV/*.fd out/
-            #cp -a ${EDK2_DIR}/HisiPkg/HiKeyPkg/NonFree/mcuimage.bin out/
-            rm -f out/tee.bin
-
-            # Ship nvme.img with UEFI binaries for convenience
-            dd if=/dev/zero of=out/nvme.img bs=128 count=1024
-
-            # Ship files needed to build OP-TEE test suite
-            tar -C ${WORKSPACE}/optee_os/out -acvf \
-              ${WORKSPACE}/out/optee/arm-plat-hikey.tar.xz \
-              arm-plat-hikey/export-ta_arm64 arm-plat-hikey/export-ta_arm32
-
-            git clone --depth 1 https://github.com/96boards-hikey/l-loader.git
-            cd l-loader
-            ln -s ${WORKSPACE}/out/bl1.bin
-            make
-            cp -a l-loader.bin ptable*.img ${WORKSPACE}/out/
-            cd ${WORKSPACE}
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/hikey/linaro/uefi/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/96boards-hikey.yaml b/96boards-hikey.yaml
deleted file mode 100644
index 6dfdc5f0a9..0000000000
--- a/96boards-hikey.yaml
+++ /dev/null
@@ -1,324 +0,0 @@
-- job:
-    name: 96boards-hikey
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/hisilicon/hikey/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'hi6220-hikey'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: ROOTFS
-            default: 'alip developer'
-    disabled: true
-    node: docker-jessie-amd64
-    display-name: '96boards - HiKey'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/linux.git
-            refspec: +refs/heads/hikey:refs/remotes/origin/hikey
-            name: origin
-            branches:
-                - refs/heads/hikey
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - wifi.r8.5.tar.gz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv out/hikey-jessie_*.img || true
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y android-tools-fsutils kpartx python-requests
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=hikey
-            export kernel_config=defconfig
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.08/bin"
-            export toolchain_url=http://releases.linaro.org/components/toolchain/binaries/5.1-2015.08/aarch64-linux-gnu/gcc-linaro-5.1-2015.08-x86_64_aarch64-linux-gnu.tar.xz
-
-            # Disable wireless configuration API
-            # TI wl18xx R8.5 is using a backported CFG80211 and MAC80211
-            tar zxf wifi.r8.5.tar.gz
-            patch -p1 < ${WORKSPACE}/wifi.r8.5/kernel.patch/0001-defconfig-hikey-discard-CFG80211-and-MAC80211.patch
-            echo "CONFIG_LOCALVERSION=\"-linaro-hikey\"" >> arch/arm64/configs/defconfig
-            touch .scmversion
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-            rm -rf out/dtbs
-            cp -a linux-*.deb out/
-
-            # ******** TI wl18xx R8.5 - out of tree modules ********
-            git clone --depth 1 https://github.com/96boards-hikey/wilink8-wlan_build-utilites.git build-utilites
-            KERNEL_PATH=$(find ${WORKSPACE} -maxdepth 1 -type d -name 'builddir-*-linaro-hikey')
-            make O=${KERNEL_PATH} INSTALL_MOD_PATH=${WORKSPACE}/build-utilites/fs modules_install
-            cp -a build-utilites/setup-env.sample build-utilites/setup-env
-            sed -e "s|^export TOOLCHAIN_PATH=.*|export TOOLCHAIN_PATH=${HOME}/srv/toolchain/arm64-tc-14.09/bin|" \
-                -e "s|^export KERNEL_PATH=.*|export KERNEL_PATH=${KERNEL_PATH}|" \
-                -e "s|^export CROSS_COMPILE=.*|export CROSS_COMPILE=aarch64-linux-gnu-|" \
-                -e "s|^export ARCH=.*|export ARCH=arm64|" \
-                -i build-utilites/setup-env
-
-            git clone -b hikey --depth 1 https://github.com/96boards-hikey/wilink8-wlan_wl18xx.git    build-utilites/src/driver
-            git clone -b R8.5  --depth 1 https://github.com/96boards-hikey/wilink8-wlan_wl18xx_fw.git build-utilites/src/fw_download
-            git clone -b hikey --depth 1 https://github.com/96boards-hikey/wilink8-wlan_backports.git build-utilites/src/backports
-
-            # XXX FIXME local hack to avoid setlocalversion to pick up and add a plus sign
-            touch ${WORKSPACE}/build-utilites/src/driver/.scmversion
-
-            cd ${WORKSPACE}/build-utilites
-            ./build_wl18xx.sh modules
-            ./build_wl18xx.sh firmware
-            cd ${WORKSPACE}
-            # ******** TI wl18xx R8.5 - out of tree modules ********
-
-            git clone --depth 1 https://github.com/OP-TEE/optee_linuxdriver.git
-            export PATH=${WORKSPACE}/srv/toolchain/arm64-tc-15.08/bin:${PATH}
-            export CROSS_COMPILE=aarch64-linux-gnu-
-            make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver modules
-            make -C ${KERNEL_PATH} M=${WORKSPACE}/optee_linuxdriver INSTALL_MOD_PATH=${WORKSPACE}/build-utilites/fs modules_install
-            cd ${WORKSPACE}
-
-            # Create the hardware pack
-            cp -a configs/96boards-hikey/hwpacks/linaro-hikey .
-
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug linaro-hikey ${VERSION}
-            linaro-hwpack-replace -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p `ls linux-image-*-linaro-hikey_*.deb` -r linux-image -d -i
-            linaro-hwpack-replace -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p `ls linux-headers-*-linaro-hikey_*.deb` -r linux-headers -d -i
-
-            FASTBOOT_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-hikey-uefi/lastSuccessfulBuild/buildNumber`
-            FASTBOOT_EFI_URL="http://snapshots.linaro.org/96boards/hikey/linaro/uefi/${FASTBOOT_EFI_BUILD_NUMBER}/AndroidFastbootApp.efi"
-            wget --progress=dot ${FASTBOOT_EFI_URL} -O fastboot.efi
-
-            GRUB_EFI_URL="http://snapshots.linaro.org/96boards/hikey/linaro/grub/latest"
-            wget --progress=dot ${GRUB_EFI_URL}/grubaa64.efi -O grubaa64.efi
-
-            cat > out/README.txt << EOF
-            Build information:
-            * build: ${BUILD_URL}
-            * git URL: ${GIT_URL}
-            * git branch: ${GIT_BRANCH}
-            * git commit: ${GIT_COMMIT}
-            * uefi: http://snapshots.linaro.org/96boards/hikey/linaro/uefi/${FASTBOOT_EFI_BUILD_NUMBER}
-            EOF
-
-            for rootfs in ${ROOTFS}; do
-              # Get rootfs
-              export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-              export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-              wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-              cat >> out/README.txt << EOF
-            * rootfs (${rootfs}): http://snapshots.linaro.org/debian/images/${rootfs}-arm64/${ROOTFS_BUILD_NUMBER}
-            EOF
-
-              if [ "${rootfs}" = "alip" ]; then
-                mali_pkg="libmali-450_0.0.1-1_all.deb"
-                wget https://snapshots.linaro.org/96boards/hikey/linaro/binaries/20150825/${mali_pkg} -O ${mali_pkg}
-                linaro-hwpack-append -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p ${mali_pkg} -d -i
-                rm -f ${mali_pkg}
-                armsoc_pkg="xserver-xorg-video-armsoc_1.4.0-0linaro1.linarojessie.4_arm64.deb"
-                wget http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/x/xf86-video-armsoc/${armsoc_pkg} -O ${armsoc_pkg}
-                linaro-hwpack-append -t `ls hwpack_linaro-hikey_*_arm64_supported.tar.gz` -p ${armsoc_pkg} -d -i
-                rm -f ${armsoc_pkg}
-              fi
-
-              # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file hikey-jessie_${rootfs}_${VERSION}.img --image-size 2G --binary linaro-jessie-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_linaro-hikey_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-              # Create eMMC rootfs image(s)
-              mkdir boot rootfs
-              for device in $(sudo kpartx -avs out/hikey-jessie_${rootfs}_${VERSION}.img | cut -d' ' -f3); do
-                partition=$(echo ${device} | cut -d'p' -f3)
-                [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-              done
-
-              if [ "${rootfs}" = "developer" ]; then
-                sed -e "s|^PULSEAUDIO_SYSTEM_START=0|PULSEAUDIO_SYSTEM_START=1|" \
-                    -e "s|^DISALLOW_MODULE_LOADING=1|DISALLOW_MODULE_LOADING=0|" \
-                    < rootfs/usr/share/doc/pulseaudio/examples/pulseaudio.default.example \
-                    | sudo tee rootfs/etc/default/pulseaudio
-                sudo install -D -p -m0755 \
-                  rootfs/usr/share/doc/pulseaudio/examples/pulseaudio.init.example \
-                  rootfs/etc/init.d/pulseaudio
-                cat << EOF | sudo tee -a rootfs/etc/pulse/system.pa
-
-            ### Automatically load driver modules for Bluetooth hardware
-            .ifexists module-bluetooth-policy.so
-            load-module module-bluetooth-policy
-            .endif
-
-            .ifexists module-bluetooth-discover.so
-            load-module module-bluetooth-discover
-            .endif
-            EOF
-              else
-                sudo install -D -p -m0644 \
-                  rootfs/etc/xdg/lxsession/LXDE/autostart \
-                  rootfs/home/linaro/.config/lxsession/LXDE/autostart
-                cat << EOF | sudo tee -a rootfs/home/linaro/.config/lxsession/LXDE/autostart
-            @bash -c /home/linaro/bin/xmms2-output-plugin-pulse
-            EOF
-                [ -f "rootfs/etc/chromium.d/default-flags" ] && cat << EOF | sudo tee -a rootfs/etc/chromium.d/default-flags
-            export CHROMIUM_FLAGS="$CHROMIUM_FLAGS --use-gl=swiftshader"
-            EOF
-              fi
-
-              sudo mkdir rootfs/boot/grub
-              (cd rootfs/boot/grub && sudo ln -sf /boot/efi/EFI/BOOT/grub.cfg)
-              (cd rootfs/boot && sudo ln -s Image-* Image)
-              sudo cp -a out/hi6220-hikey.dtb rootfs/boot/
-              (cd rootfs/boot && sudo ln -s initrd.img-* initrd.img)
-
-              cat << EOF | sudo tee rootfs/etc/NetworkManager/dispatcher.d/99hikey
-            #!/bin/sh
-
-            if [ "$1" = "wlan0" -a "$2" = "pre-up" ]; then
-              /sbin/iw wlan0 set power_save off
-              echo 0 > /sys/kernel/debug/ieee80211/phy0/wlcore/sleep_auth
-            fi
-            EOF
-
-              cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/system /         ext4 errors=remount-ro 0 1
-            /dev/disk/by-partlabel/boot   /boot/efi vfat defaults          0 0
-            EOF
-
-              sudo rm -rf rootfs/dev rootfs/var/lib/apt/lists rootfs/lib/modules/*-linaro-hikey
-              sudo mkdir rootfs/dev rootfs/var/lib/apt/lists rootfs/home/linaro/bin
-
-              sudo wget https://raw.githubusercontent.com/96boards/usb_speed_switch/master/usb_speed -O rootfs/home/linaro/bin/usb_speed
-              cat << EOF | sudo tee -a rootfs/home/linaro/bin/xmms2-output-plugin-pulse
-            #!/bin/sh
-
-            [ ! -f "\$HOME/.config/xmms2/xmms2.conf" ] && xmms2 server config output.plugin pulse
-            EOF
-              cat << EOF | sudo tee -a rootfs/home/linaro/.profile
-
-            /home/linaro/bin/xmms2-output-plugin-pulse
-            EOF
-              sudo chmod a+x rootfs/home/linaro/bin/* \
-                             rootfs/etc/NetworkManager/dispatcher.d/99hikey
-              sudo chown -R 1000:1000 rootfs/home/linaro
-
-              # ******** TI wl18xx R8.5 - out of tree modules ********
-              sudo find ${WORKSPACE}/build-utilites/fs/lib/modules -type l -delete
-              sudo cp -a ${WORKSPACE}/build-utilites/fs/lib/modules/*-linaro-hikey rootfs/lib/modules/
-              # ******** TI wl18xx R8.5 - out of tree modules ********
-
-              sudo mkfs.ext4 -L rootfs out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 2G
-              mkdir rootfs-ext4
-              sudo mount -o loop out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 rootfs-ext4
-              sudo cp -a rootfs/* rootfs-ext4
-              sudo umount boot rootfs rootfs-ext4
-              sudo kpartx -dv out/hikey-jessie_${rootfs}_${VERSION}.img
-              sudo ext2simg -v out/hikey-jessie_${rootfs}_${VERSION}.emmc.img.ext4 out/hikey-jessie_${rootfs}_${VERSION}.emmc.img
-              sudo rm -rf boot rootfs rootfs-ext4 out/*.ext4
-
-              # Compress image(s)
-              gzip -9 out/hikey-jessie_${rootfs}_${VERSION}.emmc.img
-              gzip -9 out/hikey-jessie_${rootfs}_${VERSION}.img
-            done
-
-            # Create boot image(s)
-            mkdir boot-fat
-
-            dd if=/dev/zero of=out/boot-fat.uefi.img bs=512 count=131072
-            sudo mkfs.fat -F32 -n "boot" out/boot-fat.uefi.img
-            sudo mount -o loop,rw,sync out/boot-fat.uefi.img boot-fat
-            sudo mkdir -p boot-fat/EFI/BOOT
-            sudo cp -a fastboot.efi boot-fat/EFI/BOOT/fastboot.efi || true
-            sudo cp -a grubaa64.efi boot-fat/EFI/BOOT/grubaa64.efi || true
-            sudo cp -a configs/96boards-hikey/boot/grub.cfg boot-fat/EFI/BOOT/grub.cfg || true
-            sudo umount boot-fat
-            sudo chmod 777 out/boot-fat.uefi.img
-
-            rm -rf boot-fat
-
-            # Compress boot partition image(s)
-            gzip -9 out/boot-fat.uefi.img
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/96boards-hikey/build-info/template.txt -O out/BUILD-INFO.txt
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out 96boards/hikey/linaro/debian/${BUILD_NUMBER}
-        - shell: |
-            VERSION=$(date +%Y%m%d)-${BUILD_NUMBER}
-
-            export BOOT_URL=https://snapshots.linaro.org/96boards/hikey/linaro/debian/${BUILD_NUMBER}/boot-fat.uefi.img.gz
-            export SYSTEM_URL=https://snapshots.linaro.org/96boards/hikey/linaro/debian/${BUILD_NUMBER}/hikey-jessie_alip_${VERSION}-4g.emmc.img.gz
-
-            ./lci-build-tools/yaml-to-json.py configs/${JOB_NAME}/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
-        - email-ext:
-            recipients: 'qa-team@linaro.org'
-            always: true
diff --git a/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml b/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml
index f6ac9883b7..e1cb0a14b8 100644
--- a/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml
+++ b/96boards-hikey/lava-job-definitions/hi6220-hikey/aosp-master/template-cts.yaml
@@ -97,6 +97,6 @@ actions:
       path: automated/android/tradefed/tradefed.yaml
       params:
         TEST_PARAMS: "run cts --include-filter %%CTS_MODULE_NAME%% --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "http://testdata.validation.linaro.org/cts/android-cts-aosp-master-build2.zip"
+        TEST_URL: "http://testdata.linaro.org/cts/android-cts-aosp-master-build2.zip"
         TEST_PATH: "android-cts"
       name: "%%CTS_MODULE_NAME%%"
diff --git a/96boards-hikey960-aosp-master.yaml b/96boards-hikey960-aosp-master.yaml
index 058b1dc2f3..fa980aae46 100644
--- a/96boards-hikey960-aosp-master.yaml
+++ b/96boards-hikey960-aosp-master.yaml
@@ -9,7 +9,7 @@
         - authorization:
             anonymous:
                 - job-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     parameters:
@@ -17,7 +17,7 @@
             name: BUILD_CONFIG_FILENAME
             default: 'hikey960-aosp-master'
     disabled: false
-    node: docker-utopic-aosp
+    node: docker-focal-aosp
     display-name: '96boards - AOSP Master - HiKey960'
     concurrent: true
     triggers:
@@ -29,21 +29,28 @@
         - ssh-agent-credentials:
                 users:
                     - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        # needed to publish to snapshots
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
     builders:
         - shell: |
             #!/bin/bash
             export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
-            java -version
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
             sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools pxz
 
-            wget -q http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
-              http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-             http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
-            sudo dpkg -i --force-all *.deb
+            # Here is for packages not listed by the source.android.com site below.
+            # But the following packages might not be really necessary,
+            # as the docker image for docker-focal-aosp labelled nodes is linaro/jenkins-amd64-ubuntu:focal
+            # which is defined here: https://git.linaro.org/infrastructure/ci-yadp-builder.git/tree/docker_templates_aosp_amd64.yml#n2
+            # And the packages listed here might be already defined there.
+            sudo apt-get install -y --allow-change-held-packages wget sudo python3 python-is-python3 openjdk-11-jdk-headless git gperf python-mako time genisoimage patch mtools
+            java -version
+
+            ## https://source.android.com/docs/setup/start/requirements#hardware-requirements
+            sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev libc6-dev-i386 libncurses5 x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
 
             mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
             curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
@@ -51,79 +58,54 @@
             chmod a+x ${HOME}/bin/*
             export PATH=${HOME}/bin:${PATH}
 
-            if [ ! -d "/home/buildslave/srv/96boards-hikey-aosp-master" ]; then
-              sudo mkdir -p /home/buildslave/srv/96boards-hikey-aosp-master
-              sudo chmod 777 /home/buildslave/srv/96boards-hikey-aosp-master
+            if [ ! -d "/home/buildslave/srv/aosp-master" ]; then
+              sudo mkdir -p /home/buildslave/srv/aosp-master
+              sudo chmod 777 /home/buildslave/srv/aosp-master
             fi
-            cd /home/buildslave/srv/96boards-hikey-aosp-master
+            cd /home/buildslave/srv/aosp-master
 
             git config --global user.email "ci_notify@linaro.org"
             git config --global user.name "Linaro CI"
 
             # Runs as ubuntu
             set -xe
-            rm -rf build-tools jenkins-tools build/out build/android-patchsets build-configs
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-android-build-tools.git build-tools
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-jenkins-tools.git jenkins-tools
-            git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git build-configs
-
             export BUILD_CONFIG_FILENAME=${BUILD_CONFIG_FILENAME:-${JOB_NAME#android-*}}
 
-            cat << EOF > config.txt
-            BUILD_CONFIG_REPO=http://android-git.linaro.org/git/android-build-configs.git
-            BUILD_CONFIG_BRANCH=master
-            EOF
-            echo config.txt
-            export CONFIG=`base64 -w 0 config.txt`
-
             # Download vendor binaries for hikey.
             mkdir -p build
+            # Delete sources before build to save space
             cd build/
-            rm -rf *.tgz
-            wget https://dl.google.com/dl/android/aosp/arm-hikey960-OPR-cf4e0c80.tgz -O arm-hikey960-OPR-cf4e0c80.tgz
-            tar -xvf arm-hikey960-OPR-cf4e0c80.tgz
-            yes "I ACCEPT" | ./extract-arm-hikey960.sh
-            cd -
-
-            build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-            cp -a /home/buildslave/srv/96boards-hikey-aosp-master/build/out/*.xml /home/buildslave/srv/96boards-hikey-aosp-master/build/out/*.json ${WORKSPACE}/
+            rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* clang-src hikey-linaro/configs
+            rm -fr android-build-configs android-patchsets
+            # to build with clean environment, and it helps make sure
+            # there will be only one pinned-manifest under out/pinned-manifest/
+            rm -fr out
+            git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git android-build-configs
+            ./android-build-configs/linaro-build.sh -c ${BUILD_CONFIG_FILENAME}
+            cp -a out/pinned-manifest/*-pinned-manifest.xml "${WORKSPACE}/pinned-manifest.xml"
+            cp -a out/target/product/hikey960/*.json ${WORKSPACE}/
 
-            cd /home/buildslave/srv/96boards-hikey-aosp-master/build/
             source build/envsetup.sh
-            lunch hikey960-userdebug
+            lunch hikey960-trunk_staging-userdebug
             sed -i "s/eng.\`whoami\`/${BUILD_NUMBER}/g" device/linaro/hikey/factory-images/generate-factory-images-hikey960.sh
             sed -i "s/target\/product\/hikey960//g" device/linaro/hikey/factory-images/generate-factory-images-hikey960.sh
             cd -
-            cd /home/buildslave/srv/96boards-hikey-aosp-master/build/out/dist/
+            cd /home/buildslave/srv/aosp-master/build/out/dist/
             set +xe
             . ../../device/linaro/hikey/factory-images/generate-factory-images-package.sh
-            cp /home/buildslave/srv/96boards-hikey-aosp-master/build/out/*.xml  /home/buildslave/srv/96boards-hikey-aosp-master/build/out/dist/
+            cp /home/buildslave/srv/aosp-master/build/out/*.xml  /home/buildslave/srv/aosp-master/build/out/dist/
             rm -rf pub/
             mkdir pub/
             cp *.zip *.xml pub/
             cd -
-            cd /home/buildslave/srv/96boards-hikey-aosp-master/build/device/linaro/hikey/; git reset --hard; cd -;
+            cd /home/buildslave/srv/aosp-master/build/device/linaro/hikey/; git reset --hard; cd -;
 
-            # generate boot.img compatible with UEFI
-            pushd /home/buildslave/srv/96boards-hikey-aosp-master/build/out/
-            cp ramdisk.img dist/pub/
-            cp kernel Image.gz
-            gunzip Image.gz
-            cat Image 3660-hikey960.dtb >> Image-dtb
-            wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg -O mkbootimg
-            python mkbootimg \
-              --kernel Image-dtb \
-              --cmdline console="androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0 firmware_class.path=/system/etc/firmware loglevel=15 buildvariant=userdebug" \
-              --base 0x0 --tags_offset 0x07a00000 --kernel_offset 0x00080000 \
-              --ramdisk_offset 0x07c00000 \
-              --os_version P \
-              --os_patch_level 2016-11-05 \
-              --ramdisk ramdisk.img \
-              --output boot.uefi.img
-            for img in "boot.img dt.img boot.uefi.img system.img userdata.img cache.img"; do
-            pxz -9 $img
+            pushd /home/buildslave/srv/aosp-master/build/out/
+            for img in "boot.img dt.img vendor.img system.img userdata.img super.img"; do
+              xz -9 $img
             done
-            cp *.img.xz dist/pub/
+            cp ramdisk.img *.img.xz dist/pub/
+            cp -a pinned-manifest/*-pinned-manifest.xml "dist/pub/pinned-manifest.xml"
             popd
 
             wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O build/out/dist/pub/BUILD-INFO.txt
@@ -138,6 +120,7 @@
             PUB_DEST=96boards/hikey960/linaro/aosp-master/${BUILD_NUMBER}
             PUB_SRC=${PWD}/build/out/dist/pub
             PUB_EXTRA_INC=^[^/]+zip
+            LINK_LATEST=false
             EOF
         - inject:
             properties-file: publish_parameters
@@ -150,10 +133,10 @@
             artifacts: '*.xml,*.json'
             latest-only: true
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
             files: 'build/fingerprints/*'
         - email:
-            recipients: 'vishal.bhoj@linaro.org john.stultz@linaro.org'
+            recipients: 'vishal.bhoj@linaro.org john.stultz@linaro.org, yongqin.liu@linaro.org'
diff --git a/96boards-poplar-android-o.yaml b/96boards-poplar-android-o.yaml
deleted file mode 100644
index 0d35352adb..0000000000
--- a/96boards-poplar-android-o.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- job:
-    name: 96boards-poplar-android-o
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            num-to-keep: 60
-            days-to-keep: 60
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: '96boards - Poplar AOSP O'
-    concurrent: true
-    triggers:
-        - timed : '@daily'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-            users:
-                - 'ASPEN_PRIVATE_KEY_SSH'
-    builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
-
-            java -version
-
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-pip
-
-
-            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
-            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            chmod a+x ${HOME}/bin/*
-            export PATH=${HOME}/bin:${PATH}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            repo init -u https://android.googlesource.com/platform/manifest.git -b android-8.0.0_r17
-            repo sync -j8
-
-            mkdir device/hisilicon
-            git clone https://github.com/96boards-poplar/poplar-device.git device/hisilicon/poplar
-            git clone https://github.com/96boards-poplar/poplar-kernel.git device/hisilicon/poplar-kernel
-            git clone ssh://git@dev-private-git.linaro.org/aspen/device/vendor_dev.git vendor/hisilicon/poplar
-
-            source build/envsetup.sh
-            lunch poplar-eng
-            make -j"$(nproc)"
-
-            pushd out/target/product/poplar
-            for image in "boot.img" "system.img" "userdata.img"  "cache.img"; do
-              echo "Compressing ${image}"
-              xz ${image}
-            done
-            popd
-
-            repo manifest -r -o out/target/product/poplar/pinned-manifest.xml
-            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/poplar/build-info/template.txt -O out/target/product/poplar/BUILD-INFO.txt
-
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_DEST=96boards/poplar/linaro/aosp/${BUILD_NUMBER}
-            PUB_SRC=${PWD}/out/target/product/poplar/
-            PUB_EXTRA_INC=^[^/]+zip
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - inject:
-            properties-file: publish_parameters
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org bin.chen@linaro.org'
diff --git a/96boards-qrb5165-rb5-aosp-master/builders.sh b/96boards-qrb5165-rb5-aosp-master/builders.sh
new file mode 100644
index 0000000000..1e47960e9e
--- /dev/null
+++ b/96boards-qrb5165-rb5-aosp-master/builders.sh
@@ -0,0 +1,53 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync liblz4-tool lzop libssl-dev libdrm-intel1 python-pip
+
+wget -q \
+  http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
+  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+sudo dpkg -i --force-all *.deb
+rm -f *.deb
+
+# FIXME jinja2-cli and ruamel.yaml==0.16.13 installer is broken
+# Install jinja2-cli and ruamel.yaml==0.16.13
+#pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+java -version
+
+BUILD_DIR=aosp-master/build
+if [ ! -d "/home/buildslave/srv/${BUILD_DIR}" ]; then
+  sudo mkdir -p /home/buildslave/srv/${BUILD_DIR}
+  sudo chmod 777 /home/buildslave/srv/${BUILD_DIR}
+fi
+cd /home/buildslave/srv/${BUILD_DIR}
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+repo init -u https://android.googlesource.com/platform/manifest -b main --repo-branch=master --no-repo-verify
+repo sync -j$(nproc) -c -f
+./device/linaro/dragonboard/fetch-vendor-package.sh
+rm -rf build-info
+source build/envsetup.sh
+lunch rb5-userdebug
+make -j$(nproc)
+repo manifest -r -o out/target/product/rb5/pinned-manifest.xml
+
+wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O ${PWD}/out/target/product/rb5/BUILD-INFO.txt
+
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_DEST=96boards/qrb5165-rb5/linaro/aosp-master/${BUILD_NUMBER}
+PUB_SRC=${PWD}/out/target/product/rb5/
+PUB_EXTRA_INC=^[^/]+\.(dtb|dtbo|zip)$|MLO|vmlinux|System.map
+EOF
diff --git a/96boards-reference-platform-aosp-db410c.yaml b/96boards-reference-platform-aosp-db410c.yaml
new file mode 100644
index 0000000000..93d698586d
--- /dev/null
+++ b/96boards-reference-platform-aosp-db410c.yaml
@@ -0,0 +1,166 @@
+- job:
+    name: 96boards-reference-platform-aosp-db410c
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 60
+        numToKeep: 60
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+    disabled: true
+    node: docker-xenial-aosp
+    display-name: 'Reference Platform - AOSP (DragonBoard 410c)'
+    concurrent: true
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            java -version
+
+            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
+            sudo apt-get update
+            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools libfdt-dev python-mako gettext
+
+            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
+            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+            chmod a+x ${HOME}/bin/*
+            export PATH=${HOME}/bin:${PATH}
+
+            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
+              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
+              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
+            fi
+            cd /home/buildslave/srv/${JOB_NAME}
+
+            git config --global user.email "ci_notify@linaro.org"
+            git config --global user.name "Linaro CI"
+
+            # Clean any artifacts related to previous build
+            rm -rf vendor/db410c
+            rm -rf out/target/product/db410c/system/ out/target/product/db410c/data/ out/target/product/db410c/*.xml out/target/product/db410c/obj/kernel/
+            rm -rf out/target/product/db410c/*.zip out/target/product/db410c/*.img out/target/product/db410c/*.xz
+
+            # Runs as ubuntu
+            repo init -u https://android.googlesource.com/platform/manifest -b android-6.0.1_r16
+            cd .repo
+            rm -rf local_manifests
+            git clone https://github.com/96boards/android_manifest -b android-6.0-db410c local_manifests
+            cd ..
+            repo sync -f --force-sync -j16
+
+            # Extract the proprietary firmware
+            mkdir -p vendor/db410c
+            cd vendor/db410c
+            wget --progress=dot -e dotbytes=1M http://developer.qualcomm.com/download/db410c/firmware-410c-1.2.0.bin
+            yes | sh firmware-410c-1.2.0.bin > /dev/null
+            cd ../..
+
+            mkdir -p out
+            cp .repo/manifest.xml out/source-manifest.xml
+            repo manifest -r -o out/pinned-manifest.xml
+
+            source build/envsetup.sh
+            lunch db410c-userdebug
+            make droidcore -j8
+
+            cd out/target/product/db410c/
+            for image in "boot-db410c.img" "system.img" "userdata.img" "cache.img" "dt.img" "ramdisk.img"; do
+                echo "Compressing ${image}"
+                xz -z ${image}
+            done
+            cd -
+
+            cp -a /home/buildslave/srv/${JOB_NAME}/out/*.xml /home/buildslave/srv/${JOB_NAME}/out/target/product/db410c/
+            cp -a /home/buildslave/srv/${JOB_NAME}/out/*.xml ${WORKSPACE}/
+
+            # Create MD5SUM
+            cd out/target/product/db410c/
+            md5sum *.txt *.xz *.xml *.img > MD5SUMS.txt
+            cd -
+
+            # Build information
+            cat > out/target/product/db410c/HEADER.textile << EOF
+
+            h4. Reference Platform Build - AOSP (DragonBoard 410c)
+
+            Build description:
+            * Build URL: "$BUILD_URL":$BUILD_URL
+
+            Please also check "RPB-AOSP-DragonBoard410c-Build":https://github.com/96boards/documentation/wiki/RPB-AOSP-DragonBoard410c-Build for more information about this build.
+
+            Install (also check the bootloader "install guide":https://github.com/96boards/documentation/wiki/Dragonboard-410c-Installation-Guide-for-Linux-and-Android#install-android-release):
+
+            bc. wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/boot-db410c.img.xz
+            wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/cache.img.xz
+            wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/system.img.xz
+            wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/userdata.img.xz
+            for f in *.xz; do xz -d \$f; done
+            sudo fastboot flash boot boot-db410c.img
+            sudo fastboot flash system system.img
+            sudo fastboot flash userdata userdata.img
+            sudo fastboot flash cache cache.img
+
+            EOF
+
+            cat > out/target/product/db410c/BUILD-INFO.txt << EOF
+            Format-Version: 0.5
+
+            Files-Pattern: *
+            License-Type: open
+            EOF
+
+            # Publish parameters
+            cat << EOF > ${WORKSPACE}/publish_parameters
+            PUB_SRC=${PWD}/out/target/product/db410c/
+            PUB_DEST=96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}
+            PUB_EXTRA_INC=^(BUILD-INFO.txt|HEADER.textile)$
+            EOF
+
+            # Construct post-build-lava parameters
+            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+            DEVICE_TYPE=apq8016-sbc
+            TARGET_PRODUCT=${TARGET_PRODUCT}
+            MAKE_TARGETS=${MAKE_TARGETS}
+            JOB_NAME=${JOB_NAME}
+            BUILD_NUMBER=${BUILD_NUMBER}
+            BUILD_URL=${BUILD_URL}
+            DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
+            LAVA_SERVER=validation.linaro.org/RPC2/
+            IMAGE_EXTENSION=img.xz
+            FRONTEND_JOB_NAME=${JOB_NAME}
+            DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
+            CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/refs/heads/master:/96boards-reference-platform-aosp/lava-job-definitions/apq8016-sbc/template-boot.json
+            EOF
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+        - trigger-builds:
+            - project: 'post-build-lava'
+              property-file: post_build_lava_parameters
+              block: true
+    publishers:
+        - archive:
+            artifacts: '*.xml'
+            latest-only: true
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'fathi.boudra@linaro.org vishal.bhoj@linaro.org'
diff --git a/96boards-reference-platform-hikey-sd-installer.yaml b/96boards-reference-platform-hikey-sd-installer.yaml
deleted file mode 100644
index 2e7148cef1..0000000000
--- a/96boards-reference-platform-hikey-sd-installer.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-- job:
-    name: 96boards-reference-platform-hikey-sd-installer
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: '96boards - Reference Platform - Hikey SD Installer'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: 96boards-reference-platform-hikey-sd-installer/builders.sh
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/96boards-reference-platform-hikey-sd-installer/builders.sh b/96boards-reference-platform-hikey-sd-installer/builders.sh
deleted file mode 100644
index e8d4d06535..0000000000
--- a/96boards-reference-platform-hikey-sd-installer/builders.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  sudo umount bootfs || true
-  sudo umount rootfs || true
-  sudo kpartx -dv hikey-sd-install.img || true
-  rm -rf hikey-sd-install.img out
-}
-
-export DEBIAN_FRONTEND=noninteractive
-sudo apt-get update -q=2
-sudo apt-get install -q=2 -y --no-install-recommends pigz
-
-# Get installer rootfs
-export ROOTFS_BUILD_TIMESTAMP=$(wget -q  -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=installer/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd)
-export ROOTFS_BUILD_NUMBER=$(wget -q  -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=installer/lastSuccessfulBuild/buildNumber)
-export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/installer-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-installer-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-wget -nc --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-mkdir -p out bootfs rootfs
-
-# Build information
-cat > out/HEADER.textile << EOF
-
-h4. Reference Platform Build - Installer for HiKey
-
-Build description:
-* Build URL: "${BUILD_URL}":${BUILD_URL}
-* Installer Rootfs: "${ROOTFS_BUILD_URL}":${ROOTFS_BUILD_URL}
-EOF
-
-# set up partitions
-dd if=/dev/zero of=hikey-sd-install.img bs=2096 seek=1M count=0
-/sbin/parted --script hikey-sd-install.img mklabel msdos
-/sbin/parted --script hikey-sd-install.img mkpart p fat16 0 50
-/sbin/parted --script hikey-sd-install.img set 1 boot
-/sbin/parted --script -- hikey-sd-install.img mkpart p ext4 50 -0
-
-for device in $(sudo kpartx -avs hikey-sd-install.img | cut -d' ' -f3); do
-  partition=$(echo ${device} | cut -d'p' -f3)
-  case "${partition}" in
-    1)
-      sudo mkfs.fat -F16 /dev/mapper/${device}
-      sudo mount /dev/mapper/${device} bootfs
-      ;;
-    2)
-      sudo mkfs.ext4 /dev/mapper/${device}
-      sudo mount /dev/mapper/${device} rootfs
-      sudo tar xf linaro-jessie-installer-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz -C rootfs --strip-components=1
-      ;;
-  esac
-done
-
-sudo mkdir -p rootfs/mnt/debian rootfs/boot/efi/EFI/BOOT
-sudo chroot rootfs apt-get update -q=2
-sudo chroot rootfs apt-get install -q=2 -y linux-image-reference-arm64
-sudo rm rootfs/var/cache/apt/archives/*deb rootfs/var/lib/apt/lists/*||true
-sudo chroot rootfs /usr/sbin/grub-install-hikey -s
-sudo cp -a rootfs/boot/efi/* bootfs/
-sudo chown ${USER}:${USER} rootfs/mnt/debian
-
-# download alip image for flash
-export ROOTFS_BUILD_TIMESTAMP=$(wget -q  -O - https://ci.linaro.org/job/96boards-reference-platform-debian/BOARD=hikey,label=docker-jessie-amd64/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd)
-export ROOTFS_BUILD_NUMBER=$(wget -q  -O - https://ci.linaro.org/job/96boards-reference-platform-debian/BOARD=hikey,label=docker-jessie-amd64/lastSuccessfulBuild/buildNumber)
-export TARGET_ROOT_URL="https://snapshots.linaro.org/96boards/reference-platform/debian/${ROOTFS_BUILD_NUMBER}/hikey/hikey-rootfs-debian-jessie-alip-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.emmc.img.gz"
-export TARGET_BOOT_URL="https://snapshots.linaro.org/96boards/reference-platform/debian/${ROOTFS_BUILD_NUMBER}/hikey/hikey-boot-linux-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.uefi.img.gz"
-wget -nc --progress=dot -e dotbytes=2M -O rootfs/mnt/debian/rootfs.img.gz ${TARGET_ROOT_URL}
-wget -nc --progress=dot -e dotbytes=2M -O rootfs/mnt/debian/boot.img.gz ${TARGET_BOOT_URL}
-
-sudo cp -a rootfs/usr/share/96boards-tools/flash-hikey rootfs/mnt/flash
-
-cat << EOF > rootfs/mnt/debian/os.json
-{
-    "name": "Reference platform Debian Desktop for hikey - Build ${BUILD_NUMBER}",
-    "url": "http://releases.linaro.org/96boards/installer/hikey",
-    "version": "${ROOTFS_BUILD_NUMBER}",
-    "release_date": "$(date +%Y-%m-%d)",
-    "description": "Reference platform Debian LXDE desktop for hikey"
-}
-EOF
-
-sudo umount bootfs rootfs
-sudo kpartx -dv hikey-sd-install.img
-time pigz -9 hikey-sd-install.img
-mv hikey-sd-install.img.gz out/hikey-sd-installer-${BUILD_NUMBER}.img.gz
-
-# Publish
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-  --server ${PUBLISH_SERVER} \
-  --link-latest \
-  out/ 96boards/reference-platform/installer/hikey/${BUILD_NUMBER}/
diff --git a/96boards-reference-uefi-staging.yaml b/96boards-reference-uefi-staging.yaml
new file mode 100644
index 0000000000..612249ce30
--- /dev/null
+++ b/96boards-reference-uefi-staging.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: 96boards-reference-uefi-staging
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: EDK2_VERSION
+            default: 'origin/release-prep'
+        - string:
+            name: ATF_VERSION
+            default: 'v1.5'
+        - string:
+            name: OPTEE_VERSION
+            default: '3.0.0'
+    disabled: false
+    node: master
+    child-workspace: .
+    display-name: 'Reference Platform - UEFI (staging)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MX_PLATFORM
+            values:
+                - hikey
+                - hikey960
+        - axis:
+            type: user-defined
+            name: MX_TYPE
+            values:
+                - RELEASE
+                - DEBUG
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrapper:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - matrix-tie-parent:
+            node: master
+    builders:
+        - shell:
+            !include-raw: rpb-uefi/staging/builders.sh
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --server ${PUBLISH_SERVER} \
+              out/${BUILD_TYPE} reference-platform/components/uefi-staging/${BUILD_NUMBER}/${BUILD_TYPE}/${MX_PLATFORM}/
+            python3 ${HOME}/bin/linaro-cp.py \
+              --server ${PUBLISH_SERVER} \
+              --make-link reference-platform/components/uefi-staging/${BUILD_NUMBER}
+    publishers:
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, qa-team@linaro.org'
+            always: true
+            matrix-trigger: only-parent
diff --git a/README b/README
index 5e028d832b..3f451a5926 100644
--- a/README
+++ b/README
@@ -43,6 +43,15 @@ To manually force a Jenkins job update:
 
     jenkins-jobs --conf=jenkins_jobs.ini update <job>.yaml
 
+Contribute
+==========
+
+If you want to contribute changes, you can send Gerrit merge requests at
+https://review.linaro.org/#/q/project:ci/job/configs
+
+To get started with Linaro Gerrit server, please check:
+https://wiki.linaro.org/Platform/Systems/CodeReviewServer
+
 TODO
 ----
  * YAML header contains maintainer name
diff --git a/android-chromium-clang-armv7.yaml b/android-chromium-clang-armv7.yaml
deleted file mode 100644
index bb3b32c39c..0000000000
--- a/android-chromium-clang-armv7.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: android-chromium-clang-armv7
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ARGS
-            default: 'clang_arm'
-    disabled: true
-    node: docker-xenial-chromium
-    display-name: 'Chromium apk Built with clang for ARMv7'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            rm -rf configs
-            git clone https://git.linaro.org/ci/job/configs.git
-            ./configs/android-chromium/chromium-build.sh
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              chromium/src/out/Default/apks \
-              android/${JOB_NAME}/${BUILD_NUMBER} \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              ./configs/android-chromium/lava-job-definitions/hikey \
-              android/${JOB_NAME}/${BUILD_NUMBER}/hikey \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk|json)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=hi6220-hikey
-            TARGET_PRODUCT=hikey
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
-            DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
-            EOF
-
-            echo "Build finished"
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org daniel.diaz@linaro.org'
diff --git a/android-chromium-clang-armv8.yaml b/android-chromium-clang-armv8.yaml
deleted file mode 100644
index 79f0daff62..0000000000
--- a/android-chromium-clang-armv8.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: android-chromium-clang-armv8
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ARGS
-            default: 'clang_arm64'
-    disabled: true
-    node: docker-xenial-chromium
-    display-name: 'Chromium apk Built with clang for ARMv8'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            rm -rf configs
-            git clone https://git.linaro.org/ci/job/configs.git
-            ./configs/android-chromium/chromium-build.sh
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              chromium/src/out/Default/apks \
-              android/${JOB_NAME}/${BUILD_NUMBER} \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              ./configs/android-chromium/lava-job-definitions/hikey \
-              android/${JOB_NAME}/${BUILD_NUMBER}/hikey \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk|json)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=hi6220-hikey
-            TARGET_PRODUCT=hikey
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
-            DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
-            EOF
-
-            echo "Build finished"
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org daniel.diaz@linaro.org'
diff --git a/android-chromium-gcc-armv7.yaml b/android-chromium-gcc-armv7.yaml
deleted file mode 100644
index ce6690aa24..0000000000
--- a/android-chromium-gcc-armv7.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: android-chromium-gcc-armv7
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ARGS
-            default: 'gcc_arm'
-    disabled: true
-    node: docker-xenial-chromium
-    display-name: 'Chromium apk Built with gcc for ARMv7'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            rm -rf configs
-            git clone https://git.linaro.org/ci/job/configs.git
-            ./configs/android-chromium/chromium-build.sh
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              chromium/src/out/Default/apks \
-              android/${JOB_NAME}/${BUILD_NUMBER} \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              ./configs/android-chromium/lava-job-definitions/hikey \
-              android/${JOB_NAME}/${BUILD_NUMBER}/hikey \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk|json)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=hi6220-hikey
-            TARGET_PRODUCT=hikey
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
-            DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
-            EOF
-
-            echo "Build finished"
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org daniel.diaz@linaro.org'
diff --git a/android-chromium-gcc-armv8.yaml b/android-chromium-gcc-armv8.yaml
deleted file mode 100644
index fb40baa18c..0000000000
--- a/android-chromium-gcc-armv8.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: android-chromium-gcc-armv8
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ARGS
-            default: 'gcc_arm64'
-    disabled: true
-    node: docker-xenial-chromium
-    display-name: 'Chromium apk Built with gcc for ARMv8'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            rm -rf configs
-            git clone https://git.linaro.org/ci/job/configs.git
-            ./configs/android-chromium/chromium-build.sh
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              chromium/src/out/Default/apks \
-              android/${JOB_NAME}/${BUILD_NUMBER} \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              ./configs/android-chromium/lava-job-definitions/hikey \
-              android/${JOB_NAME}/${BUILD_NUMBER}/hikey \
-              --include "^[^/]+[._](img[^/]*|tar[^/]*|xml|sh|apk|json)$" \
-              --include "^[BHi][^/]+txt$" \
-              --include "^(MANIFEST|MD5SUMS|changelog.txt)$"
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=hi6220-hikey
-            TARGET_PRODUCT=hikey
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            CUSTOM_JSON_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}/hikey/template.json
-            DOWNLOAD_URL=https://snapshots.linaro.org/android/${JOB_NAME}/${BUILD_NUMBER}
-            EOF
-
-            echo "Build finished"
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org daniel.diaz@linaro.org'
diff --git a/android-clang-toolchain.yaml b/android-clang-toolchain.yaml
index 5f58881331..b565d739b3 100644
--- a/android-clang-toolchain.yaml
+++ b/android-clang-toolchain.yaml
@@ -7,13 +7,13 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
             days-to-keep: 60
             num-to-keep: 60
-    disabled: false
+    disabled: true
     node: docker-xenial-aosp
     display-name: 'Upstream Clang toolchain build for AOSP'
     wrappers:
@@ -31,17 +31,17 @@
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
             PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --manifest \
               --link-latest \
               --split-job-owner \
               ${HOME}/srv/aosp/${JOB_NAME}/llvm/build/ \
               ${PUB_DEST} \
-              --include "^(clang-master.tar.xz)$"
+              --include "^(clang-.*.tar.xz)$"
 
               cat << EOF > ${WORKSPACE}/android-master-clang_parameters
-              CLANG_TOOLCHAIN_URL=http://snapshots.linaro.org/android/android-clang-toolchain/${BUILD_NUMBER}/clang-master.tar.xz
+              CLANG_TOOLCHAIN_URL=http://snapshots.linaro.org/android/android-clang-toolchain/${BUILD_NUMBER}/clang-dev-linux-x86.tar.xz
               EOF
         - trigger-builds:
             - project: 'android-master-clang'
@@ -49,7 +49,7 @@
               block: false
     publishers:
         - email-ext:
-            recipients: 'minseong.kim@linaro.org,vishal.bhoj@linaro.org,daniel.diaz@linaro.org'
+            recipients: 'bernhard.rosenkranzer@linaro.org,vishal.bhoj@linaro.org,daniel.diaz@linaro.org'
             content-type: text
             body: |
                 Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
@@ -59,7 +59,7 @@
                 Errors:
                 ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
diff --git a/android-clang-toolchain/builders.sh b/android-clang-toolchain/builders.sh
index f8cd21008c..c3c179cc33 100755
--- a/android-clang-toolchain/builders.sh
+++ b/android-clang-toolchain/builders.sh
@@ -4,63 +4,49 @@ set -ex
 export PATH=$PATH://home/buildslave/bin/
 
 sudo apt-get -q=2 update
-sudo apt-get -q=2 install -y libxml2-dev zlib1g-dev libtinfo-dev git-svn gawk libxml2-utils rsync pxz python-requests
+sudo apt-get -q=2 install -y libxml2-dev zlib1g-dev libtinfo-dev git-svn gawk libxml2-utils rsync pxz python-requests ninja-build
 
-wget -q \
-  https://cmake.org/files/v3.5/cmake-3.5.2-Linux-x86_64.sh
+BASEDIR="${HOME}/srv/aosp/${JOB_NAME}"
+rm -rf "${BASEDIR}"
+mkdir -p "${BASEDIR}"
+cd "${BASEDIR}"
 
-yes y | bash cmake-3.5.2-Linux-x86_64.sh
-export PATH=${PWD}/cmake-3.5.2-Linux-x86_64/bin/:${PATH}
-
-mkdir -p ${HOME}/srv/aosp/${JOB_NAME}
-cd ${HOME}/srv/aosp/${JOB_NAME}
-
-# Toolchain src downloads
-if [ -d llvm ]; then
-    rm llvm -rf
-fi
-repo init -u https://android-git.linaro.org/git/platform/manifest.git -b clang-build
+# Download toolchain prebuilt bootstrap tools
+repo init -u https://android-git.linaro.org/git/platform/manifest.git -b linaro-upstream-llvm-toolchain
 repo sync -j16 -c
 
-# For building LLVMgold.so using -DLLVM_BINUTILS_INCDIR flag
-if [ ! -d binutils ]; then
-    git clone https://android.googlesource.com/toolchain/binutils
-else
-    cd binutils
-    git pull
-    cd ..
-fi
-
-# Toolchain download
-if [ ! -d clang+llvm-5.0.0-linux-x86_64-ubuntu14.04 ]; then
-    wget http://releases.llvm.org/5.0.0/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz
-    tar xvfJ clang+llvm-5.0.0-linux-x86_64-ubuntu14.04.tar.xz
-fi
-
-# Temporary clang patch for 25b45aa81854313486df891985cdd7ef1ec09780
-# cd ${HOME}/srv/aosp/${JOB_NAME}/llvm/tools/clang
-# git clone https://git.linaro.org/people/minseong.kim/aosp_patches_for_upstream_clang.git
-# patch -p1 < aosp_patches_for_upstream_clang/revert_25b45a.patch
-# cd ${HOME}/srv/aosp/${JOB_NAME}
-
-cd llvm
-mkdir -p build/clang-master
-cd build
-cmake -G "Unix Makefiles" ../ \
-	 -DCMAKE_BUILD_TYPE=Release \
-	 -DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	 -DCMAKE_INSTALL_PREFIX=./clang-master \
-	 -DLLVM_TARGETS_TO_BUILD="host;ARM;X86;AArch64" \
-	 -DLLVM_ENABLE_ASSERTIONS=false \
-	 -DCMAKE_C_COMPILER=${HOME}/srv/aosp/${JOB_NAME}/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang \
-	 -DCMAKE_CXX_COMPILER=${HOME}/srv/aosp/${JOB_NAME}/clang+llvm-5.0.0-linux-x86_64-ubuntu14.04/bin/clang++ \
-	 -DLIBCXXABI_LIBCXX_INCLUDES=${HOME}/srv/aosp/${JOB_NAME}/llvm/projects/libcxx/include \
-	 -DLIBCXX_CXX_ABI_INCLUDE_PATHS=${HOME}/srv/aosp/${JOB_NAME}/llvm/projects/libcxxabi/include \
-	 -DLLVM_BINUTILS_INCDIR=${HOME}/srv/aosp/${JOB_NAME}/binutils/binutils-2.27/include
-
-make install VERBOSE=1 -j"$(nproc)"
-
-rm -f clang-master.tar.xz
-tar -I pxz -cf clang-master.tar.xz clang-master
+# Apply needed patches, if any
+for d in toolchain/patches/*; do
+	[ -d "$d" ] || continue
+	for i in $d/*.patch; do
+		[ -e "$i" ] || continue
+		p="$(realpath $i)"
+		pushd "toolchain/$(basename $d)"
+		echo "Applying $(basename $p)"
+		patch -p1 <"$p"
+		popd
+	done
+done
+
+# Find the SVN revision the compiler is based on
+REVISION=0
+for i in clang clang-tools-extra compiler-rt libcxx libcxxabi lld llvm openmp_llvm; do
+	pushd toolchain/$i
+	REV=$(git log |grep git-svn-id: |head -n1 |cut -d@ -f2 |cut -d' ' -f1)
+	[ "$REV" -ge "$REVISION" ] && REVISION="$REV"
+	popd
+done
+echo "Building compiler based on clang revision $REVISION"
+
+# And give the build script the correct version information
+sed -i -e "s,^svn_revision =.*,svn_revision = 'r${REVISION}'," toolchain/llvm_android/android_version.py
+
+# And build it...
+python toolchain/llvm_android/build.py --no-build-windows
+
+# Recompress output to save space
+mv out/*.tar.bz2 .
+bunzip2 *.tar.bz2
+xz -9ef *.tar
 
 echo "Build finished"
diff --git a/android-cts.yaml b/android-cts.yaml
deleted file mode 100644
index c71188c675..0000000000
--- a/android-cts.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-- job:
-    name: android-cts
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ANDROID_MANIFEST_URL
-            default: https://android.googlesource.com/platform/manifest
-        - string:
-            name: MANIFEST_BRANCH
-            default: master
-        - string:
-            name: LUNCH_TARGET
-            default: hikey-userdebug
-        - string:
-            name: PATCHSETS
-            default: ''
-    disabled: false
-    node: docker-utopic-aosp
-    display-name: 'Android CTS Build'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-cts/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-cts/builders.sh b/android-cts/builders.sh
index 603e6fe2c9..82337f35b7 100755
--- a/android-cts/builders.sh
+++ b/android-cts/builders.sh
@@ -1,6 +1,8 @@
-# Build Android
+# Build Android cts
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
+# change to the build directory to repo sync and build
+cd build
 repo init -u ${ANDROID_MANIFEST_URL} -b ${MANIFEST_BRANCH}
 repo sync -j"$(nproc)" -c
 rm -rf out/
@@ -16,7 +18,6 @@ if [ -n "$PATCHSETS" ]; then
     done
 fi
 
-
 source build/envsetup.sh
 lunch ${LUNCH_TARGET}
 make -j"$(nproc)" cts
@@ -25,11 +26,19 @@ wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/g
 
 cp out/host/linux-x86/cts/android-cts.zip pub/
 
-rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
+# Delete sources after build to save space
+rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* out/
+rm -fr .repo
 
+# need to convert '_' to '-'
+# otherwise, aosp_arm64-userdebug will be translated to '~aosp/arm64-userdebug'
+# when upload to snapshot.linaro.org via linaro-cp.py
+# like reported here:
+# https://ci.linaro.org/job/android-cts/20/console
+lunch_target_str=$(echo ${LUNCH_TARGET}|tr '_' '-')
 # Publish parameters
 cat << EOF > ${WORKSPACE}/publish_parameters
 PUB_SRC=${PWD}/pub
-PUB_DEST=/android/${JOB_NAME}/${LUNCH_TARGET}/${BUILD_NUMBER}
+PUB_DEST=/android/${JOB_NAME}/${lunch_target_str}/${BUILD_NUMBER}/${MANIFEST_BRANCH}
 PUB_EXTRA_INC=^[^/]+zip
 EOF
diff --git a/android-gcc-toolchain.yaml b/android-gcc-toolchain.yaml
index b68ed57869..f60a19f2ff 100644
--- a/android-gcc-toolchain.yaml
+++ b/android-gcc-toolchain.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -21,8 +21,8 @@
             name: GCCVER
             default: '6.1.0'
             description: 'GCC version (e.g. x.y.z or x.y-YYYY.MM for TCWG releases)'
-    disabled: false
-    node: docker-utopic-aosp
+    disabled: true
+    node: docker-xenial-aosp
     display-name: 'GCC based AOSP toolchain'
     triggers:
         - gerrit:
@@ -101,7 +101,7 @@
 
             # Publish
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
                 --api_version 3 \
                 --link-latest \
                 ${WORKSPACE}/android-ndk-build/ndk/out/dist android/${JOB_NAME}/${BUILD_NUMBER}
diff --git a/android-generic-build.yaml b/android-generic-build.yaml
index 398f90fe8c..e6bbc2e2a4 100644
--- a/android-generic-build.yaml
+++ b/android-generic-build.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -42,7 +42,7 @@
                 * All the builds are Linaro internal by default. Please select public if the build is intended to be accessible to everyone.
                 * WARNING: Please make sure builds with vendor binaries are not made public unless you have the right to distribute them.
     disabled: false
-    node: docker-utopic-aosp
+    node: docker-xenial-aosp
     display-name: 'Generic AOSP build'
     concurrent: true
     wrappers:
diff --git a/android-hikey-linaro-4.14-pmwg.yaml b/android-hikey-linaro-4.14-pmwg.yaml
new file mode 100644
index 0000000000..a26aee0224
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg.yaml
@@ -0,0 +1,127 @@
+- job:
+    name: android-hikey-linaro-4.14-pmwg
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    parameters:
+        - string:
+            name: KERNEL_BRANCH
+            default: 'android-hikey-linaro-4.14-pmwg'
+        - string:
+            name: KERNEL_DESCRIBE
+        - string:
+            name: SRCREV_kernel
+        - string:
+            name: REFERENCE_BUILD_URL
+            default: 'https://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/945/'
+        - string:
+            name: DEFCONFIG
+            default: 'hikey_defconfig'
+        - string:
+            name: DEVICE_TYPE
+            default: 'hi6220-hikey'
+        - string:
+            name: PUB_DEST
+            default: 'android/pmwg/${JOB_NAME}/${BUILD_NUMBER}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://pmwg.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'power'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'pmwg'
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'PMWG Android 4.14 on HiKey'
+    scm:
+        - git:
+            url: https://git.linaro.org/power/android.git
+            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
+            name: origin
+            branches:
+                - origin/${KERNEL_BRANCH}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=12}'
+        - timeout:
+            timeout: 500
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: android-hikey-linaro-4.14-pmwg/builders.sh
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            # Required for Mali binaries
+            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --server ${PUBLISH_SERVER} \
+              --build-info out/BUILD-INFO.txt \
+              --link-latest \
+              out/ ${PUB_DEST}
+        - shell:
+            !include-raw: android-hikey-linaro-4.14-pmwg/submit_for_testing.sh
+    publishers:
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - groovy-postbuild:
+            script:
+                !include-raw: android-hikey-linaro-4.14-pmwg/postbuild.groovy
+        - email-ext:
+            recipients: 'private-pmwg@lists.linaro.org, vishal.bhoj@linaro.org, fathi.boudra@linaro.org'
+            content-type: text
+            subject: '[Jenkins] Build HiKey (${WARNINGS}/${ERRORS}): ${GIT_BRANCH} ${GIT_REVISION,length=12}'
+            body: |
+                Project: ${PROJECT_NAME}
+                Build number: ${BUILD_NUMBER}
+                Build status: ${BUILD_STATUS}
+                Build URL: ${BUILD_URL}
+                Build location: ${PUBLISH_SERVER}${PUB_DEST}
+                Console output: ${BUILD_URL}consoleText
+                Parsed warnings/errors: ${BUILD_URL}parsed_console
+                Git branch: ${GIT_BRANCH}
+                Git commit: ${GIT_COMMIT}
+
+                ${GIT_URL}/commit/?h=${KERNEL_BRANCH}&id=${GIT_COMMIT}
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex="^.*? error: .*?$", linesBefore=0, linesAfter=2, showTruncatedLines=false}
+
+                Warnings:
+                ${BUILD_LOG_REGEX, regex="^.*? warning: .*?$", linesBefore=0, linesAfter=2, showTruncatedLines=false}
+            attach-build-log: true
+            always: true
diff --git a/android-hikey-linaro-4.14-pmwg/builders.sh b/android-hikey-linaro-4.14-pmwg/builders.sh
new file mode 100644
index 0000000000..fa545344ae
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/builders.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -ex
+
+git clone --depth=1 https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
+git clone --depth=1 https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86
+export PATH=${PWD}/aarch64-linux-android-4.9/bin/:${PWD}/linux-x86/clang-r346389c/bin/:${PATH}
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="python-pip openssl libssl-dev"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+export CLANG_TRIPLE=aarch64-linux-gnu-
+export CROSS_COMPILE=aarch64-linux-android-
+make ARCH=arm64 ${DEFCONFIG}
+make ARCH=arm64  CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
+
+wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg.py -O mkbootimg
+wget -q ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img
+
+mkdir -p out
+case "${DEFCONFIG}" in
+  hikey_defconfig)
+    python mkbootimg \
+      --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \
+      --cmdline "console=ttyAMA3,115200 androidboot.console=ttyAMA3,115200 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab" \
+      --os_version O \
+      --os_patch_level 2016-11-05 \
+      --ramdisk ramdisk.img \
+      --output out/boot.img
+    ;;
+  hikey960_defconfig)
+    python mkbootimg \
+      --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \
+      --cmdline "androidboot.hardware=hikey960 firmware_class.path=/vendor/firmware buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab" \
+      --base 0x0 --tags_offset 0x07a00000 --kernel_offset 0x00080000 \
+      --ramdisk_offset 0x07c00000 \
+      --os_version P \
+      --os_patch_level 2016-11-05 \
+      --ramdisk ramdisk.img \
+      --output out/boot.img
+    ;;
+esac
+xz out/boot.img
diff --git a/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/multimedia-template.yaml b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/multimedia-template.yaml
new file mode 100644
index 0000000000..3622cd1443
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/multimedia-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi6220-hikey-r2
+job_name: ${KERNEL_BRANCH}-hi6220-multimedia-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey/debug/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-multimedia-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/template.yaml b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/template.yaml
new file mode 100644
index 0000000000..801c183588
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/template.yaml
@@ -0,0 +1,159 @@
+device_type: hi6220-hikey-r2
+job_name: ${KERNEL_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey/debug/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/example_agenda_aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/vellamo-template.yaml b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/vellamo-template.yaml
new file mode 100644
index 0000000000..8fad210be7
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi6220-hikey/vellamo-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi6220-hikey-r2
+job_name: ${KERNEL_BRANCH}-hi6220-vellamo-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey/debug/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-vellamo-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/multimedia-template.yaml b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/multimedia-template.yaml
new file mode 100644
index 0000000000..fa9f71888e
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/multimedia-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi960-hikey
+job_name: ${KERNEL_BRANCH}-hi960-multimedia-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://testdata.linaro.org/pmwg/hikey960-06122018/prm_ptable.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}/${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor-4.14.img.xz
+        compression: xz
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-multimedia-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/template.yaml b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/template.yaml
new file mode 100644
index 0000000000..c007c7f7b0
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/template.yaml
@@ -0,0 +1,159 @@
+device_type: hi960-hikey
+job_name: ${KERNEL_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://testdata.linaro.org/pmwg/hikey960-06122018/prm_ptable.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}/${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor-4.14.img.xz
+        compression: xz
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/example_agenda_aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/vellamo-template.yaml b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/vellamo-template.yaml
new file mode 100644
index 0000000000..b955a2e60c
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/lava-job-definitions/hi960-hikey/vellamo-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi960-hikey
+job_name: ${KERNEL_BRANCH}-hi960-vellamo-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://testdata.linaro.org/pmwg/hikey960-06122018/prm_ptable.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}/${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor-4.14.img.xz
+        compression: xz
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-vellamo-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.14-pmwg/postbuild.groovy b/android-hikey-linaro-4.14-pmwg/postbuild.groovy
new file mode 100644
index 0000000000..6004b35446
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/postbuild.groovy
@@ -0,0 +1,35 @@
+import hudson.model.*
+
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+  def qa_server = manager.build.buildVariables.get('QA_SERVER')
+  def desc = manager.build.getDescription()
+  if (desc == null) {
+    desc = ""
+  }
+  pattern = ~"${qa_server}/testjob/(\\d+)"
+  manager.build.logFile.eachLine { line ->
+    matcher = pattern.matcher(line)
+    if(matcher.matches()) {
+      def url = matcher.group(0)
+      def testjob_id = matcher.group(1)
+      desc += "&nbsp;<a href='${url}'>QA Reports: ${testjob_id}</a><br/>"
+    }
+  }
+  manager.build.setDescription(desc)
+}
+
+// Parse log file to find warnings and errors
+def logFile = manager.build.logFile.text
+def warnings = logFile =~ /(?ms)(^.*? warning: .*?$)/
+def errors = logFile =~ /(?ms)(^.*? error: .*?$)/
+def warningsCount = warnings.count
+def errorsCount = errors.count
+
+// Update parameters to include warnings and errors values
+def action = manager.build.getAction(hudson.model.ParametersAction.class)
+def parameters = [
+  new StringParameterValue("WARNINGS", "${warningsCount}"),
+  new StringParameterValue("ERRORS", "${errorsCount}")
+]
+updatedAction = action.createUpdated(parameters)
+manager.build.replaceAction(updatedAction)
diff --git a/android-hikey-linaro-4.14-pmwg/submit_for_testing.sh b/android-hikey-linaro-4.14-pmwg/submit_for_testing.sh
new file mode 100755
index 0000000000..6a4f11f60e
--- /dev/null
+++ b/android-hikey-linaro-4.14-pmwg/submit_for_testing.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -ex
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+# Install jinja2-cli and ruamel.yaml==0.16.13
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="virtualenv python-pip"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
+
+[ -z "${DEVICE_TYPE}" ] || \
+python configs/openembedded-lkft/submit_for_testing.py \
+  --device-type ${DEVICE_TYPE} \
+  --build-number ${BUILD_NUMBER} \
+  --lava-server ${LAVA_SERVER} \
+  --qa-server ${QA_SERVER} \
+  --qa-server-team ${QA_SERVER_TEAM} \
+  --qa-server-project ${QA_SERVER_PROJECT} \
+  --git-commit ${GIT_COMMIT:0:12} \
+  --template-path configs/android-hikey-linaro-4.14-pmwg/lava-job-definitions \
+  --template-names vellamo-template.yaml multimedia-template.yaml
diff --git a/android-hikey-linaro-4.9-pmwg.yaml b/android-hikey-linaro-4.9-pmwg.yaml
index 41404f6760..10b755770b 100644
--- a/android-hikey-linaro-4.9-pmwg.yaml
+++ b/android-hikey-linaro-4.9-pmwg.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -26,7 +26,7 @@
             name: SRCREV_kernel
         - string:
             name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/current/'
+            default: 'https://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/1080/'
         - string:
             name: DEFCONFIG
             default: 'hikey_defconfig'
@@ -84,7 +84,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --server ${PUBLISH_SERVER} \
               --build-info out/BUILD-INFO.txt \
               --link-latest \
@@ -93,7 +93,7 @@
             !include-raw: android-hikey-linaro-4.9-pmwg/submit_for_testing.sh
     publishers:
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
diff --git a/android-hikey-linaro-4.9-pmwg/builders.sh b/android-hikey-linaro-4.9-pmwg/builders.sh
index 36ec240b30..fa545344ae 100644
--- a/android-hikey-linaro-4.9-pmwg/builders.sh
+++ b/android-hikey-linaro-4.9-pmwg/builders.sh
@@ -3,20 +3,35 @@
 set -ex
 
 git clone --depth=1 https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
-export PATH=${PATH}:${PWD}/aarch64-linux-android-4.9/bin/
+git clone --depth=1 https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86
+export PATH=${PWD}/aarch64-linux-android-4.9/bin/:${PWD}/linux-x86/clang-r346389c/bin/:${PATH}
 
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="python-pip openssl libssl-dev"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+export CLANG_TRIPLE=aarch64-linux-gnu-
+export CROSS_COMPILE=aarch64-linux-android-
 make ARCH=arm64 ${DEFCONFIG}
-make ARCH=arm64 CROSS_COMPILE=aarch64-linux-android- -j$(nproc) -s Image-dtb
+make ARCH=arm64  CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
 
-wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg -O mkbootimg
+wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg.py -O mkbootimg
 wget -q ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img
 
 mkdir -p out
 case "${DEFCONFIG}" in
   hikey_defconfig)
     python mkbootimg \
-      --kernel ${PWD}/arch/arm64/boot/Image-dtb \
-      --cmdline "console=ttyFIQ0 androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug" \
+      --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \
+      --cmdline "console=ttyAMA3,115200 androidboot.console=ttyAMA3,115200 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab" \
       --os_version O \
       --os_patch_level 2016-11-05 \
       --ramdisk ramdisk.img \
@@ -24,8 +39,8 @@ case "${DEFCONFIG}" in
     ;;
   hikey960_defconfig)
     python mkbootimg \
-      --kernel ${PWD}/arch/arm64/boot/Image-dtb \
-      --cmdline "androidboot.hardware=hikey960 console=ttyFIQ0 androidboot.console=ttyFIQ0 firmware_class.path=/system/etc/firmware loglevel=15 buildvariant=userdebug" \
+      --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \
+      --cmdline "androidboot.hardware=hikey960 firmware_class.path=/vendor/firmware buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab" \
       --base 0x0 --tags_offset 0x07a00000 --kernel_offset 0x00080000 \
       --ramdisk_offset 0x07c00000 \
       --os_version P \
diff --git a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/multimedia-template.yaml b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/multimedia-template.yaml
new file mode 100644
index 0000000000..94b1ee1f76
--- /dev/null
+++ b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/multimedia-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi6220-hikey-r2
+job_name: ${KERNEL_BRANCH}-hi6220-multimedia-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey/debug/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-multimedia-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/template.yaml b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/template.yaml
index fad2e2a152..123eee34bb 100644
--- a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/template.yaml
+++ b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/template.yaml
@@ -1,8 +1,8 @@
-device_type: hi6220-hikey
+device_type: hi6220-hikey-r2
 job_name: ${KERNEL_BRANCH}-${BUILD_NUMBER}
 timeouts:
   job:
-    minutes: 120
+    minutes: 420
   action:
     minutes: 10
   connection:
@@ -57,21 +57,24 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget http://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
 
 - deploy:
     timeout:
@@ -80,20 +83,20 @@ actions:
     namespace: hikey-android
     images:
       ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
+        url: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey/debug/ptable-aosp-8g.img
         reboot: hard-reset
       boot:
         url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
         compression: xz
         reboot: hard-reset
-      cache:
-        url: http://testdata.validation.linaro.org/lkft/aosp/current//cache.img.xz
-        compression: xz
       userdata:
-        url: http://testdata.validation.linaro.org/lkft/aosp/current//userdata.img.xz
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
         compression: xz
       system:
-        url: http://testdata.validation.linaro.org/lkft/aosp/current//system.img.xz
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
         compression: xz
     os: debian
     protocols:
@@ -113,47 +116,39 @@ actions:
     method: fastboot
 
 - test:
-     namespace: tlxc
-     timeout:
-       minutes: 10
-     definitions:
-     - repository: https://git.linaro.org/lava-team/refactoring.git
-       from: git
-       path: testdefs/arm-probe.yaml
-       name: arm-probe
-
-- test:
     namespace: tlxc
     timeout:
-      minutes: 100
+      minutes: 360
     definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: prep-tests
-          description: "Device preparation"
-        run:
-          steps:
-          - pwd
-          - cd /root
-          - git clone https://git.linaro.org/power/energy-probe-ext.git
-          - pwd
-          - ls -l
-          - ls -l energy-probe-ext
-      name: prep-inline
-      path: inline/prep.yaml
     - repository: https://git.linaro.org/qa/test-definitions.git
       from: git
-      path: automated/android/workload-automation/workload-automation.yaml
+      path: automated/android/workload-automation3/workload-automation.yaml
       parameters:
+         WA_TAG: master
          WA_EXTENSION_PATHS: "/root/energy-probe-ext"
-         WA_TEMPLATES_REPO: "https://git.linaro.org/people/lisa.nguyen/wa2-lava.git"
-         BUILD_TOOLS_URL: "http://testdata.validation.linaro.org/apks/pmwg/build-tools.tar.gz"
-         WA_HOME_URL: "http://testdata.validation.linaro.org/apks/pmwg/workload_automation_home.tar.gz"
-         AGENDA: "agenda/android-basic-workloads-hikey.yaml"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/example_agenda_aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
       name: wa-lxc-test
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
 notify:
     recipients:
     - to:
diff --git a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/vellamo-template.yaml b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/vellamo-template.yaml
new file mode 100644
index 0000000000..ffd6ca47e0
--- /dev/null
+++ b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi6220-hikey/vellamo-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi6220-hikey-r2
+job_name: ${KERNEL_BRANCH}-hi6220-vellamo-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/latest/hikey/debug/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-vellamo-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/multimedia-template.yaml b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/multimedia-template.yaml
new file mode 100644
index 0000000000..1e0f06fd86
--- /dev/null
+++ b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/multimedia-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi960-hikey
+job_name: ${KERNEL_BRANCH}-hi960-multimedia-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://testdata.linaro.org/pmwg/hikey960-06122018/prm_ptable.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}/${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-multimedia-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/template.yaml b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/template.yaml
index f9b8d77339..b192e4a212 100644
--- a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/template.yaml
+++ b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/template.yaml
@@ -2,7 +2,7 @@ device_type: hi960-hikey
 job_name: ${KERNEL_BRANCH}-${BUILD_NUMBER}
 timeouts:
   job:
-    minutes: 60
+    minutes: 420
   action:
     minutes: 10
   connection:
@@ -57,21 +57,24 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget http://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
 
 - deploy:
     timeout:
@@ -80,20 +83,20 @@ actions:
     namespace: hikey-android
     images:
       ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
+        url: http://testdata.linaro.org/pmwg/hikey960-06122018/prm_ptable.img
         reboot: hard-reset
       boot:
-        url: ${PUBLISH_SERVER}${PUB_DEST}/boot.img.xz
+        url: ${PUBLISH_SERVER}/${PUB_DEST}/boot.img.xz
         compression: xz
         reboot: hard-reset
-      cache:
-        url: http://testdata.validation.linaro.org/lkft/aosp/current//cache.img.xz
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
         compression: xz
       userdata:
-        url: http://testdata.validation.linaro.org/lkft/aosp/current//userdata.img.xz
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
         compression: xz
       system:
-        url: http://testdata.validation.linaro.org/lkft/aosp/current//system.img.xz
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
         compression: xz
     os: debian
     protocols:
@@ -113,47 +116,39 @@ actions:
     method: fastboot
 
 - test:
-     namespace: tlxc
-     timeout:
-       minutes: 10
-     definitions:
-     - repository: https://git.linaro.org/lava-team/refactoring.git
-       from: git
-       path: testdefs/arm-probe.yaml
-       name: arm-probe
-
-- test:
     namespace: tlxc
     timeout:
-      minutes: 60
+      minutes: 360
     definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: prep-tests
-          description: "Device preparation"
-        run:
-          steps:
-          - pwd
-          - cd /root
-          - git clone https://git.linaro.org/power/energy-probe-ext.git
-          - pwd
-          - ls -l
-          - ls -l energy-probe-ext
-      name: prep-inline
-      path: inline/prep.yaml
     - repository: https://git.linaro.org/qa/test-definitions.git
       from: git
-      path: automated/android/workload-automation/workload-automation.yaml
+      path: automated/android/workload-automation3/workload-automation.yaml
       parameters:
+         WA_TAG: master
          WA_EXTENSION_PATHS: "/root/energy-probe-ext"
-         WA_TEMPLATES_REPO: "https://git.linaro.org/people/lisa.nguyen/wa2-lava.git"
-         BUILD_TOOLS_URL: "http://testdata.validation.linaro.org/apks/pmwg/build-tools.tar.gz"
-         WA_HOME_URL: "http://testdata.validation.linaro.org/apks/pmwg/workload_automation_home.tar.gz"
-         AGENDA: "agenda/android-basic-workloads-hikey.yaml"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/example_agenda_aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
       name: wa-lxc-test
 
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
 notify:
     recipients:
     - to:
diff --git a/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/vellamo-template.yaml b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/vellamo-template.yaml
new file mode 100644
index 0000000000..a593635395
--- /dev/null
+++ b/android-hikey-linaro-4.9-pmwg/lava-job-definitions/hi960-hikey/vellamo-template.yaml
@@ -0,0 +1,159 @@
+device_type: hi960-hikey
+job_name: ${KERNEL_BRANCH}-hi960-vellamo-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+
+priority: medium
+visibility: personal
+
+metadata:
+  git branch: ${GIT_BRANCH}
+  git repo: ${GIT_URL}
+  git commit: ${GIT_COMMIT}
+  build-url: ${BUILD_URL}
+  build-location: ${PUBLISH_SERVER}${PUB_DEST}
+  series: pmwg
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - git
+    - unzip
+    - wget
+    - trace-cmd
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: hikey-android
+    images:
+      ptable:
+        url: http://testdata.linaro.org/pmwg/hikey960-06122018/prm_ptable.img
+        reboot: hard-reset
+      boot:
+        url: ${PUBLISH_SERVER}/${PUB_DEST}/boot.img.xz
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: ${REFERENCE_BUILD_URL}/vendor.img.xz
+        compression: xz
+      userdata:
+        url: ${REFERENCE_BUILD_URL}/userdata.img.xz
+        compression: xz
+      system:
+        url: ${REFERENCE_BUILD_URL}/system.img.xz
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: hikey-android
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/power/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v0.8.tar.gz"
+         AGENDA: "agenda/android-vellamo-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
diff --git a/android-hikey-linaro-4.9-pmwg/submit_for_testing.sh b/android-hikey-linaro-4.9-pmwg/submit_for_testing.sh
index e77c9e43cf..de944e8ddc 100755
--- a/android-hikey-linaro-4.9-pmwg/submit_for_testing.sh
+++ b/android-hikey-linaro-4.9-pmwg/submit_for_testing.sh
@@ -5,7 +5,7 @@ set -ex
 rm -rf configs
 git clone --depth 1 http://git.linaro.org/ci/job/configs.git
 
-# Install jinja2-cli and ruamel.yaml
+# Install jinja2-cli and ruamel.yaml==0.16.13
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   echo "INFO: apt update error - try again in a moment"
   sleep 15
@@ -17,7 +17,7 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; th
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
+pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
 
 [ -z "${DEVICE_TYPE}" ] || \
 python configs/openembedded-lkft/submit_for_testing.py \
@@ -29,4 +29,4 @@ python configs/openembedded-lkft/submit_for_testing.py \
   --qa-server-project ${QA_SERVER_PROJECT} \
   --git-commit ${GIT_COMMIT:0:12} \
   --template-path configs/android-hikey-linaro-4.9-pmwg/lava-job-definitions \
-  --template-names template.yaml
+  --template-names vellamo-template.yaml multimedia-template.yaml
diff --git a/android-hikey-optee-master.yaml b/android-hikey-optee-master.yaml
new file mode 100644
index 0000000000..03dd404792
--- /dev/null
+++ b/android-hikey-optee-master.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: android-hikey-optee-master
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    parameters:
+        - string:
+            name: OPTEE_VER
+            default: master
+        - string:
+            name: OPTEE_OS_DBG
+            default: n
+        - string:
+            name: OPTEE_CLN_DBG
+            default: n
+        - string:
+            name: ghprbPullId
+            default: ""
+        - string:
+            name: ghprbGhRepository
+            default: ""
+        - string:
+            name: BUILD_DIR
+            default: aosp-master
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'hikey-optee-master'
+    disabled: true
+    node: docker-xenial-aosp
+    display-name: 'AOSP master HiKey build with OP-TEE (SWG)'
+    concurrent: true
+    triggers:
+        - gerrit:
+            server-name: __ANY__
+            trigger-on:
+                - change-merged-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-patchsets'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-chgrev-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-4.9'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-4.14'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee-master-workarounds'
+                      - compare-type: 'PLAIN'
+                        pattern: 'swg-mods-common'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'platform/manifest'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'linaro-master-swg'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'linaro.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'update-externals.xml'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-build-configs'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-master'
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: AP_SSID
+                variable: AP_SSID
+            - text:
+                credential-id: AP_KEY
+                variable: AP_KEY
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: ARTIFACTORIAL_TOKEN
+                variable: ARTIFACTORIAL_TOKEN
+    builders:
+        !include: android-hikey-optee/common/builders-v2-jinja2.yaml.inc
+    publishers:
+        !include: android-hikey-optee/common/publishers.yaml.inc
diff --git a/android-hikey-optee-o-clearkey-cdmi.yaml b/android-hikey-optee-o-clearkey-cdmi.yaml
new file mode 100644
index 0000000000..870c32ec32
--- /dev/null
+++ b/android-hikey-optee-o-clearkey-cdmi.yaml
@@ -0,0 +1,43 @@
+- job:
+    name: android-hikey-optee-o-clearkey-cdmi
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+        - github:
+            url: https://github.com/linaro-mmwg/optee-clearkey-cdmi
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'AOSP HiKey build with OP-TEE (SWG) ClearKey'
+    concurrent: false
+    scm:
+        - git:
+            url: https://github.com/linaro-mmwg/optee-clearkey-cdmi.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+    builders:
+        - shell:
+            !include-raw: android-hikey-optee-o-clearkey/builders.sh
diff --git a/android-hikey-optee-o-clearkey/builders.sh b/android-hikey-optee-o-clearkey/builders.sh
new file mode 100755
index 0000000000..72d544aa7c
--- /dev/null
+++ b/android-hikey-optee-o-clearkey/builders.sh
@@ -0,0 +1,79 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync liblz4-tool lzop libssl-dev libdrm-intel1 python-pip
+
+wget -q \
+	http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+sudo dpkg -i --force-all *.deb
+rm -f *.deb
+
+# Install jinja2-cli and ruamel.yaml
+# pip install --user --force-reinstall jinja2-cli ruamel.yaml
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+java -version
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+set -e
+
+cat << EOF > ${HOME}/.ssh/config
+Host dev-private-review.linaro.org
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+EOF
+chmod 0600 ${HOME}/.ssh/config
+
+rm -rf *
+
+repo init -u https://android-git.linaro.org/git/platform/manifest.git -b android-8.1.0_r29 -g "default,-non-default,-device,hikey"
+cd .repo
+git clone https://android-git.linaro.org/git/platform/manifest.git -b linaro-oreo local_manifests
+cd local_manifests
+rm -f swg.xml
+wget -q https://raw.githubusercontent.com/linaro-swg/optee_android_manifest/lcr-ref-hikey-o/swg.xml
+cd ${WORKSPACE}
+
+repo sync -j$(nproc)
+./android-patchsets/hikey-o-workarounds
+./android-patchsets/get-hikey-blobs
+./android-patchsets/O-RLCR-PATCHSET
+./android-patchsets/hikey-optee-o
+./android-patchsets/hikey-optee-4.9
+./android-patchsets/OREO-BOOTTIME-OPTIMIZATIONS-HIKEY
+./android-patchsets/optee-master-workarounds
+./android-patchsets/swg-mods-o
+
+source ./build/envsetup.sh
+lunch hikey-userdebug
+
+make TARGET_BUILD_KERNEL=true TARGET_BOOTIMAGE_USE_FAT=true \
+	CFG_SECURE_DATA_PATH=y CFG_SECSTOR_TA_MGMT_PTA=y TARGET_TEE_IS_OPTEE=true \
+	TARGET_BUILD_UEFI=true TARGET_ENABLE_MEDIADRM_64=true
+
+cd external
+git clone https://github.com/linaro-mmwg/clearkeydrmplugin
+if [ "${ghprbGhRepository}" == "linaro-mmwg/clearkeydrmplugin" ]; then
+    git fetch origin pull/${ghprbPullId}/head:prbranch
+    git checkout prbranch
+fi
+cd clearkeydrmplugin
+git clone https://github.com/linaro-mmwg/optee-clearkey-cdmi
+if [ "${ghprbGhRepository}" == "linaro-mmwg/optee-clearkey-cdmi" ]; then
+    git fetch origin pull/${ghprbPullId}/head:prbranch
+    git checkout prbranch
+fi
+
+cd ../../
+make libdrmclearkeyopteeplugin 442ed209-b8e2-405e-83845cc78c753428.ta
diff --git a/android-hikey-optee-o-clearkeydrmplugin.yaml b/android-hikey-optee-o-clearkeydrmplugin.yaml
new file mode 100644
index 0000000000..569e577dab
--- /dev/null
+++ b/android-hikey-optee-o-clearkeydrmplugin.yaml
@@ -0,0 +1,43 @@
+- job:
+    name: android-hikey-optee-o-clearkeydrmplugin
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+        - github:
+            url: https://github.com/linaro-mmwg/clearkeydrmplugin
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'AOSP HiKey build with OP-TEE (SWG) ClearKey'
+    concurrent: false
+    scm:
+        - git:
+            url: https://github.com/linaro-mmwg/clearkeydrmplugin.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+    builders:
+        - shell:
+            !include-raw: android-hikey-optee-o-clearkey/builders.sh
diff --git a/android-hikey-optee-o-playready.yaml b/android-hikey-optee-o-playready.yaml
new file mode 100644
index 0000000000..5030709daf
--- /dev/null
+++ b/android-hikey-optee-o-playready.yaml
@@ -0,0 +1,52 @@
+- job:
+    name: android-hikey-optee-o-playready
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'AOSP HiKey build with OP-TEE (SWG) Playready'
+    concurrent: true
+    triggers:
+        - gerrit:
+            server-name: 'lhg-review.linaro.org'
+            override-votes: true
+            gerrit-build-successful-codereview-value: 1
+            gerrit-build-failed-codereview-value: -1
+            readable-message: true
+            successful-message: 'Playready Sanity Check Successful'
+            start-message: 'Playready Sanity Check Started'
+            failure-message: 'Playready Sanity Check Failed'
+            trigger-for-unreviewed-patches: true
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android/playreadydrmplugin'
+                  branches:
+                      - branch-pattern: 'master'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'lhg/playready'
+                  branches:
+                      - branch-pattern: '3.3.4472'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'optee-playready'
+                  branches:
+                      - branch-pattern: '3.3.4472'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+               - '8e3d0ab1-974d-4bb9-abc0-0b8f01de969a'
+        - timeout:
+            timeout: 500
+    builders:
+        - shell:
+            !include-raw: android-hikey-optee-o-playready/builders.sh
diff --git a/android-hikey-optee-o-playready/builders.sh b/android-hikey-optee-o-playready/builders.sh
new file mode 100755
index 0000000000..1587ca7e04
--- /dev/null
+++ b/android-hikey-optee-o-playready/builders.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync liblz4-tool lzop libssl-dev libdrm-intel1 python-pip
+
+wget -q \
+	http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+sudo dpkg -i --force-all *.deb
+rm -f *.deb
+
+# Install jinja2-cli and ruamel.yaml
+# pip install --user --force-reinstall jinja2-cli ruamel.yaml
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+java -version
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+set -e
+
+repo init -u https://android-git.linaro.org/git/platform/manifest.git -b android-8.1.0_r23 -g "default,-non-default,-device,hikey"
+cd .repo
+git clone https://android-git.linaro.org/git/platform/manifest.git -b linaro-oreo local_manifests
+cd local_manifests
+rm -f swg.xml
+wget -q https://raw.githubusercontent.com/linaro-swg/optee_android_manifest/lcr-ref-hikey-o/swg.xml
+cd ${WORKSPACE}
+
+cat << EOF > ${HOME}/.ssh/config
+Host lhg-review.linaro.org
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+EOF
+chmod 0600 ${HOME}/.ssh/config
+
+repo sync -j$(nproc)
+./android-patchsets/hikey-o-workarounds
+./android-patchsets/get-hikey-blobs
+./android-patchsets/O-RLCR-PATCHSET
+./android-patchsets/hikey-optee-o
+./android-patchsets/hikey-optee-4.9
+./android-patchsets/OREO-BOOTTIME-OPTIMIZATIONS-HIKEY
+./android-patchsets/optee-master-workarounds
+./android-patchsets/swg-mods-o
+
+source ./build/envsetup.sh
+lunch hikey-userdebug
+
+set -xe
+
+make TARGET_BUILD_KERNEL=true TARGET_BOOTIMAGE_USE_FAT=true \
+	CFG_SECURE_DATA_PATH=y CFG_SECSTOR_TA_MGMT_PTA=y TARGET_TEE_IS_OPTEE=true \
+	TARGET_BUILD_UEFI=true TARGET_ENABLE_MEDIADRM_64=true
+
+cd external
+git clone ssh://lhg-gerrit-bot@lhg-review.linaro.org:29418/android/playreadydrmplugin
+cd playreadydrmplugin
+if [ "${GERRIT_PROJECT}" == "android/playreadydrmplugin" ]; then
+   git pull ssh://lhg-gerrit-bot@lhg-review.linaro.org:29418/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+fi
+
+git clone -b 3.3.4472 ssh://lhg-gerrit-bot@lhg-review.linaro.org:29418/lhg/playready
+cd playready
+if [ "${GERRIT_PROJECT}" == "lhg/playready" ]; then
+   git pull ssh://lhg-gerrit-bot@lhg-review.linaro.org:29418/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+fi
+
+git clone -b 3.3.4472 ssh://lhg-gerrit-bot@lhg-review.linaro.org:29418/optee-playready source/optee-playready
+cd source/optee-playready/
+if [ "${GERRIT_PROJECT}" == "optee-playready" ]; then
+   git pull ssh://lhg-gerrit-bot@lhg-review.linaro.org:29418/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+fi
+
+cd ../../
+bash build_android_binaries.sh
+cd ../
+
+mm
diff --git a/android-hikey-optee-o-widevine.yaml b/android-hikey-optee-o-widevine.yaml
new file mode 100644
index 0000000000..94e3e131df
--- /dev/null
+++ b/android-hikey-optee-o-widevine.yaml
@@ -0,0 +1,48 @@
+- job:
+    name: android-hikey-optee-o-widevine
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'AOSP HiKey build with OP-TEE (SWG) Widevine'
+    concurrent: true
+    triggers:
+        - gerrit:
+            server-name: 'dev-private-review.linaro.org'
+            override-votes: true
+            gerrit-build-successful-codereview-value: 1
+            gerrit-build-failed-codereview-value: -1
+            readable-message: true
+            successful-message: 'widevine Sanity Check Successful'
+            start-message: 'widevine Sanity Check Started'
+            failure-message: 'widevine Sanity Check Failed'
+            trigger-for-unreviewed-patches: true
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'widevine/optee-widevine-ref'
+                  branches:
+                      - branch-pattern: 'master'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'widevine/android'
+                  branches:
+                      - branch-pattern: 'google/oc'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+               - '8e3d0ab1-974d-4bb9-abc0-0b8f01de969a'
+        - timeout:
+            timeout: 500
+    builders:
+        - shell:
+            !include-raw: android-hikey-optee-o-widevine/builders.sh
diff --git a/android-hikey-optee-o-widevine/builders.sh b/android-hikey-optee-o-widevine/builders.sh
new file mode 100755
index 0000000000..a10e134a57
--- /dev/null
+++ b/android-hikey-optee-o-widevine/builders.sh
@@ -0,0 +1,90 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync liblz4-tool lzop libssl-dev libdrm-intel1 python-pip python-pyelftools python3-pyelftools
+
+wget -q \
+	http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+	http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+sudo dpkg -i --force-all *.deb
+rm -f *.deb
+
+# Install jinja2-cli and ruamel.yaml
+# pip install --user --force-reinstall jinja2-cli ruamel.yaml
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+java -version
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+set -e
+
+cat << EOF > ${HOME}/.ssh/config
+Host dev-private-review.linaro.org
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
+EOF
+chmod 0600 ${HOME}/.ssh/config
+
+repo init -u https://android-git.linaro.org/git/platform/manifest.git -b android-8.1.0_r29 -g "default,-non-default,-device,hikey"
+cd .repo
+git clone https://android-git.linaro.org/git/platform/manifest.git -b linaro-oreo local_manifests
+cd local_manifests
+rm -f swg.xml
+wget -q https://raw.githubusercontent.com/linaro-swg/optee_android_manifest/lcr-ref-hikey-o/swg.xml
+cd ${WORKSPACE}
+
+repo sync -j$(nproc)
+./android-patchsets/hikey-o-workarounds
+./android-patchsets/get-hikey-blobs
+./android-patchsets/O-RLCR-PATCHSET
+./android-patchsets/hikey-optee-o
+./android-patchsets/hikey-optee-4.9
+./android-patchsets/OREO-BOOTTIME-OPTIMIZATIONS-HIKEY
+./android-patchsets/optee-master-workarounds
+./android-patchsets/swg-mods-o
+
+source ./build/envsetup.sh
+lunch hikey-userdebug
+
+make TARGET_BUILD_KERNEL=true TARGET_BOOTIMAGE_USE_FAT=true \
+	CFG_SECURE_DATA_PATH=y CFG_SECSTOR_TA_MGMT_PTA=y CFG_TA_DYNLINK=y \
+	TARGET_TEE_IS_OPTEE=true TARGET_BUILD_UEFI=true \
+	TARGET_ENABLE_MEDIADRM_64=true
+
+cd external
+git clone ssh://lhg-gerrit-bot@dev-private-review.linaro.org:29418/widevine/optee-widevine-ref -b master
+cd optee-widevine-ref/
+if [ "${GERRIT_PROJECT}" == "widevine/optee-widevine-ref" ]; then
+    git pull ssh://lhg-gerrit-bot@dev-private-review.linaro.org:29418/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+fi
+cd ../../
+
+cd vendor
+git clone ssh://lhg-gerrit-bot@dev-private-review.linaro.org:29418/widevine/android widevine -b mirrors/oc-mr1
+cd widevine/
+if [ "${GERRIT_PROJECT}" == "widevine/android" ]; then
+    git pull ssh://lhg-gerrit-bot@dev-private-review.linaro.org:29418/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+fi
+cd ../../
+
+cd external/optee-widevine-ref
+mma TARGET_BUILD_KERNEL=true TARGET_BOOTIMAGE_USE_FAT=true \
+        CFG_SECURE_DATA_PATH=y CFG_SECSTOR_TA_MGMT_PTA=y TARGET_TEE_IS_OPTEE=true \
+        TARGET_BUILD_UEFI=true TARGET_ENABLE_MEDIADRM_64=true USE_TEST_KBOX=true
+cd ../../
+
+cd vendor/widevine
+mma TARGET_BUILD_KERNEL=true TARGET_BOOTIMAGE_USE_FAT=true \
+        CFG_SECURE_DATA_PATH=y CFG_SECSTOR_TA_MGMT_PTA=y TARGET_TEE_IS_OPTEE=true \
+        TARGET_BUILD_UEFI=true TARGET_ENABLE_MEDIADRM_64=true
+cd ../../
diff --git a/android-hikey-optee-o.yaml b/android-hikey-optee-o.yaml
index df223d8bd4..4e851c0927 100644
--- a/android-hikey-optee-o.yaml
+++ b/android-hikey-optee-o.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -15,20 +15,113 @@
             num-to-keep: 60
     parameters:
         - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
+            name: OPTEE_VER
+            default: master
+        - string:
+            name: OPTEE_OS_DBG
+            default: n
+        - string:
+            name: OPTEE_CLN_DBG
+            default: n
+        - string:
+            name: ghprbPullId
+            default: ""
+        - string:
+            name: ghprbGhRepository
+            default: ""
         - string:
             name: BUILD_DIR
             default: r-lcr-oreo
-    disabled: false
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'hikey-optee-o'
+    disabled: true
     node: docker-xenial-aosp
-    display-name: 'AOSP HiKey build with OP-TEE (SWG)'
+    display-name: 'AOSP O HiKey build with OP-TEE (SWG)'
     concurrent: true
+    triggers:
+        - gerrit:
+            server-name: __ANY__
+            trigger-on:
+                - change-merged-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-patchsets'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-chgrev-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-o-workarounds'
+                      - compare-type: 'PLAIN'
+                        pattern: 'O-RLCR-PATCHSET'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-o'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-4.9'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-clang-4.9'
+                      - compare-type: 'PLAIN'
+                        pattern: 'OREO-BOOTTIME-OPTIMIZATIONS-HIKEY'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee-master-workarounds'
+                      - compare-type: 'PLAIN'
+                        pattern: 'swg-mods-o'
+                      - compare-type: 'PLAIN'
+                        pattern: 'swg-kmgk-common'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'device/linaro/common'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'linaro-oreo'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'platform/manifest'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'linaro-o-swg'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'linaro.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'update-externals.xml'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-build-configs'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-o'
     wrappers:
         - timestamps
         - timeout:
             timeout: 500
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: AP_SSID
+                variable: AP_SSID
+            - text:
+                credential-id: AP_KEY
+                variable: AP_KEY
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: ARTIFACTORIAL_TOKEN
+                variable: ARTIFACTORIAL_TOKEN
     builders:
-        !include: android-hikey-optee-o/builders.yaml.inc
+        !include: android-hikey-optee/common/builders-v2-jinja2.yaml.inc
     publishers:
-        !include: android-lcr/common/publishers.yaml.inc
+        !include: android-hikey-optee/common/publishers.yaml.inc
diff --git a/android-hikey-optee-o/builders.yaml.inc b/android-hikey-optee-o/builders.yaml.inc
deleted file mode 100644
index 3060f2ec6f..0000000000
--- a/android-hikey-optee-o/builders.yaml.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/hikey/builders-v2.sh
diff --git a/android-hikey-optee-p.yaml b/android-hikey-optee-p.yaml
new file mode 100644
index 0000000000..ea3f3ea034
--- /dev/null
+++ b/android-hikey-optee-p.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: android-hikey-optee-p
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 200
+            num-to-keep: 60
+    parameters:
+        - string:
+            name: OPTEE_VER
+            default: master
+        - string:
+            name: OPTEE_OS_DBG
+            default: n
+        - string:
+            name: OPTEE_CLN_DBG
+            default: n
+        - string:
+            name: ghprbPullId
+            default: ""
+        - string:
+            name: ghprbGhRepository
+            default: ""
+        - string:
+            name: BUILD_DIR
+            default: r-lcr-oreo
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'hikey-optee-p'
+    disabled: true
+    node: docker-xenial-aosp
+    display-name: 'AOSP P HiKey build with OP-TEE (SWG)'
+    concurrent: true
+    triggers:
+        - gerrit:
+            server-name: __ANY__
+            trigger-on:
+                - change-merged-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-patchsets'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-chgrev-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-4.9'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-4.14'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee-master-workarounds'
+                      - compare-type: 'PLAIN'
+                        pattern: 'swg-mods-common'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'platform/manifest'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'linaro-p-swg'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'linaro.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'update-externals.xml'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-build-configs'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-p'
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: AP_SSID
+                variable: AP_SSID
+            - text:
+                credential-id: AP_KEY
+                variable: AP_KEY
+            - text:
+                credential-id: ARTIFACTORIAL_TOKEN
+                variable: ARTIFACTORIAL_TOKEN
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        !include: android-hikey-optee/common/builders-v2-jinja2.yaml.inc
+    publishers:
+        !include: android-hikey-optee/common/publishers.yaml.inc
diff --git a/android-hikey-optee/common/builders-v2-jinja2.yaml.inc b/android-hikey-optee/common/builders-v2-jinja2.yaml.inc
new file mode 100644
index 0000000000..e981edf6b2
--- /dev/null
+++ b/android-hikey-optee/common/builders-v2-jinja2.yaml.inc
@@ -0,0 +1,15 @@
+        - shell:
+            !include-raw:
+                - android-lcr/common/builders.sh
+                - android-lcr/hikey/builders-v2.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - shell:
+            !include-raw:
+                - android-hikey-optee/common/submit_for_testing.sh
diff --git a/android-hikey-optee/common/publishers.yaml.inc b/android-hikey-optee/common/publishers.yaml.inc
new file mode 100644
index 0000000000..cab35b3de5
--- /dev/null
+++ b/android-hikey-optee/common/publishers.yaml.inc
@@ -0,0 +1,23 @@
+        - email-ext:
+            recipients: '${CI_MAIL_RECIPIENTS}'
+            content-type: text
+            body: |
+                Build Triggered by: trigger-android-weekly-builds.yaml or ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL} or ${ghprbPullTitle}: ${ghprbPullLink}
+                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
+                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
+                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
+        - archive:
+            artifacts: '*.xml,*.json'
+            latest-only: true
+            allow-empty: true
+        - logparser:
+            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'victor.chong@linaro.org'
diff --git a/android-hikey-optee/common/submit_for_testing.sh b/android-hikey-optee/common/submit_for_testing.sh
new file mode 100755
index 0000000000..8caa27688f
--- /dev/null
+++ b/android-hikey-optee/common/submit_for_testing.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+set -ex
+
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="low"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+
+if [ -z "${DEVICE_TYPE}" ]; then
+    echo "DEVICE_TYPE not set. Exiting"
+    exit 0
+fi
+
+if [ -n "${DRY_RUN}" ]; then
+    ## called from local side for via test_submit_for_testing.sh
+    export EXTRA_PARAMS="--dry-run"
+    ## path of this android-lcr/common/submit_for_testing.sh
+    ## make BASE_PATH to point to the configs directory
+    PARENT_DIR=$(cd $(dirname $0); pwd)
+    BASE_PATH=${PARENT_DIR}/../../
+    if [ ! -e ${BASE_PATH}/openembedded-lkft/submit_for_testing.py ]; then
+        ## called via jenkins
+        rm -rf configs
+        git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+        BASE_PATH=`pwd`/configs
+    fi
+    export BASE_PATH
+else
+    ## called via jenkins
+    rm -rf configs
+    git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+    export EXTRA_PARAMS=""
+    export BASE_PATH=`pwd`/configs
+fi
+
+## set paths to use absolute paths
+export SCRIPT_PATH=${BASE_PATH}/openembedded-lkft/
+export TESTPLAN_PATH=${BASE_PATH}/android-lcr/lava-job-definitions/
+export TEMPLATE_PATH=${BASE_PATH}/android-lcr/lava-job-definitions/
+
+# create env variables as in post-build-lava
+export SNAPSHOTS_URL=https://snapshots.linaro.org
+export FILE_EXTENSION=tar.bz2
+if [ "${MAKE_TARGETS}" = "droidcore" ]; then
+    if [ -n "${IMAGE_EXTENSION}" ]; then
+        export FILE_EXTENSION=${IMAGE_EXTENSION}
+    else
+        export FILE_EXTENSION=img
+    fi
+fi
+if [ -z "${FRONTEND_JOB_NAME}" ]; then
+    export FRONTEND_JOB_NAME=~$(echo ${JOB_NAME} | sed -e 's/_/\//')
+fi
+if [ -z "${DOWNLOAD_URL}" ]; then
+    export DOWNLOAD_URL=${SNAPSHOTS_URL}/android/${FRONTEND_JOB_NAME}/${BUILD_NUMBER}
+fi
+export ANDROID_BOOT=${DOWNLOAD_URL}/boot.${FILE_EXTENSION}
+export ANDROID_SYSTEM=${DOWNLOAD_URL}/system.${FILE_EXTENSION}
+export ANDROID_DATA=${DOWNLOAD_URL}/userdata.${FILE_EXTENSION}
+export ANDROID_CACHE=${DOWNLOAD_URL}/cache.${FILE_EXTENSION}
+export ANDROID_META_NAME=${JOB_NAME}
+export ANDROID_META_BUILD=${BUILD_NUMBER}
+export ANDROID_META_URL=${BUILD_URL}
+export WA2_JOB_NAME=${BUILD_NUMBER}
+export CTS_PKG_URL=${CTS_PKG_URL}
+export VTS_PKG_URL=${VTS_PKG_URL}
+[ -z "${GERRIT_CHANGE_NUMBER}" ] && export GERRIT_CHANGE_NUMBER=""
+[ -z "${GERRIT_PATCHSET_NUMBER}" ] && export GERRIT_PATCHSET_NUMBER=""
+[ -z "${GERRIT_CHANGE_URL}" ] && export GERRIT_CHANGE_URL=""
+[ -z "${GERRIT_CHANGE_ID}" ] && export GERRIT_CHANGE_ID=""
+[ -z "${REFERENCE_BUILD_URL}" ] && export REFERENCE_BUILD_URL=""
+[ -z "${CTS_MODULE_NAME}" ] && export CTS_MODULE_NAME=""
+[ -z "${CTS_PKG_URL}" ] && unset CTS_PKG_URL
+[ -z "${VTS_PKG_URL}" ] && unset VTS_PKG_URL
+[ -z "${X15_BOOT_ARGS}" ] && unset X15_BOOT_ARGS
+[ -z "${ANDROID_VERSION_SUFFIX}" ] && unset ANDROID_VERSION_SUFFIX
+
+
+[ -n ${TEST_TEMPLATES} ] && unset TEST_TEMPLATES
+
+DEVICE_PLAN=${PLAN_CHANGE:-"plan_change_swg_${DEVICE_TYPE}"}
+if [ -z "$GERRIT_PROJECT" ]; then
+    DEVICE_PLAN=${PLAN_WEEKLY:-"plan_weekly_swg_${DEVICE_TYPE}"}
+fi
+
+for test in $(ls ${TESTPLAN_PATH}/${DEVICE_PLAN}); do
+    TEST_TEMPLATES="${TEST_TEMPLATES} ${DEVICE_PLAN}/${test}"
+done
+
+python ${SCRIPT_PATH}/submit_for_testing.py \
+  --device-type ${DEVICE_TYPE} \
+  --env-suffix ${FRONTEND_JOB_NAME} \
+  --build-number ${BUILD_NUMBER} \
+  --lava-server ${LAVA_SERVER} \
+  --qa-server ${QA_SERVER} \
+  --qa-server-team lcr \
+  --qa-server-project ${QA_SERVER_PROJECT} \
+  --git-commit ${BUILD_NUMBER} \
+  --quiet \
+  ${EXTRA_PARAMS} \
+  --testplan-path ${TESTPLAN_PATH} \
+  --template-path ${TEMPLATE_PATH} \
+  --test-plan ${TEST_TEMPLATES}
diff --git a/android-hikey-optee/common/test_submit_for_testing.sh b/android-hikey-optee/common/test_submit_for_testing.sh
new file mode 100755
index 0000000000..a3a0f3a424
--- /dev/null
+++ b/android-hikey-optee/common/test_submit_for_testing.sh
@@ -0,0 +1,83 @@
+#!/bin/bash -ex
+
+PARENT_DIR=$(cd $(dirname $0); pwd)
+
+virtualenv .venv
+source .venv/bin/activate
+pip install Jinja2 requests urllib3 ruamel.yaml==0.16.13
+
+export ART_URL=https://android-qa-reports.linaro.org/api/
+export BUILD_DIR=r-lcr-oreo
+export BUILD_DISPLAY_NAME=#38
+export BUILD_ID=38
+export BUILD_NUMBER=38
+export GERRIT_BRANCH=master
+export GERRIT_CHANGE_COMMIT_MESSAGE=dXBkYXRlIHRvIHRhZyBhbmRyb2lkLTguMS4wX3IyCgpUaGUgY2hhbmdlIGxvZyBjb3VsZCBiZSBjaGVja2VkIGhlcmU6IGh0dHA6Ly9wZW9wbGUubGluYXJvLm9yZy9+eW9uZ3Fpbi5saXUvQ2hhbmdlTG9ncy9DaGFuZ2VMb2ctYW5kcm9pZC04LjEuMF9yMS1hbmRyb2lkLTguMS4wX3IyLTIwMTctMTItMTgtMDMtMzAtMzEudHh0CgpDaGFuZ2UtSWQ6IEkxMTAzZTdlMzJkMzBiOWNhZjY3NjM4NTk4NzVjYjYxNGE5OTRmODY4ClNpZ25lZC1vZmYtYnk6IFlvbmdxaW4gTGl1IDx5b25ncWluLmxpdUBsaW5hcm8ub3JnPgo=
+export GERRIT_CHANGE_ID=I1103e7e32d30b9caf6763859875cb614a994f868
+export GERRIT_CHANGE_NUMBER=18010
+export GERRIT_CHANGE_SUBJECT=android-9.0.0_r34
+export GERRIT_CHANGE_URL=http://android-review.linaro.org/18010
+export GERRIT_EVENT_HASH=1581147094
+export GERRIT_EVENT_TYPE=change-merged
+export GERRIT_HOST=android-review.linaro.org
+export GERRIT_NAME=android-review.linaro.org
+export GERRIT_NEWREV=ded592ed8683143217b56c3915d00eef1d5abb12
+export GERRIT_PATCHSET_NUMBER=1
+export GERRIT_PATCHSET_REVISION=ded592ed8683143217b56c3915d00eef1d5abb12
+export GERRIT_PORT=29418
+#export GERRIT_PROJECT=android-build-configs
+export GERRIT_REFSPEC=refs/changes/10/18010/1
+export GERRIT_SCHEME=ssh
+export GERRIT_TOPIC=
+export GERRIT_VERSION=2.14.4
+export JOB_BASE_NAME=android-hikey-optee-p
+export JOB_NAME=android-hikey-optee-p
+export JOB_URL=https://ci.linaro.org/job/android-hikey-optee-p/
+export PUB_DEST=/android/android-hikey-optee-p/38
+export PUB_SRC=/home/buildslave/srv/r-lcr-oreo/build/out
+export RUN_CHANGES_DISPLAY_URL=https://ci.linaro.org/job/android-hikey-optee-p/38/display/redirect?page=changes
+export RUN_DISPLAY_URL=https://ci.linaro.org/job/android-hikey-optee-p/38/display/redirect
+export BUILD_URL=https://ci.linaro.org/job/android-hikey-optee-p/38/
+export CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template.yaml
+export DOWNLOAD_URL=http://snapshots.linaro.org//android/android-hikey-optee-p/38
+export EXECUTOR_NUMBER=18
+export FRONTEND_JOB_NAME=android-hikey-optee-p
+export IMAGE_EXTENSION=img
+export JOB_NAME=android-hikey-optee-p
+export JOB_URL=https://ci.linaro.org/job/post-build-lava/
+export LAVA_SERVER=validation.linaro.org/RPC2/
+export MAKE_TARGETS=droidcore
+export SKIP_REPORT=false
+export TARGET_PRODUCT=hikey
+#export ANDROID_VERSION_SUFFIX=master
+#export CTS_PKG_URL=http://testdata.linaro.org/cts/android-cts-master-linux_x86-arm-linaro.zip
+#export VTS_PKG_URL=http://testdata.linaro.org/vts/master/android-vts.zip
+
+export QA_SERVER=https://qa-reports.linaro.org/
+export QA_SERVER_PROJECT=lcr
+export QA_BUILD_VERSION=${BUILD_NUMBER}
+export QA_REPORTS_TOKEN=secret
+export ARTIFACTORIAL_TOKEN=artifactorial_token
+export AP_SSID=ap_ssid
+export AP_KEY=ap_key
+
+
+export DRY_RUN=true
+
+for device in $(ls ${PARENT_DIR}/../../android-lcr/lava-job-definitions/devices); do
+    case "$device" in
+      hi6220-hikey)
+        ;&
+      hi6220-hikey-bl)
+        export DEVICE_TYPE=$device
+        echo ${DEVICE_TYPE}
+        bash ${PARENT_DIR}/submit_for_testing.sh
+        ;;
+      *)
+        ;;
+    esac
+done
+
+# cleanup virtualenv
+deactivate
+rm -rf .venv
diff --git a/android-hikey960-linaro-4.14-pmwg.yaml b/android-hikey960-linaro-4.14-pmwg.yaml
new file mode 100644
index 0000000000..8b1bc21997
--- /dev/null
+++ b/android-hikey960-linaro-4.14-pmwg.yaml
@@ -0,0 +1,130 @@
+- job:
+    name: android-hikey960-linaro-4.14-pmwg
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    parameters:
+        - string:
+            name: KERNEL_BRANCH
+            default: 'android-hikey-linaro-4.14-pmwg'
+        - string:
+            name: KERNEL_DESCRIBE
+        - string:
+            name: SRCREV_kernel
+        - string:
+            name: REFERENCE_BUILD_URL
+            default: 'https://snapshots.linaro.org/96boards/hikey960/linaro/aosp-master/749/'
+        - string:
+            name: PUB_DEST
+            default: 'android/pmwg/${JOB_NAME}/${BUILD_NUMBER}'
+        - string:
+            name: DEFCONFIG
+            default: 'hikey960_defconfig'
+        - string:
+            name: DEVICE_TYPE
+            default: 'hi960-hikey'
+        - string:
+            name: PUB_DEST
+            default: 'android/pmwg/${JOB_NAME}/${BUILD_NUMBER}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://pmwg.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'power'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'pmwg'
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'PMWG Android 4.14 on HiKey960'
+    scm:
+        - git:
+            url: https://git.linaro.org/power/android.git
+            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
+            name: origin
+            branches:
+                - origin/${KERNEL_BRANCH}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=12}'
+        - timeout:
+            timeout: 500
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: android-hikey-linaro-4.14-pmwg/builders.sh
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            # Required for Mali binaries
+            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --server ${PUBLISH_SERVER} \
+              --build-info out/BUILD-INFO.txt \
+              --link-latest \
+              out/ ${PUB_DEST}
+        - shell:
+            !include-raw: android-hikey-linaro-4.14-pmwg/submit_for_testing.sh
+    publishers:
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - groovy-postbuild:
+            script:
+                !include-raw: android-hikey-linaro-4.14-pmwg/postbuild.groovy
+        - email-ext:
+            recipients: 'private-pmwg@lists.linaro.org, vishal.bhoj@linaro.org, fathi.boudra@linaro.org'
+            content-type: text
+            subject: '[Jenkins] Build HiKey960 (${WARNINGS}/${ERRORS}): ${GIT_BRANCH} ${GIT_REVISION,length=12}'
+            body: |
+                Project: ${PROJECT_NAME}
+                Build number: ${BUILD_NUMBER}
+                Build status: ${BUILD_STATUS}
+                Build URL: ${BUILD_URL}
+                Build location: ${PUBLISH_SERVER}${PUB_DEST}
+                Console output: ${BUILD_URL}consoleText
+                Parsed warnings/errors: ${BUILD_URL}parsed_console
+                Git branch: ${GIT_BRANCH}
+                Git commit: ${GIT_COMMIT}
+
+                ${GIT_URL}/commit/?h=${KERNEL_BRANCH}&id=${GIT_COMMIT}
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex="^.*? error: .*?$", linesBefore=0, linesAfter=2, showTruncatedLines=false}
+
+                Warnings:
+                ${BUILD_LOG_REGEX, regex="^.*? warning: .*?$", linesBefore=0, linesAfter=2, showTruncatedLines=false}
+            attach-build-log: true
+            always: true
diff --git a/android-hikey960-linaro-4.9-pmwg.yaml b/android-hikey960-linaro-4.9-pmwg.yaml
index a187e4b7f4..d13dab89a5 100644
--- a/android-hikey960-linaro-4.9-pmwg.yaml
+++ b/android-hikey960-linaro-4.9-pmwg.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -26,7 +26,7 @@
             name: SRCREV_kernel
         - string:
             name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/hikey960-pmwg/'
+            default: 'https://snapshots.linaro.org/96boards/hikey960/linaro/aosp-master/626/'
         - string:
             name: PUB_DEST
             default: 'android/pmwg/${JOB_NAME}/${BUILD_NUMBER}'
@@ -35,7 +35,10 @@
             default: 'hikey960_defconfig'
         - string:
             name: DEVICE_TYPE
-#            default: 'hi960-hikey'
+            default: 'hi960-hikey'
+        - string:
+            name: PUB_DEST
+            default: 'android/pmwg/${JOB_NAME}/${BUILD_NUMBER}'
         - string:
             name: LAVA_SERVER
             default: 'https://pmwg.validation.linaro.org/RPC2/'
@@ -84,7 +87,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --server ${PUBLISH_SERVER} \
               --build-info out/BUILD-INFO.txt \
               --link-latest \
@@ -93,7 +96,7 @@
             !include-raw: android-hikey-linaro-4.9-pmwg/submit_for_testing.sh
     publishers:
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
diff --git a/android-hikey960-optee-p.yaml b/android-hikey960-optee-p.yaml
new file mode 100644
index 0000000000..aaa47c76d1
--- /dev/null
+++ b/android-hikey960-optee-p.yaml
@@ -0,0 +1,118 @@
+- job:
+    name: android-hikey960-optee-p
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 200
+            num-to-keep: 60
+    parameters:
+        - string:
+            name: OPTEE_VER
+            default: master
+        - string:
+            name: OPTEE_OS_DBG
+            default: n
+        - string:
+            name: OPTEE_CLN_DBG
+            default: n
+        - string:
+            name: ghprbPullId
+            default: ""
+        - string:
+            name: ghprbGhRepository
+            default: ""
+        - string:
+            name: BUILD_DIR
+            default: r-lcr-oreo
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'hikey960-optee-p'
+    disabled: true
+    node: docker-xenial-aosp
+    display-name: 'AOSP P HiKey960 build with OP-TEE (SWG)'
+    concurrent: true
+    triggers:
+        - gerrit:
+            server-name: __ANY__
+            trigger-on:
+                - change-merged-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-patchsets'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'get-hikey960-gcc'
+                      - compare-type: 'PLAIN'
+                        pattern: 'get-hikey960-blobs'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-chgrev-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey960-optee-p'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-hikey960-optee-common'
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey-optee-4.14'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee-master-workarounds'
+                      - compare-type: 'PLAIN'
+                        pattern: 'swg-mods-common'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'platform/manifest'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'linaro-p-swg'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey960.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'linaro.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'optee.xml'
+                      - compare-type: 'PLAIN'
+                        pattern: 'update-externals.xml'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'android-build-configs'
+                  branches:
+                      - branch-compare-type: 'PLAIN'
+                        branch-pattern: 'master'
+                  file-paths:
+                      - compare-type: 'PLAIN'
+                        pattern: 'hikey960-optee-p'
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: AP_SSID
+                variable: AP_SSID
+            - text:
+                credential-id: AP_KEY
+                variable: AP_KEY
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: ARTIFACTORIAL_TOKEN
+                variable: ARTIFACTORIAL_TOKEN
+    builders:
+        !include: android-hikey-optee/common/builders-v2-jinja2.yaml.inc
+    publishers:
+        !include: android-hikey-optee/common/publishers.yaml.inc
diff --git a/android-imx8m.yaml b/android-imx8m.yaml
new file mode 100644
index 0000000000..e54509c034
--- /dev/null
+++ b/android-imx8m.yaml
@@ -0,0 +1,81 @@
+- job:
+    name: android-imx8m
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    parameters:
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'NXP i.MX 8M Android build'
+    concurrent: true
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+            export JENKINS_WORKSPACE=${WORKSPACE}
+
+            java -version
+
+            sudo apt-get -q=2 update
+            sudo apt-get -q=2 install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-pip pxz zlib1g-dev
+
+            wget -q http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+              http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+              http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+            sudo dpkg -i --force-all *.deb
+
+            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
+            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+            chmod a+x ${HOME}/bin/*
+            export PATH=${HOME}/bin:${PATH}
+
+            wget -q http://snapshots.linaro.org/android/binaries/imx8m/imx-o8.1.0_1.3.0_8m.tar.gz
+            tar -xvf imx-o8.1.0_1.3.0_8m.tar.gz
+            cd imx-o8.1.0_1.3.0_8m
+            source imx_android_setup.sh
+            source build/envsetup.sh
+            lunch evk_8mq
+            set -e
+            make -j$(nproc)
+
+            cp device/fsl/common/tools/fsl-sdcard-partition.sh out/target/product/evk_8mq/
+            export WORKSPACE=${JENKINS_WORKSPACE}
+
+            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-imx8m/template.txt -O out/target/product/evk_8mq/BUILD-INFO.txt
+
+            # Publish parameters
+            cat << EOF > ${WORKSPACE}/publish_parameters
+            PUB_DEST=android/imx8m/${BUILD_NUMBER}
+            PUB_SRC=${PWD}/out/target/product/evk_8mq/
+            PUB_EXTRA_INC=^[^/]+imx
+            EOF
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+    publishers:
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org'
diff --git a/android-imx8m/template.txt b/android-imx8m/template.txt
new file mode 100644
index 0000000000..4221aa675a
--- /dev/null
+++ b/android-imx8m/template.txt
@@ -0,0 +1,5 @@
+Format-Version: 0.5
+
+Files-Pattern: *
+License-Type: protected
+Auth-Groups: employees, mmwg-team
diff --git a/android-lcr-member-hikey-n.yaml b/android-lcr-member-hikey-n.yaml
deleted file mode 100644
index aa4faa4794..0000000000
--- a/android-lcr-member-hikey-n.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-- job:
-    name: android-lcr-member-hikey-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-extended-read
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: m-lcr-nougat
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'Member LCR Android N Build for HiKey'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-MLCR-PATCHSET'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-BOOTTIME-OPTIMIZATIONS-HIKEY'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro-pm-extras.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-member-hikey-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/hikey/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-juno-master.yaml b/android-lcr-member-juno-master.yaml
deleted file mode 100644
index 88990a6325..0000000000
--- a/android-lcr-member-juno-master.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-- scm:
-    name: kernel
-    scm:
-        - git:
-            url: git://git.linaro.org/landing-teams/working/arm/kernel-release.git
-            branches:
-                - origin/lsk-3.18-armlt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: firmware
-    scm:
-        - git:
-            url: git://git.linaro.org/arm/vexpress-firmware.git
-            branches:
-                - origin/juno-recovery-tarball
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: android-lcr-member-juno-master
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-extended-read
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: aosp-master
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'AOSP master build for Juno'
-    concurrent: true
-    scm:
-        - kernel
-        - firmware
-    triggers:
-        - pollscm: "H/5 * * * *"
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'MASTER-RLCR-PATCHSET'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee-master-workarounds'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/device/linaro/juno'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'arm.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro-pm-extras.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-member-juno-master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/juno/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-juno-n.yaml b/android-lcr-member-juno-n.yaml
deleted file mode 100644
index 875d10a0b3..0000000000
--- a/android-lcr-member-juno-n.yaml
+++ /dev/null
@@ -1,113 +0,0 @@
-- scm:
-    name: kernel
-    scm:
-        - git:
-            url: git://git.linaro.org/landing-teams/working/arm/kernel-release.git
-            branches:
-                - origin/lsk-3.18-armlt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: firmware
-    scm:
-        - git:
-            url: git://git.linaro.org/arm/vexpress-firmware.git
-            branches:
-                - origin/juno-recovery-tarball
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: android-lcr-member-juno-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-extended-read
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: m-lcr-nougat
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'Member LCR Android N Build for Juno'
-    concurrent: true
-    scm:
-        - kernel
-        - firmware
-    triggers:
-        - pollscm: "H/5 * * * *"
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'juno-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-MLCR-PATCHSET'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-BOOTTIME-OPTIMIZATIONS-JUNO'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/device/linaro/juno'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'arm.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro-pm-extras.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-member-juno-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/juno/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-x15-master.yaml b/android-lcr-member-x15-master.yaml
deleted file mode 100644
index 8a1f51ae8d..0000000000
--- a/android-lcr-member-x15-master.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- job:
-    name: android-lcr-member-x15-master
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: aosp-master
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'AOSP master build for X15'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15-o-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'MASTER-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro-pm-extras.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-member-x15-master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/x15/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-member-x15-n.yaml b/android-lcr-member-x15-n.yaml
deleted file mode 100644
index bb81ed15d3..0000000000
--- a/android-lcr-member-x15-n.yaml
+++ /dev/null
@@ -1,84 +0,0 @@
-- job:
-    name: android-lcr-member-x15-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: m-lcr-nougat
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'Member LCR Android N Build for X15'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-MLCR-PATCHSET'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-BOOTTIME-OPTIMIZATIONS-X15'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro-pm-extras.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-member-x15-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/x15/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-fvp-n.yaml b/android-lcr-reference-fvp-n.yaml
deleted file mode 100644
index 062d68668d..0000000000
--- a/android-lcr-reference-fvp-n.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-- scm:
-    name: kernel
-    scm:
-        - git:
-            url: git://git.linaro.org/landing-teams/working/arm/kernel-release.git
-            branches:
-                - origin/lsk-3.18-armlt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: android-lcr-reference-fvp-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-            vishal.bhoj@linaro.org:
-                - job-build
-                - job-extended-read
-                - job-read
-            daniel.diaz@linaro.org:
-                - job-build
-                - job-extended-read
-                - job-read
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android N Build for FVP'
-    concurrent: true
-    scm:
-        - kernel
-    triggers:
-        - pollscm: "H/5 * * * *"
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'arm.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/fvp'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-fvp-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/fvp/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-hikey-master-premerge-ci.yaml b/android-lcr-reference-hikey-master-premerge-ci.yaml
deleted file mode 100644
index 0c2b721836..0000000000
--- a/android-lcr-reference-hikey-master-premerge-ci.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- job:
-    name: android-lcr-reference-hikey-master-premerge-ci
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: aosp-master
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: lcr-reference-hikey-master
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Premerge  CI job to test patch for HiKey AOSP Master build'
-    concurrent: true
-    triggers:
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*RunMasterPremergeHikeyTests.*'
-            server-name: __ANY__
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/hikey/builders-v2.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-hikey-master.yaml b/android-lcr-reference-hikey-master.yaml
deleted file mode 100644
index 965addbb1d..0000000000
--- a/android-lcr-reference-hikey-master.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-- job:
-    name: android-lcr-reference-hikey-master
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-extended-read
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: aosp-master
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'AOSP master build for HiKey'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-master-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'MASTER-RLCR-PATCHSET'
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-optee-master'
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-optee-4.9'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee-master-workarounds'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro-pm-extras.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-hikey-master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/hikey/builders-v2.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-hikey-n.yaml b/android-lcr-reference-hikey-n.yaml
deleted file mode 100644
index 70ead8d338..0000000000
--- a/android-lcr-reference-hikey-n.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: android-lcr-reference-hikey-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android N build for HiKey'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-hikey-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/hikey/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-hikey-o-premerge-ci.yaml b/android-lcr-reference-hikey-o-premerge-ci.yaml
deleted file mode 100644
index bc45b75c61..0000000000
--- a/android-lcr-reference-hikey-o-premerge-ci.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- job:
-    name: android-lcr-reference-hikey-o-premerge-ci
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-oreo
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: lcr-reference-hikey-o
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Premerge  CI job to test patch for hikey Oreo R-LCR'
-    concurrent: true
-    triggers:
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*RunPremergeHikeyTests.*'
-            server-name: __ANY__
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/hikey/builders-v2-premerge-ci.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-hikey-o.yaml b/android-lcr-reference-hikey-o.yaml
deleted file mode 100644
index f0f2dc06c6..0000000000
--- a/android-lcr-reference-hikey-o.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- job:
-    name: android-lcr-reference-hikey-o
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-oreo
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android O build for HiKey'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-o-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'get-hikey-blobs'
-                      - compare-type: 'PLAIN'
-                        pattern: 'O-RLCR-PATCHSET'
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-optee-o'
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-optee-4.9'
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-clang-4.9'
-                      - compare-type: 'PLAIN'
-                        pattern: 'OREO-BOOTTIME-OPTIMIZATIONS-HIKEY'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-hikey-o'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        !include: android-lcr/hikey/builders-v2.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-juno-n-member-build.yaml b/android-lcr-reference-juno-n-member-build.yaml
deleted file mode 100644
index 2475dbf407..0000000000
--- a/android-lcr-reference-juno-n-member-build.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-- scm:
-    name: kernel
-    scm:
-        - git:
-            url: git://git.linaro.org/landing-teams/working/arm/kernel-release.git
-            branches:
-                - origin/lsk-3.18-armlt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: firmware
-    scm:
-        - git:
-            url: git://git.linaro.org/arm/vexpress-firmware.git
-            branches:
-                - origin/juno-recovery-tarball
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: android-lcr-reference-juno-n-member-build
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'ARM member build based on Reference LCR Android N Build for Juno'
-    concurrent: true
-    scm:
-        - kernel
-        - firmware
-    triggers:
-        - pollscm: "H/5 * * * *"
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'juno-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat-arm'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/device/linaro/juno'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-juno-n-member-build'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/juno/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-juno-n.yaml b/android-lcr-reference-juno-n.yaml
deleted file mode 100644
index 093af43aea..0000000000
--- a/android-lcr-reference-juno-n.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- scm:
-    name: kernel
-    scm:
-        - git:
-            url: git://git.linaro.org/landing-teams/working/arm/kernel-release.git
-            branches:
-                - origin/lsk-3.18-armlt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: firmware
-    scm:
-        - git:
-            url: git://git.linaro.org/arm/vexpress-firmware.git
-            branches:
-                - origin/juno-recovery-tarball
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: android-lcr-reference-juno-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android N Build for Juno'
-    concurrent: true
-    scm:
-        - kernel
-        - firmware
-    triggers:
-        - pollscm: "H/5 * * * *"
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'juno-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'arm.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/device/linaro/juno'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-juno-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/juno/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-juno-o.yaml b/android-lcr-reference-juno-o.yaml
deleted file mode 100644
index 6759ff997b..0000000000
--- a/android-lcr-reference-juno-o.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- scm:
-    name: kernel
-    scm:
-        - git:
-            url: git://git.linaro.org/landing-teams/working/arm/kernel-release.git
-            branches:
-                - origin/lsk-3.18-armlt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: firmware
-    scm:
-        - git:
-            url: git://git.linaro.org/arm/vexpress-firmware.git
-            branches:
-                - origin/juno-recovery-tarball
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: android-lcr-reference-juno-o
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-oreo
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android O Build for Juno'
-    concurrent: true
-    scm:
-        - kernel
-        - firmware
-    triggers:
-        - pollscm: "H/5 * * * *"
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'O-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'arm.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'optee.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android/device/linaro/juno'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-juno-o'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/juno/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-x15-n.yaml b/android-lcr-reference-x15-n.yaml
deleted file mode 100644
index 5c33b9ac7b..0000000000
--- a/android-lcr-reference-x15-n.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: android-lcr-reference-x15-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android N build for X15'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-x15-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/x15/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-x15-o-premerge-ci.yaml b/android-lcr-reference-x15-o-premerge-ci.yaml
deleted file mode 100644
index 69ee12735d..0000000000
--- a/android-lcr-reference-x15-o-premerge-ci.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- job:
-    name: android-lcr-reference-x15-o-premerge-ci
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-oreo
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: lcr-reference-x15-o
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Premerge CI job to test patch for X15 R-LCR'
-    concurrent: true
-    triggers:
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*RunPremergeX15Tests.*'
-            server-name: __ANY__
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        !include: android-lcr/x15/builders-v2-premerge-ci.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-x15-o.yaml b/android-lcr-reference-x15-o.yaml
deleted file mode 100644
index 8a95d8d271..0000000000
--- a/android-lcr-reference-x15-o.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: android-lcr-reference-x15-o
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-oreo
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android O build for X15'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15-o-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'O-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-oreo'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x15.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-x15-o'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/x15/builders-v2.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr-reference-x20-n.yaml b/android-lcr-reference-x20-n.yaml
deleted file mode 100644
index 914319921e..0000000000
--- a/android-lcr-reference-x20-n.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: android-lcr-reference-x20-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-extended-read
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'Reference LCR Android N Build for X20'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'x20.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'update-externals.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'lcr-reference-x20-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-lcr/x20/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-lcr/am65x/build-info/template.txt b/android-lcr/am65x/build-info/template.txt
new file mode 100644
index 0000000000..9d41cf04e5
--- /dev/null
+++ b/android-lcr/am65x/build-info/template.txt
@@ -0,0 +1,5 @@
+Format-Version: 0.5
+
+Files-Pattern: *
+License-Type: protected
+Auth-Groups: lmg-member-only, team-qa-services, team-android-engineering
diff --git a/android-lcr/am65x/builders-v2-jinja2.yaml.inc b/android-lcr/am65x/builders-v2-jinja2.yaml.inc
new file mode 100644
index 0000000000..f7e21e1fae
--- /dev/null
+++ b/android-lcr/am65x/builders-v2-jinja2.yaml.inc
@@ -0,0 +1,15 @@
+        - shell:
+            !include-raw:
+                - android-lcr/common/builders.sh
+                - android-lcr/am65x/builders-v2.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - shell:
+            !include-raw:
+                - android-lcr/common/submit_for_testing.sh
diff --git a/android-lcr/am65x/builders-v2.sh b/android-lcr/am65x/builders-v2.sh
new file mode 100755
index 0000000000..09406dad1f
--- /dev/null
+++ b/android-lcr/am65x/builders-v2.sh
@@ -0,0 +1,52 @@
+# Early test
+
+if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
+  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
+  echo "in android-build-configs.git"
+  exit 1
+fi
+
+# Clean android-patchsets and repositories in device
+rm -rf build/out build/android-patchsets build/device build/build-info
+rm -fr build/external/u-boot
+mkdir -p build
+
+# Build Android
+build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
+cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
+
+# Delete sources after build to save space
+cd build
+rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
+cd -
+
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_SRC=${PWD}/build/out
+PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
+PUB_EXTRA_INC=^[^/]+[._](itb|dtb)$|MLO
+EOF
+
+PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
+# Construct post-build-lava parameters
+source build-configs/${BUILD_CONFIG_FILENAME}
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+SKIP_LAVA=${SKIP_LAVA}
+DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
+TARGET_PRODUCT=${TARGET_PRODUCT}
+MAKE_TARGETS=${MAKE_TARGETS}
+JOB_NAME=${JOB_NAME}
+BUILD_NUMBER=${BUILD_NUMBER}
+BUILD_URL=${BUILD_URL}
+LAVA_SERVER=${LAVA_SERVER:-lkft.validation.linaro.org/RPC2/}
+IMAGE_EXTENSION=img
+FRONTEND_JOB_NAME=${JOB_NAME}
+DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
+SKIP_REPORT=false
+CTS_PKG_URL=${CTS_PKG_URL}
+VTS_PKG_URL=${VTS_PKG_URL}
+ANDROID_VERSION_SUFFIX=${ANDROID_VERSION_SUFFIX}
+KERNEL_DESCRIBE=${KERNEL_DESCRIBE}
+PLAN_CHANGE=${PLAN_CHANGE}
+PLAN_WEEKLY=${PLAN_WEEKLY}
+EOF
diff --git a/android-lcr/common/builders.sh b/android-lcr/common/builders.sh
index 7857339333..8eba8a6358 100755
--- a/android-lcr/common/builders.sh
+++ b/android-lcr/common/builders.sh
@@ -2,15 +2,21 @@
 
 # Install needed packages
 sudo apt-get update
-sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync linaro-image-tools liblz4-tool lzop libssl-dev
 
-wget -q \
-  http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
-  http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
-  http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-  http://archive.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
-sudo dpkg -i --force-all *.deb
-rm -f *.deb
+# Here is for packages not listed by the source.android.com site below.
+# But the following packages might not be really necessary,
+# as the docker image for docker-focal-aosp labelled nodes is linaro/jenkins-amd64-ubuntu:focal
+# which is defined here: https://git.linaro.org/infrastructure/ci-yadp-builder.git/tree/docker_templates_aosp_amd64.yml#n2
+# And the packages listed here might be already defined there.
+sudo apt-get install -y --allow-change-held-packages wget sudo python3 python-is-python3 openjdk-11-jdk-headless
+java -version
+
+## https://source.android.com/docs/setup/start/requirements#hardware-requirements
+sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev libc6-dev-i386 libncurses5 x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
+
+# Install jinja2-cli and ruamel.yaml==0.16.13
+pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13 pycryptodome pycryptodomex
+pip3 install --user --force-reinstall pycryptodome pycryptodomex ruamel.yaml Jinja2
 
 # Set local configuration
 git config --global user.email "ci_notify@linaro.org"
@@ -24,6 +30,18 @@ if [ ! -d "/home/buildslave/srv/${BUILD_DIR}" ]; then
 fi
 cd /home/buildslave/srv/${BUILD_DIR}
 
+# temporary workaround to clean the workspace for android-cts and android-vts builds
+if [ "X${BUILD_DIR}" == "Xandroid-cts" ] || [ "X${BUILD_DIR}" == "Xandroid-vts" ]; then
+    rm -fr /home/buildslave/srv/${BUILD_DIR}/*
+    rm -fr /home/buildslave/srv/${BUILD_DIR}/.repo
+fi
+# clean the out directory as this workspace is used accross multiple builds
+rm -fr .repo-backup
+[ -d "build/.repo" ] && mv -f build/.repo .repo-backup
+rm -fr build/ && mkdir -p build/
+[ -d "build/.repo-backup" ] && mv -f .repo-backup build/.repo
+[ -d "build/.repo/local_manifests" ] && rm -fr build/.repo/local_manifests
+
 # Download helper scripts (repo)
 mkdir -p ${HOME}/bin
 curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
@@ -31,7 +49,9 @@ chmod a+x ${HOME}/bin/*
 export PATH=${HOME}/bin:${PATH}
 
 # Install helper packages
-rm -rf build-tools jenkins-tools build-configs build/bionic build/frameworks/base build/system/core build/device build/out build/android-patchsets
+rm -rf build-tools jenkins-tools build-configs build/bionic build/frameworks/base build/system/core build/device build/out build/android-patchsets build/kernel/ti/x15 build/kernel/hikey-linaro build/hardware/interfaces
+rm -fr build/external/optee_test build/external/optee_client build/optee/optee_os build/optee/edk2 build/device/linaro/kmgk
+rm -fr build/external/u-boot
 git clone --depth 1 https://git.linaro.org/infrastructure/linaro-android-build-tools.git build-tools
 git clone --depth 1 https://git.linaro.org/infrastructure/linaro-jenkins-tools.git jenkins-tools
 git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git build-configs
@@ -46,3 +66,5 @@ EOF
 echo config.txt
 export CONFIG=`base64 -w 0 config.txt`
 export SKIP_LICENSE_CHECK=1
+
+# still not in the build directory
diff --git a/android-lcr/common/publishers.yaml.inc b/android-lcr/common/publishers.yaml.inc
index 10391cc4d0..2e35faa00b 100644
--- a/android-lcr/common/publishers.yaml.inc
+++ b/android-lcr/common/publishers.yaml.inc
@@ -20,4 +20,4 @@
         - fingerprint:
             files: 'build/fingerprints/*'
         - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org daniel.diaz@linaro.org'
+            recipients: 'yongqin.liu@linaro.org tom.gall@linaro.org milosz.wasilewski@linaro.org victor.chong@linaro.org'
diff --git a/android-lcr/common/submit_for_testing.sh b/android-lcr/common/submit_for_testing.sh
new file mode 100755
index 0000000000..bdcda2bdf0
--- /dev/null
+++ b/android-lcr/common/submit_for_testing.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+set -ex
+
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="low"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+
+if [ -z "${DEVICE_TYPE}" ]; then
+    echo "DEVICE_TYPE not set. Exiting"
+    exit 0
+fi
+
+if [ -n "${DRY_RUN}" ]; then
+    ## called from local side for via test_submit_for_testing.sh
+    export EXTRA_PARAMS="--dry-run"
+    ## path of this android-lcr/common/submit_for_testing.sh
+    ## make BASE_PATH to point to the configs directory
+    PARENT_DIR=$(cd $(dirname $0); pwd)
+    BASE_PATH=${PARENT_DIR}/../../
+    if [ ! -e ${BASE_PATH}/openembedded-lkft/submit_for_testing.py ]; then
+        ## called via jenkins
+        rm -rf configs
+        git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+        BASE_PATH=`pwd`/configs
+    fi
+    export BASE_PATH
+else
+    ## called via jenkins
+    rm -rf configs
+    git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+    export EXTRA_PARAMS=""
+    export BASE_PATH=`pwd`/configs
+fi
+
+## set paths to use absolute paths
+export SCRIPT_PATH=${BASE_PATH}/openembedded-lkft/
+export TESTPLAN_PATH=${BASE_PATH}/android-lcr/lava-job-definitions/
+export TEMPLATE_PATH=${BASE_PATH}/android-lcr/lava-job-definitions/
+
+# create env variables as in post-build-lava
+export SNAPSHOTS_URL=https://snapshots.linaro.org
+export FILE_EXTENSION=tar.bz2
+if [ "${MAKE_TARGETS}" = "droidcore" ]; then
+    if [ -n "${IMAGE_EXTENSION}" ]; then
+        export FILE_EXTENSION=${IMAGE_EXTENSION}
+    else
+        export FILE_EXTENSION=img
+    fi
+fi
+if [ -z "${FRONTEND_JOB_NAME}" ]; then
+    export FRONTEND_JOB_NAME=~$(echo ${JOB_NAME} | sed -e 's/_/\//')
+fi
+if [ -z "${DOWNLOAD_URL}" ]; then
+    export DOWNLOAD_URL=${SNAPSHOTS_URL}/android/${FRONTEND_JOB_NAME}/${BUILD_NUMBER}
+fi
+export ANDROID_BOOT=${DOWNLOAD_URL}/boot.${FILE_EXTENSION}
+export ANDROID_SYSTEM=${DOWNLOAD_URL}/system.${FILE_EXTENSION}
+export ANDROID_DATA=${DOWNLOAD_URL}/userdata.${FILE_EXTENSION}
+export ANDROID_CACHE=${DOWNLOAD_URL}/cache.${FILE_EXTENSION}
+export ANDROID_META_NAME=${JOB_NAME}
+export ANDROID_META_BUILD=${BUILD_NUMBER}
+export ANDROID_META_URL=${BUILD_URL}
+export WA2_JOB_NAME=${BUILD_NUMBER}
+export CTS_PKG_URL=${CTS_PKG_URL}
+export VTS_PKG_URL=${VTS_PKG_URL}
+[ -z "${GERRIT_CHANGE_NUMBER}" ] && export GERRIT_CHANGE_NUMBER=""
+[ -z "${GERRIT_PATCHSET_NUMBER}" ] && export GERRIT_PATCHSET_NUMBER=""
+[ -z "${GERRIT_CHANGE_URL}" ] && export GERRIT_CHANGE_URL=""
+[ -z "${GERRIT_CHANGE_ID}" ] && export GERRIT_CHANGE_ID=""
+[ -z "${REFERENCE_BUILD_URL}" ] && export REFERENCE_BUILD_URL=""
+[ -z "${CTS_MODULE_NAME}" ] && export CTS_MODULE_NAME=""
+[ -z "${CTS_PKG_URL}" ] && unset CTS_PKG_URL
+[ -z "${VTS_PKG_URL}" ] && unset VTS_PKG_URL
+[ -z "${X15_BOOT_ARGS}" ] && unset X15_BOOT_ARGS
+[ -z "${ANDROID_VERSION_SUFFIX}" ] && unset ANDROID_VERSION_SUFFIX
+
+
+[ -n ${TEST_TEMPLATES} ] && unset TEST_TEMPLATES
+
+DEVICE_PLAN=${PLAN_CHANGE:-"plan_change_${DEVICE_TYPE}"}
+if [ -z "$GERRIT_PROJECT" ]; then
+    DEVICE_PLAN=${PLAN_WEEKLY:-"plan_weekly_${DEVICE_TYPE}"}
+fi
+
+for test in $(ls ${TESTPLAN_PATH}/${DEVICE_PLAN}); do
+    TEST_TEMPLATES="${TEST_TEMPLATES} ${DEVICE_PLAN}/${test}"
+done
+
+python ${SCRIPT_PATH}/submit_for_testing.py \
+  --device-type ${DEVICE_TYPE} \
+  --env-suffix ${FRONTEND_JOB_NAME} \
+  --build-number ${BUILD_NUMBER} \
+  --lava-server ${LAVA_SERVER} \
+  --qa-server ${QA_SERVER} \
+  --qa-server-team lcr \
+  --qa-server-project ${QA_SERVER_PROJECT} \
+  --git-commit ${BUILD_NUMBER} \
+  --quiet \
+  ${EXTRA_PARAMS} \
+  --testplan-path ${TESTPLAN_PATH} \
+  --template-path ${TEMPLATE_PATH} \
+  --test-plan ${TEST_TEMPLATES}
diff --git a/android-lcr/common/test_submit_for_testing.sh b/android-lcr/common/test_submit_for_testing.sh
new file mode 100755
index 0000000000..6471da6914
--- /dev/null
+++ b/android-lcr/common/test_submit_for_testing.sh
@@ -0,0 +1,83 @@
+#!/bin/bash -ex
+
+PARENT_DIR=$(cd $(dirname $0); pwd)
+
+virtualenv .venv
+source .venv/bin/activate
+pip install Jinja2 requests urllib3 ruamel.yaml==0.16.13
+
+export ART_URL=https://android-qa-reports.linaro.org/api/
+export BUILD_DIR=r-lcr-oreo
+export BUILD_DISPLAY_NAME=#38
+export BUILD_ID=38
+export BUILD_NUMBER=38
+export GERRIT_BRANCH=master
+export GERRIT_CHANGE_COMMIT_MESSAGE=dXBkYXRlIHRvIHRhZyBhbmRyb2lkLTguMS4wX3IyCgpUaGUgY2hhbmdlIGxvZyBjb3VsZCBiZSBjaGVja2VkIGhlcmU6IGh0dHA6Ly9wZW9wbGUubGluYXJvLm9yZy9+eW9uZ3Fpbi5saXUvQ2hhbmdlTG9ncy9DaGFuZ2VMb2ctYW5kcm9pZC04LjEuMF9yMS1hbmRyb2lkLTguMS4wX3IyLTIwMTctMTItMTgtMDMtMzAtMzEudHh0CgpDaGFuZ2UtSWQ6IEkxMTAzZTdlMzJkMzBiOWNhZjY3NjM4NTk4NzVjYjYxNGE5OTRmODY4ClNpZ25lZC1vZmYtYnk6IFlvbmdxaW4gTGl1IDx5b25ncWluLmxpdUBsaW5hcm8ub3JnPgo=
+export GERRIT_CHANGE_ID=I1103e7e32d30b9caf6763859875cb614a994f868
+export GERRIT_CHANGE_NUMBER=18010
+export GERRIT_CHANGE_SUBJECT=android-8.1.0_r2
+export GERRIT_CHANGE_URL=http://android-review.linaro.org/18010
+export GERRIT_EVENT_HASH=1581147094
+export GERRIT_EVENT_TYPE=change-merged
+export GERRIT_HOST=android-review.linaro.org
+export GERRIT_NAME=android-review.linaro.org
+export GERRIT_NEWREV=ded592ed8683143217b56c3915d00eef1d5abb12
+export GERRIT_PATCHSET_NUMBER=1
+export GERRIT_PATCHSET_REVISION=ded592ed8683143217b56c3915d00eef1d5abb12
+export GERRIT_PORT=29418
+#export GERRIT_PROJECT=android-build-configs
+export GERRIT_REFSPEC=refs/changes/10/18010/1
+export GERRIT_SCHEME=ssh
+export GERRIT_TOPIC=
+export GERRIT_VERSION=2.14.4
+export JOB_BASE_NAME=android-lcr-reference-x15-o
+export JOB_NAME=android-lcr-reference-x15-o
+export JOB_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/
+export PUB_DEST=/android/android-lcr-reference-x15-o/38
+export PUB_SRC=/home/buildslave/srv/r-lcr-oreo/build/out
+export RUN_CHANGES_DISPLAY_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/38/display/redirect?page=changes
+export RUN_DISPLAY_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/38/display/redirect
+export BUILD_URL=https://ci.linaro.org/job/android-lcr-reference-x15-o/38/
+export CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template.yaml
+export DOWNLOAD_URL=http://snapshots.linaro.org//android/android-lcr-reference-x15-o/38
+export EXECUTOR_NUMBER=18
+export FRONTEND_JOB_NAME=android-lcr-reference-x15-o
+export IMAGE_EXTENSION=img
+export JOB_NAME=android-lcr-reference-x15-o
+export JOB_URL=https://ci.linaro.org/job/post-build-lava/
+export LAVA_SERVER=lkft.validation.linaro.org/RPC2/
+export MAKE_TARGETS=droidcore
+export SKIP_REPORT=false
+export TARGET_PRODUCT=full_am57xevm
+#export ANDROID_VERSION_SUFFIX=master
+#export CTS_PKG_URL=http://testdata.linaro.org/cts/android-cts-master-linux_x86-arm-linaro.zip
+#export VTS_PKG_URL=http://testdata.linaro.org/vts/master/android-vts.zip
+
+export QA_SERVER=https://qa-reports.linaro.org/
+export QA_SERVER_PROJECT=lcr
+export QA_BUILD_VERSION=${BUILD_NUMBER}
+export QA_REPORTS_TOKEN=secret
+export ARTIFACTORIAL_TOKEN=artifactorial_token
+export AP_SSID=ap_ssid
+export AP_KEY=ap_key
+
+
+export DRY_RUN=true
+
+for device in $(ls ${PARENT_DIR}/../lava-job-definitions/devices); do
+    case "$device" in
+      *boot*)
+        ;;
+      *deploy*)
+        ;;
+      *)
+        export DEVICE_TYPE=$device
+        echo ${DEVICE_TYPE}
+        bash ${PARENT_DIR}/submit_for_testing.sh
+        ;;
+    esac
+done
+
+# cleanup virtualenv
+deactivate
+rm -rf .venv
diff --git a/android-lcr/fvp/builders.sh b/android-lcr/fvp/builders.sh
deleted file mode 100755
index 1bdabfe47d..0000000000
--- a/android-lcr/fvp/builders.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-# Early test
-if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-  echo "in android-build-configs.git"
-  exit 1
-fi
-
-# Build Android
-build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml /home/buildslave/srv/${BUILD_DIR}/build/out/*.json ${WORKSPACE}/
-
-# Publish parameters
-cat << EOF > ${WORKSPACE}/publish_parameters
-PUB_SRC=${PWD}/build/out
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-EOF
-
-# Construct post-build-lava parameters
-source build-configs/${BUILD_CONFIG_FILENAME}
-cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-fvp-m/template.json
-DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
-TARGET_PRODUCT=${TARGET_PRODUCT}
-MAKE_TARGETS=${MAKE_TARGETS}
-JOB_NAME=${JOB_NAME}
-BUILD_NUMBER=${BUILD_NUMBER}
-BUILD_URL=${BUILD_URL}
-LAVA_SERVER=validation.linaro.org/RPC2/
-LAVA_STREAM=${BUNDLE_STREAM_NAME}
-BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-FRONTEND_JOB_NAME=${JOB_NAME}
-SKIP_REPORT=false
-EOF
diff --git a/android-lcr/fvp/builders.yaml.inc b/android-lcr/fvp/builders.yaml.inc
deleted file mode 100644
index 83fe1b9894..0000000000
--- a/android-lcr/fvp/builders.yaml.inc
+++ /dev/null
@@ -1,16 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/fvp/builders.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-fvp-m/template-cts-bionic.json#g" ${WORKSPACE}/post_build_lava_parameters
diff --git a/android-lcr/generic/builders.sh b/android-lcr/generic/builders.sh
index 2f1d082e85..959211d88a 100755
--- a/android-lcr/generic/builders.sh
+++ b/android-lcr/generic/builders.sh
@@ -1,6 +1,9 @@
 # Build Android
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
+rm -rf out/
+# Prevent repo aborting sync because of uncommitted changes.
+repo forall -c 'git reset --hard' >/dev/null
 repo init -u ${ANDROID_MANIFEST_URL} -b ${MANIFEST_BRANCH}
 repo sync -j"$(nproc)" -c
 
diff --git a/android-lcr/hikey/build-info/aosp-master-template.txt b/android-lcr/hikey/build-info/aosp-master-template.txt
index 465e4c2317..5a494e3ddc 100644
--- a/android-lcr/hikey/build-info/aosp-master-template.txt
+++ b/android-lcr/hikey/build-info/aosp-master-template.txt
@@ -1,96 +1,4 @@
 Format-Version: 0.5
 
-Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz,  boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img,  userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.sh, *.json, boot.uefi.img.xz,
+Files-Pattern: *
 License-Type: open
-
-Files-Pattern: system.img, system.img.xz, *.zip
-License-Type: protected
-Theme: linaro
-License-Text: <strong>END USER LICENCE AGREEMENT FOR THE MALI GPU USERSPACE DRIVER (“MALI GPU DRIVER”)</strong>
- <p>
- THIS END USER LICENCE AGREEMENT (“LICENCE”) IS A LEGAL AGREEMENT BETWEEN YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND ARM LIMITED ("ARM") FOR THE USE OF THE SOFTWARE ACCOMPANYING THIS LICENCE. ARM IS ONLY WILLING TO LICENSE THE SOFTWARE TO YOU ON CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS LICENCE. BY CLICKING “I AGREE” OR BY INSTALLING OR OTHERWISE USING OR COPYING THE SOFTWARE YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, ARM IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND YOU MAY NOT INSTALL, USE OR COPY THE SOFTWARE, AND YOU SHOULD PROMPTLY RETURN THE SOFTWARE TO YOUR SUPPLIER.
- </p>
- <p>
- “Software” means any software, firmware and data accompanying this Licence, any printed, electronic or online documentation supplied with it under the terms of this Licence for the MALI GPU Driver.
- </p>
- <p>
- <h2>
- 1. LICENCE GRANTS TO YOU.
- </h2>
- 1.1 ARM hereby grants to you, subject to the terms and conditions of this Licence, a non-exclusive, non-transferable, revocable, worldwide licence to: (i) use the Software or certain components or optional functionality in the Software, as applicable, solely for the purposes of designing or developing applications for use in conjunction with MALI GPU based products manufactured under licence from ARM; and (ii) modify the Software or certain components or optional functionality in the Software for the purposes of porting the Software to your target;
- </p>
- <p>
- <h2>
- 2. RESTRICTIONS ON USE OF THE SOFTWARE.
- </h2>
- COPYING: You shall not use or copy the Software except as expressly authorised in this Licence. You may make one additional copy of the delivered Software for backup or archival purposes.
- </p>
- <p>
- BENCHMARKING: This Licence does not prevent you from using the Software for internal benchmarking purposes. However, you shall treat any and all benchmarking data relating to the Software, and any other results of your use or testing of the Software which are indicative of its performance, efficacy, reliability or quality, as confidential information and you shall not disclose such information to any third party without the express written permission of ARM.
- </p>
- <p>
- COPYRIGHT AND RESERVATION OF RIGHTS: The Software is owned by ARM or its licensors and is protected by copyright and other intellectual property laws and international treaties. The Software is licensed not sold. You acquire no rights to the Software other than as expressly provided by this Licence. You shall not remove from the Software any copyright notice or other notice and shall ensure that any such notice is reproduced in any copies of the whole or any part of the Software made by you or other permitted users.
- </p>
- <p>
- REVERSE ENGINEERING: Except to the extent that such activity is permitted by applicable law you shall not reverse engineer, decompile or disassemble any of the Software. If the Software was provided to you in Europe you shall not reverse engineer, decompile or disassemble any of the Software for the purposes of error correction.
- </p>
- <p>
- <h2>
- 3. SUPPORT.
- </h2>
- ARM is not under an obligation to provide support, but it may do so at its own discretion, and if it does, it will only be in respect of the Software as delivered and not any modifications thereto.
- </p>
- <p>
- <h2>
- 4. NO WARRANTIES.
- </h2>
- YOU AGREE THAT THE SOFTWARE IS LICENSED “AS IS”, AND THAT ARM EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR OTHER TERMS, EXPRESS OR IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE.
- </p>
- <p>
- YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION OF SOFTWARE APPLICATIONS, INCLUDING WITHOUT LIMITATION, SOFTWARE APPLICATIONS DESIGNED OR INTENDED FOR MISSION CRITICAL APPLICATIONS, SUCH AS PACEMAKERS, WEAPONRY, AIRCRAFT NAVIGATION, FACTORY CONTROL SYSTEMS, ETC. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- </p>
- <p>
- <h2>
- 5. LIMITATION OF LIABILITY.
- </h2>
- TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL ARM BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF PROFITS) ARISING OUT OF THE USE OR INABILITY TO USE THE SOFTWARE WHETHER BASED ON A CLAIM UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, EVEN IF ARM WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  </p>
- <p>
- ARM does not seek to limit or exclude liability for death or personal injury arising from ARM's negligence or ARM’s fraud and because some jurisdictions do not permit the exclusion or limitation of liability for consequential or incidental damages the above limitation relating to liability for consequential damages may not apply to you.
- </p>
- <p>
- NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, THE MAXIMUM LIABILITY OF ARM TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST ARM IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE SUBJECT MATTER OF THIS LICENCE SHALL NOT EXCEED THE GREATER OF: (I) THE TOTAL OF SUMS PAID BY YOU TO ARM (IF ANY) FOR THIS LICENCE; AND (II) $10.00 USD. THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT.
- </p>
- <p>
- <h2>
- 6. CONFIDENTIALITY.
- </h2>
- You acknowledge that the Software and any benchmarking data and related information mentioned in Clause 2 may contain trade secrets and confidential material and you  agree to maintain all such information in confidence and apply security measures no less stringent than the measures which you apply to protect your own like information, but not less than a reasonable degree of care, to prevent their  unauthorised disclosure and use. Subject to any restrictions imposed by applicable law, the period of confidentiality shall be indefinite. You agree not to use any such information other than in normal use of the Software under the licences granted in this Licence.
- </p>
- <p>
- <h2>
- 7. U.S. GOVERNMENT END USERS.
- </h2>
- US Government Restrictions: Use, duplication, reproduction, release, modification, disclosure or transfer of the Software is restricted in accordance with the terms of this Licence.
- </p>
- <p>
- <h2>
- 8. TERM AND TERMINATION.
- </h2>
- This Licence shall remain in force until terminated by you or by ARM.  Without prejudice to any of its other rights if you are in breach of any of the terms and conditions of this Licence then ARM may terminate this Licence immediately upon giving written notice to you or on thirty (30) days written notice without cause. You may terminate this Licence at any time. Upon termination of this Licence by you or by ARM , you shall stop using the Software and confidential information and destroy all copies of the Software and confidential information in your possession, together with all documentation and related materials. The provisions of clauses 4, 5, 6, 7,  8 and 9 shall survive termination of this Licence.
- </p>
- <p>
- <h2>
- 9. GENERAL.
- </h2>
- This Licence is governed by English Law. Except where ARM agrees otherwise in: (i) a written contract signed by you and ARM; or (ii) a written contract provided by ARM and accepted by you, this is the only agreement between you and ARM relating to the Software and it may only be modified by written agreement between you and ARM. Except as expressly agreed in writing, this Licence may not be modified by purchase orders, advertising or other representation by any person. If any clause or sentence in this Licence is held by a court of law to be illegal or unenforceable the remaining provisions of this Licence shall not be affected thereby. The failure by ARM to enforce any of the provisions of this Licence, unless waived in writing, shall not constitute a waiver of ARM's rights to enforce such provision or any other provision of this Licence in the future.
- </p>
- <p>
- At ARM’s request, you agree to check your computers for installations of the Software and any other information requested by ARM relating to Software installation and to provide this information to ARM. You agree that auditors nominated by ARM may also perform such checking and reporting on behalf of ARM by prior appointment during your normal business hours on seven (7) days’ notice. ARM shall bear the auditors’ costs for that audit unless it reveals unlicensed usage in which case you shall promptly reimburse ARM for all reasonable costs and expenses, including professional fees, relating to such audit. Any information which is disclosed to ARM or such auditors during checking or audit shall be treated as your confidential information and shall only be used by ARM for licence management, compliance and enforcement purposes.
- </p>
- <p>
- The Software provided under this Licence is subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to comply fully with all laws and regulations of the United States and other countries ("Export Laws") to assure that the Software, is not (1) exported, directly or indirectly, in violation of Export Laws, either to any countries that are subject to U.S.A. export restrictions or to any end user who has been prohibited from participating in the U.S.A. export transactions by any federal agency of the U.S.A. government; or (2) intended to be used for any purpose prohibited by Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation.
- </p>
- <p>
- Mali GPU Userspace LES-PRE-20376
- </p>
diff --git a/android-lcr/hikey/build-info/template.txt b/android-lcr/hikey/build-info/template.txt
index 48124c2489..f20b2991b4 100644
--- a/android-lcr/hikey/build-info/template.txt
+++ b/android-lcr/hikey/build-info/template.txt
@@ -1,10 +1,10 @@
 Format-Version: 0.5
 
-Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz,  boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img,  userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.zip, *.sh, fip.bin.xz, l-loader.bin.xz,
+Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz,  boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img,  userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.zip, *.sh, fip.bin.xz, l-loader.bin.xz, prm_ptable.img.xz, ptable-aosp-4g.img.xz, ptable-aosp-8g.img.xz, ptable-aosp-32g.img.xz, nvme.img.xz, hisi-nvme.img.xz
 License-Type: protected
 Auth-Groups: lmg-member-only, team-qa-services, team-android-engineering
 
-Files-Pattern: system.img, system.img.xz
+Files-Pattern: system.img, system.img.xz, vendor.img.xz, vendor.img
 License-Type: protected
 Auth-Groups: lmg-member-only, team-qa-services, team-android-engineering
 Theme: linaro
diff --git a/android-lcr/hikey/builders-v2-jinja2.yaml.inc b/android-lcr/hikey/builders-v2-jinja2.yaml.inc
new file mode 100644
index 0000000000..741f0f7c1e
--- /dev/null
+++ b/android-lcr/hikey/builders-v2-jinja2.yaml.inc
@@ -0,0 +1,15 @@
+        - shell:
+            !include-raw:
+                - android-lcr/common/builders.sh
+                - android-lcr/hikey/builders-v2.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - shell:
+            !include-raw:
+                - android-lcr/common/submit_for_testing.sh
diff --git a/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc b/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc
deleted file mode 100644
index a429706c5a..0000000000
--- a/android-lcr/hikey/builders-v2-premerge-ci.yaml.inc
+++ /dev/null
@@ -1,44 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/hikey/builders-v2.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-boottime.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-xtest-lmg.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused1-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused2-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-benchmarkpi.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-lcr/hikey/builders-v2.sh b/android-lcr/hikey/builders-v2.sh
index e65fae7ba8..37c3ecd0d2 100755
--- a/android-lcr/hikey/builders-v2.sh
+++ b/android-lcr/hikey/builders-v2.sh
@@ -5,8 +5,16 @@ if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
   exit 1
 fi
 
+source build-configs/${BUILD_CONFIG_FILENAME}
+
 # Clean android-patchsets and repositories in device
 rm -rf build/out build/android-patchsets build/device
+# clean hikey kernel repositories
+rm -rf build/kernel/linaro
+rm -fr build/.repo/projects/prebuilts/clang/host/linux-x86.git build/prebuilts/clang/host/linux-x86
+
+# clean build-info directory which depends on systemtarball, is not suppported by aosp master
+rm -rf build/build-info
 
 mkdir -p build/
 cd build/
@@ -21,18 +29,17 @@ cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${
 
 # publish fip.bin and l-loader.bin
 cp -v /home/buildslave/srv/${BUILD_DIR}/build/out/dist/fip.bin \
+      /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/prm_ptable.img \
+      /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/ptable-aosp-4g.img \
+      /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/ptable-aosp-8g.img \
+      /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/ptable-aosp-32g.img \
+      /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/nvme.img \
+      /home/buildslave/srv/${BUILD_DIR}/build/device/linaro/hikey/installer/${TARGET_PRODUCT}/hisi-nvme.img \
       /home/buildslave/srv/${BUILD_DIR}/build/out/dist/l-loader.bin build/out/ || true
 
-# Compress images
-cd build/
-## works for both nougat and oreo and master
-out/host/linux-x86/bin/make_ext4fs -s -T -1 -S out/obj/ETC/file_contexts.bin_intermediates/file_contexts.bin -L data -l 1595915776 -a data out/userdata-4gb.img out/data
-cd -
-
 cd build/out
-rm -f ramdisk.img
-for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img" "fip.bin" "l-loader.bin"; do
-  ## there are the cases that fip.bin and l-loader.bin not generated
+for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img" "fip.bin" "l-loader.bin" "prm_ptable.img" "ptable-aosp-4g.img" "ptable-aosp-8g.img" "ptable-aosp-32g.img" "nvme.img" "hisi-nvme.img" "vendor.img"; do
+  ## there are the cases that fip.bin, l-loader.bin and ptables not generated
   ## so we add the check before run xz command
   if [ -f ${image} ]; then
     echo "Compressing ${image}"
@@ -41,8 +48,30 @@ for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdat
 done
 cd -
 
+if [ "X${BUILD_VENDOR_FOR_4_4}" = "Xtrue" ]; then
+    cd build/
+    source build/envsetup.sh
+    lunch hikey-userdebug
+    rm -rf out/target/product/hikey/vendor*
+    make vendorimage TARGET_KERNEL_USE=4.4 TARGET_COMPRESSED_KERNEL=true TARGET_BUILD_KERNEL=false HIKEY_USE_DRM_HWCOMPOSER=false
+    cp out/target/product/hikey/vendor.img out/vendor-4.4.img
+    xz out/vendor-4.4.img
+    cd -
+fi
+
+if [ "X${BUILD_VENDOR_HIKEY960_FBDEV}" = "Xtrue" ]; then
+    cd build/
+    source build/envsetup.sh
+    lunch hikey960-userdebug
+    rm -rf out/target/product/hikey960/vendor*
+    make vendorimage TARGET_KERNEL_USE=4.9 TARGET_COMPRESSED_KERNEL=false TARGET_BUILD_KERNEL=false HIKEY_USE_DRM_HWCOMPOSER=false
+    cp out/target/product/hikey960/vendor.img out/vendor-4.9.img
+    xz out/vendor-4.9.img
+    cd -
+fi
+
 rm -rf build/out/BUILD-INFO.txt
-wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/template.txt -O build/out/BUILD-INFO.txt
+wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O build/out/BUILD-INFO.txt
 
 # Delete sources after build to save space
 cd build
@@ -57,18 +86,23 @@ EOF
 
 PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
 # Construct post-build-lava parameters
-source build-configs/${BUILD_CONFIG_FILENAME}
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
+SKIP_LAVA=${SKIP_LAVA}
+DEVICE_TYPE=${LAVA_DEVICE_TYPE:-hi6220-hikey}
 TARGET_PRODUCT=${TARGET_PRODUCT}
 MAKE_TARGETS=${MAKE_TARGETS}
 JOB_NAME=${JOB_NAME}
 BUILD_NUMBER=${BUILD_NUMBER}
 BUILD_URL=${BUILD_URL}
-LAVA_SERVER=lkft.validation.linaro.org/RPC2/
+LAVA_SERVER=${LAVA_SERVER:-lkft.validation.linaro.org/RPC2/}
 IMAGE_EXTENSION=img.xz
 FRONTEND_JOB_NAME=${JOB_NAME}
 DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
 CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template.yaml
 SKIP_REPORT=false
+CTS_PKG_URL=${CTS_PKG_URL}
+VTS_PKG_URL=${VTS_PKG_URL}
+ANDROID_VERSION_SUFFIX=${ANDROID_VERSION_SUFFIX}
+PLAN_CHANGE=${PLAN_CHANGE}
+PLAN_WEEKLY=${PLAN_WEEKLY}
 EOF
diff --git a/android-lcr/hikey/builders-v2.yaml.inc b/android-lcr/hikey/builders-v2.yaml.inc
deleted file mode 100644
index 5cfd842a5a..0000000000
--- a/android-lcr/hikey/builders-v2.yaml.inc
+++ /dev/null
@@ -1,281 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/hikey/builders-v2.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-boottime.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-xtest-lmg.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-monkey.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused1-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused1-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused2-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-focused2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-benchmarkpi.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cf-bench.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-gearses2eclair.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-geekbench3.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-javawhetstone.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-jbench.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-linpack.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-quadrantpro.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-scimark.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-rl-sqlite.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vellamo3.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-caffeinemark.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-antutu6.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-andebenchpro2015.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            if [ -n "$GERRIT_PROJECT" ]; then
-                echo "SKIP_LAVA=1" >> ${WORKSPACE}/post_build_lava_parameters
-            fi
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part1-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part1-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part2-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part3-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part3-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part4-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part4-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part5-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-part5-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-opengl-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-opengl-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-media-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-media-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-media2-v8a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-cts-media2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-weekly.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vts-part1.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vts-part2.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vts-part3.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vts-part4.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vts-part5.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey-v2/template-vts-part6.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-lcr/hikey/builders.sh b/android-lcr/hikey/builders.sh
deleted file mode 100755
index 2b00c80301..0000000000
--- a/android-lcr/hikey/builders.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-# Early test
-if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-  echo "in android-build-configs.git"
-  exit 1
-fi
-
-# Clean android-patchsets and repositories in device
-rm -rf build/out build/android-patchsets build/device
-
-mkdir -p build/
-cd build/
-wget https://dl.google.com/dl/android/aosp/linaro-hikey-20170523-4b9ebaff.tgz
-tar -xvf linaro-hikey-20170523-4b9ebaff.tgz
-yes "I ACCEPT" | ./extract-linaro-hikey.sh
-cd -
-
-# Build Android
-build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
-
-# publish fip.bin and l-loader.bin
-cp -v /home/buildslave/srv/${BUILD_DIR}/build/out/dist/fip.bin \
-      /home/buildslave/srv/${BUILD_DIR}/build/out/dist/l-loader.bin build/out/ || true
-
-# Compress images
-cd build/
-out/host/linux-x86/bin/make_ext4fs -s -T -1 -S out/root/file_contexts -L data -l 1342177280 -a data out/userdata-4gb.img out/data
-cd -
-
-cd build/out
-rm -f ramdisk.img
-for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img" "fip.bin" "l-loader.bin"; do
-  ## there are the cases that fip.bin and l-loader.bin not generated
-  ## so we add the check before run xz command
-  if [ -f ${image} ]; then
-    echo "Compressing ${image}"
-    xz ${image}
-  fi
-done
-cd -
-
-rm -rf build/out/BUILD-INFO.txt
-wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/template.txt -O build/out/BUILD-INFO.txt
-
-# Publish parameters
-cat << EOF > ${WORKSPACE}/publish_parameters
-PUB_SRC=${PWD}/build/out
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-EOF
-
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-# Construct post-build-lava parameters
-source build-configs/${BUILD_CONFIG_FILENAME}
-cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
-TARGET_PRODUCT=${TARGET_PRODUCT}
-MAKE_TARGETS=${MAKE_TARGETS}
-JOB_NAME=${JOB_NAME}
-BUILD_NUMBER=${BUILD_NUMBER}
-BUILD_URL=${BUILD_URL}
-LAVA_SERVER=validation.linaro.org/RPC2/
-IMAGE_EXTENSION=img.xz
-FRONTEND_JOB_NAME=${JOB_NAME}
-DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
-CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template.json
-SKIP_REPORT=false
-EOF
diff --git a/android-lcr/hikey/builders.yaml.inc b/android-lcr/hikey/builders.yaml.inc
deleted file mode 100644
index 1c1d256fe9..0000000000
--- a/android-lcr/hikey/builders.yaml.inc
+++ /dev/null
@@ -1,191 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/hikey/builders.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-boottime.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-xtest-lmg.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-focused1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-focused2.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-benchmarkpi.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cf-bench.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-gearses2eclair.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-geekbench3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-javawhetstone.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-jbench.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-linpack.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-quadrantpro.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-scimark.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-rl-sqlite.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-vellamo3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-applications.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-caffeinemark.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-antutu6.0.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            if [ -n "$GERRIT_PROJECT" ]; then
-                echo "SKIP_LAVA=1" >> ${WORKSPACE}/post_build_lava_parameters
-            fi
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-part1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-part2-64.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-part2-32.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-part3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-part4.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-opengl.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-media-32.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-cts-media-64.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-andebenchpro2015.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-glbenchmark-2.5.1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-weekly.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-lcr/juno/builders.sh b/android-lcr/juno/builders.sh
index 87dcb26fed..fafe02b7bb 100755
--- a/android-lcr/juno/builders.sh
+++ b/android-lcr/juno/builders.sh
@@ -13,6 +13,11 @@ mkdir -p build
 build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
 cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml /home/buildslave/srv/${BUILD_DIR}/build/out/*.json ${WORKSPACE}/
 
+#package juno.img.bz2 and create uInitrd.img
+cd /home/buildslave/srv/${BUILD_DIR}/build/out/
+mkimage -A arm64 -O linux -C none -T ramdisk -n "Android Ramdisk" -d ramdisk.img -a 84000000 -e 84000000 uInitrd.img
+cd -
+
 # Delete sources after build to save space
 cd build
 rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
@@ -28,6 +33,7 @@ EOF
 source build-configs/${BUILD_CONFIG_FILENAME}
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
 CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template.json
+SKIP_LAVA=${SKIP_LAVA}
 DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
 TARGET_PRODUCT=${TARGET_PRODUCT}
 MAKE_TARGETS=${MAKE_TARGETS}
diff --git a/android-lcr/juno/builders.yaml.inc b/android-lcr/juno/builders.yaml.inc
index db12c13a82..5ce4e1da70 100644
--- a/android-lcr/juno/builders.yaml.inc
+++ b/android-lcr/juno/builders.yaml.inc
@@ -15,180 +15,5 @@
         - shell:
             !include-raw:
                 - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-boottime.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-focused1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-focused2.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-benchmarkpi.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cf-bench.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-gearses2eclair.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-geekbench3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-javawhetstone.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-jbench.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-linpack.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-quadrantpro.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-scimark.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-sqlite.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-rl-sqlite.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-vellamo3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-applications.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-caffeinemark.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-antutu6.0.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            if [ -n "$GERRIT_PROJECT" ]; then
-                echo "SKIP_LAVA=1" >> ${WORKSPACE}/post_build_lava_parameters
-            fi
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-part1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-part2.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-part3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-part4.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-opengl-32.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-opengl-64.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-media-32.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-cts-media-64.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-glbenchmark-2.5.1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/lcr-member-juno-m/template-weekly.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
         - shell: |
             echo "Build finished"
diff --git a/android-lcr/lava-job-definitions/definitions/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/definitions/andebenchpro2015.yaml
new file mode 100644
index 0000000000..cd19e44d1b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/andebenchpro2015.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 150 %}
+{% set testname = "andebenchpro2015" %}
diff --git a/android-lcr/lava-job-definitions/definitions/antutu6.yaml b/android-lcr/lava-job-definitions/definitions/antutu6.yaml
new file mode 100644
index 0000000000..381a058726
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/antutu6.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 240 %}
+{% set testname = "antutu6" %}
diff --git a/android-lcr/lava-job-definitions/definitions/basic.yaml b/android-lcr/lava-job-definitions/definitions/basic.yaml
new file mode 100644
index 0000000000..0aa91f3b04
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/basic.yaml
@@ -0,0 +1,54 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+{% set device_type_boot = device_type ~ "-boot" %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-basic{% endblock job_name %}
+{% block priority %}75{% endblock priority %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-30|int|abs }}{% else %}60{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/meminfo/meminfo.yaml
+          name: meminfo-first
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/busybox/busybox.yaml
+          name: busybox
+{% if DEVICE_TYPE == 'hi6220-hikey' %}
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/adb-join-wifi/adb-join-wifi.yaml
+          name: adb-join-wifi
+{% endif %}
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/ping/ping.yaml
+          name: ping
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/linaro-android-kernel-tests/linaro-android-kernel-tests.yaml
+          name: linaro-android-kernel-tests
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/tjbench/tjbench.yaml
+          name: tjbench
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 15
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/meminfo/meminfo.yaml
+          name: meminfo-second
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/definitions/benchmarkpi.yaml b/android-lcr/lava-job-definitions/definitions/benchmarkpi.yaml
new file mode 100644
index 0000000000..a378ee0fc8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/benchmarkpi.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 35 %}
+{% set testname = "benchmarkpi" %}
+
diff --git a/android-lcr/lava-job-definitions/definitions/boottime.yaml b/android-lcr/lava-job-definitions/definitions/boottime.yaml
new file mode 100644
index 0000000000..549d37c36c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/boottime.yaml
@@ -0,0 +1,143 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+{% set device_type_boot = device_type ~ "-boot" %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-boottime{% endblock job_name %}
+{% block priority %}75{% endblock priority %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: first-boot
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-first-analyze
+          params:
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-1
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 1
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-2
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 2
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-3
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 3
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-4
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 4
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-5
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 5
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-6
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 6
+
+{% include device_type_boot %}
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-7
+          params:
+            OPERATION: COLLECT
+            COLLECT_NO: 7
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-second-analyze
+          params:
+            OPERATION: ANALYZE
+            COLLECT_NO: 7
+
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/definitions/caffeinemark.yaml b/android-lcr/lava-job-definitions/definitions/caffeinemark.yaml
new file mode 100644
index 0000000000..71d4929991
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/caffeinemark.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "caffeinemark" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cf-bench.yaml b/android-lcr/lava-job-definitions/definitions/cf-bench.yaml
new file mode 100644
index 0000000000..9b0cd720ec
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cf-bench.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 120 %}
+{% set testname = "cf-bench" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/definitions/cts-CtsCarTestCases.yaml
new file mode 100644
index 0000000000..570cee3140
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-CtsCarTestCases.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts-module.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "-m CtsCarTestCases" %}
+{% set testname = "CtsCarTestCases" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-focused1-v7a.yaml
new file mode 100644
index 0000000000..4c22c46dec
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-focused1-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-focused1" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-focused1-v8a.yaml
new file mode 100644
index 0000000000..219537641b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-focused1-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-focused1" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-focused2-v7a.yaml
new file mode 100644
index 0000000000..50291ab800
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-focused2-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-focused2" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-focused2-v8a.yaml
new file mode 100644
index 0000000000..ee4a5216ec
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-focused2-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-focused2" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-media-v7a.yaml
new file mode 100644
index 0000000000..6927d6d3ba
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-media-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-media" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-media-v8a.yaml
new file mode 100644
index 0000000000..ce48e909b5
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-media-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-media" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-media2-v7a.yaml
new file mode 100644
index 0000000000..6aafff04a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-media2-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-media2" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-media2-v8a.yaml
new file mode 100644
index 0000000000..0c539055a8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-media2-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-media2" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-module-keystore-abi-all.yaml b/android-lcr/lava-job-definitions/definitions/cts-module-keystore-abi-all.yaml
new file mode 100644
index 0000000000..d28089d8aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-module-keystore-abi-all.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts-module.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "cts-module-keystore" %}
+{% set testcommand = "--module CtsKeystoreTestCases" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-module-keystore-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-module-keystore-v7a.yaml
new file mode 100644
index 0000000000..92a31892da
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-module-keystore-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts-module.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "cts-module-keystore" %}
+{% set testcommand = "--module CtsKeystoreTestCases --abi armeabi-v7a" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-module-keystore-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-module-keystore-v8a.yaml
new file mode 100644
index 0000000000..3d1e8007a3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-module-keystore-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts-module.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "cts-module-keystore" %}
+{% set testcommand = "--module CtsKeystoreTestCases --abi arm64-v8a" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-opengl-v7a.yaml
new file mode 100644
index 0000000000..5a28596e59
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-opengl-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-opengl" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-opengl-v8a.yaml
new file mode 100644
index 0000000000..d51203a091
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-opengl-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 600 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-opengl" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part1-v7a.yaml
new file mode 100644
index 0000000000..f8bb32d73b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part1-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part1" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part1-v8a.yaml
new file mode 100644
index 0000000000..8ef8cbafd6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part1-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 360 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part1" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part2-v7a.yaml
new file mode 100644
index 0000000000..bb6e7c609d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part2-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 540 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part2" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part2-v8a.yaml
new file mode 100644
index 0000000000..900344fb9a
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part2-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 510 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part2" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part3-v7a.yaml
new file mode 100644
index 0000000000..15f823485e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part3-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part3" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part3-v8a.yaml
new file mode 100644
index 0000000000..f423aeb5db
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part3-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part3" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part4-v7a.yaml
new file mode 100644
index 0000000000..423ea5b477
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part4-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part4" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part4-v8a.yaml
new file mode 100644
index 0000000000..5f34705a6e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part4-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part4" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part5-v7a.yaml
new file mode 100644
index 0000000000..d1010040b3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part5-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 240 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts-part5" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-part5-v8a.yaml
new file mode 100644
index 0000000000..e67cb46e35
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-part5-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 240 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts-part5" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-v7a.yaml b/android-lcr/lava-job-definitions/definitions/cts-v7a.yaml
new file mode 100644
index 0000000000..4ba563d0a1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-v7a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "armeabi-v7a" %}
+{% set testname = "cts" %}
diff --git a/android-lcr/lava-job-definitions/definitions/cts-v8a.yaml b/android-lcr/lava-job-definitions/definitions/cts-v8a.yaml
new file mode 100644
index 0000000000..e603727d09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/cts-v8a.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-cts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set abi = "arm64-v8a" %}
+{% set testname = "cts" %}
diff --git a/android-lcr/lava-job-definitions/definitions/gearses2eclair.yaml b/android-lcr/lava-job-definitions/definitions/gearses2eclair.yaml
new file mode 100644
index 0000000000..af63329e17
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/gearses2eclair.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 120 %}
+{% set testname = "gearses2eclair" %}
diff --git a/android-lcr/lava-job-definitions/definitions/geekbench3.yaml b/android-lcr/lava-job-definitions/definitions/geekbench3.yaml
new file mode 100644
index 0000000000..a383988045
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/geekbench3.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "geekbench3" %}
diff --git a/android-lcr/lava-job-definitions/definitions/geekbench4.yaml b/android-lcr/lava-job-definitions/definitions/geekbench4.yaml
new file mode 100644
index 0000000000..e513a55fb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/geekbench4.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "geekbench4" %}
diff --git a/android-lcr/lava-job-definitions/definitions/glbenchmark25.yaml b/android-lcr/lava-job-definitions/definitions/glbenchmark25.yaml
new file mode 100644
index 0000000000..7a9addd4a8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/glbenchmark25.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testname = "glbenchmark25" %}
diff --git a/android-lcr/lava-job-definitions/definitions/gtest-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/definitions/gtest-gatekeeper-keymaster.yaml
new file mode 100644
index 0000000000..42f0d46fe9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/gtest-gatekeeper-keymaster.yaml
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-optee-gtest-gatekeeper-keymaster{% endblock job_name %}
+{% block priority %}75{% endblock priority %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/optee/optee-gtest-gatekeeper-keymaster.yaml
+          name: optee-gtest-gatekeeper-keymaster
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/definitions/gtest-kmgk.yaml b/android-lcr/lava-job-definitions/definitions/gtest-kmgk.yaml
new file mode 100644
index 0000000000..6dfb2ab4b0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/gtest-kmgk.yaml
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-optee-gtest-kmgk{% endblock job_name %}
+{% block priority %}75{% endblock priority %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+      definitions:
+        - repository: https://github.com/Linaro/test-definitions.git
+          from: git
+          path: automated/android/optee/optee-gtest-kmgk.yaml
+          name: optee-gtest-kmgk
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/definitions/javawhetstone.yaml b/android-lcr/lava-job-definitions/definitions/javawhetstone.yaml
new file mode 100644
index 0000000000..74c3b3c9db
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/javawhetstone.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "javawhetstone" %}
diff --git a/android-lcr/lava-job-definitions/definitions/jbench.yaml b/android-lcr/lava-job-definitions/definitions/jbench.yaml
new file mode 100644
index 0000000000..7904f93da2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/jbench.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "jbench" %}
diff --git a/android-lcr/lava-job-definitions/definitions/linpack.yaml b/android-lcr/lava-job-definitions/definitions/linpack.yaml
new file mode 100644
index 0000000000..dd648b2e5b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/linpack.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "linpack" %}
diff --git a/android-lcr/lava-job-definitions/definitions/monkey.yaml b/android-lcr/lava-job-definitions/definitions/monkey.yaml
new file mode 100644
index 0000000000..23d4647ece
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/monkey.yaml
@@ -0,0 +1,23 @@
+{% extends device_type %}
+
+{% set job_timeout = 150 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-monkey{% endblock job_name %}
+{% block priority %}75{% endblock priority %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 120
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/monkey/monkey.yaml
+          params:
+            MONKEY_PARAMS: "-s 1520023612672 --pct-syskeys 0 -p com.android.settings --monitor-native-crashes"
+            EVENT_COUNT: 600000
+            BLACKLIST: ""
+          name: monkey
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/definitions/quadrantpro.yaml b/android-lcr/lava-job-definitions/definitions/quadrantpro.yaml
new file mode 100644
index 0000000000..c4a12ebc66
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/quadrantpro.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "quadrantpro" %}
diff --git a/android-lcr/lava-job-definitions/definitions/rl-sqlite.yaml b/android-lcr/lava-job-definitions/definitions/rl-sqlite.yaml
new file mode 100644
index 0000000000..a0e84c701b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/rl-sqlite.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "rl-sqlite" %}
diff --git a/android-lcr/lava-job-definitions/definitions/scimark.yaml b/android-lcr/lava-job-definitions/definitions/scimark.yaml
new file mode 100644
index 0000000000..cade098a05
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/scimark.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "scimark" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vellamo3.yaml b/android-lcr/lava-job-definitions/definitions/vellamo3.yaml
new file mode 100644
index 0000000000..5959d45a79
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vellamo3.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-apk-automation.yaml.jinja2" %}
+
+{% set job_timeout = 180 %}
+{% set testname = "vellamo3" %}
+{% set loopcount = "3" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml
new file mode 100644
index 0000000000..3bdf22b8f2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-gatekeeper-keymaster.yaml
@@ -0,0 +1,12 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% block priority %}75{% endblock priority %}
+# for some reason --module m1 --module m2 doesn't work
+# only the last specified module is run
+# i.e. VtsHalKeymasterV3_0Target in this case
+# so use --include-filter instead
+# re: https://linaro.zendesk.com/agent/tickets/2427
+{% set testcommand = "vts-hal --include-filter VtsHalGatekeeperV1_0Target --include-filter VtsHalKeymasterV3_0Target" %}
+{% set testname = "vts-hal-gatekeeper-keymaster" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-gatekeeper.yaml b/android-lcr/lava-job-definitions/definitions/vts-gatekeeper.yaml
new file mode 100644
index 0000000000..df7d47c738
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-gatekeeper.yaml
@@ -0,0 +1,7 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% block priority %}75{% endblock priority %}
+{% set testcommand = "vts-hal --module VtsHalGatekeeperV1_0Target" %}
+{% set testname = "vts-hal-gatekeeper" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/definitions/vts-hal-auto.yaml
new file mode 100644
index 0000000000..8fb4bdfc68
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-hal-auto.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-hal-auto" %}
+{% set testname = "vts-hal-auto" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-keymaster.yaml b/android-lcr/lava-job-definitions/definitions/vts-keymaster.yaml
new file mode 100644
index 0000000000..f348845af3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-keymaster.yaml
@@ -0,0 +1,7 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% block priority %}75{% endblock priority %}
+{% set testcommand = "vts-hal --module VtsHalKeymasterV3_0Target" %}
+{% set testname = "vts-hal-keymaster" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-kmgk.yaml b/android-lcr/lava-job-definitions/definitions/vts-kmgk.yaml
new file mode 100644
index 0000000000..e7f5cd84ba
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-kmgk.yaml
@@ -0,0 +1,7 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% block priority %}75{% endblock priority %}
+{% set testcommand = "vts-hal --module KMGK_gtest" %}
+{% set testname = "vts-hal-kmgk" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-part1.yaml b/android-lcr/lava-job-definitions/definitions/vts-part1.yaml
new file mode 100644
index 0000000000..b5a8497420
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-part1.yaml
@@ -0,0 +1,6 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-kernel --exclude-filter VtsKernelLinuxKselftest --exclude-filter VtsKernelLtp --exclude-filter VtsKernelNetTest" %}
+{% set testname = "vts-kernel-part1" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-part2.yaml b/android-lcr/lava-job-definitions/definitions/vts-part2.yaml
new file mode 100644
index 0000000000..4d6fe0f579
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-part2.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-kernel --module VtsKernelLinuxKselftest" %}
+{% set testname = "vts-kernel-kselftest" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-part3.yaml b/android-lcr/lava-job-definitions/definitions/vts-part3.yaml
new file mode 100644
index 0000000000..b0e251df8a
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-part3.yaml
@@ -0,0 +1,6 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-kernel --module VtsKernelLtp" %}
+{% set testname = "vts-kernel-ltp" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-part4.yaml b/android-lcr/lava-job-definitions/definitions/vts-part4.yaml
new file mode 100644
index 0000000000..6e89915997
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-part4.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-library" %}
+{% set testname = "vts-library" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-part5.yaml b/android-lcr/lava-job-definitions/definitions/vts-part5.yaml
new file mode 100644
index 0000000000..6ee21b43dd
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-part5.yaml
@@ -0,0 +1,5 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-performance" %}
+{% set testname = "vts-performance" %}
diff --git a/android-lcr/lava-job-definitions/definitions/vts-part6.yaml b/android-lcr/lava-job-definitions/definitions/vts-part6.yaml
new file mode 100644
index 0000000000..2adc9ba4dd
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/vts-part6.yaml
@@ -0,0 +1,6 @@
+{% extends "master/template-vts.yaml.jinja2" %}
+
+{% set job_timeout = 300 %}
+{% set testcommand = "vts-hal" %}
+{% set testname = "vts-hal" %}
+{% set testrebootexpected = "true" %}
diff --git a/android-lcr/lava-job-definitions/definitions/weekly.yaml b/android-lcr/lava-job-definitions/definitions/weekly.yaml
new file mode 100644
index 0000000000..f20c851fe0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/weekly.yaml
@@ -0,0 +1,42 @@
+{% extends device_type %}
+
+{% set job_timeout = 315 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-weekly{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/media-codecs-functional-tests/media-codecs-functional-tests.yaml
+          name: media-codecs
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-gles2/piglit-gles2.yaml
+          name: piglit-gles2
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-gles3/piglit-gles3.yaml
+          name: piglit-gles3
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-glslparser/piglit-glslparser.yaml
+          name: piglit-glslparser
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/piglit-shader-runner/piglit-shader-runner.yaml
+          name: piglit-shader-runner
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/stringbench/stringbench.yaml
+          name: stringbench
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/libc-bench/libc-bench.yaml
+          name: libc-bench
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/definitions/xtest-lmg.yaml b/android-lcr/lava-job-definitions/definitions/xtest-lmg.yaml
new file mode 100644
index 0000000000..00b6451bb4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/definitions/xtest-lmg.yaml
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% set job_timeout = 90 %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-optee-xtest{% endblock job_name %}
+{% block priority %}75{% endblock priority %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/optee/optee-xtest.yaml
+          name: optee-xtest
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/am65x b/android-lcr/lava-job-definitions/devices/am65x
new file mode 100644
index 0000000000..cf20b8ac9b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/am65x
@@ -0,0 +1,28 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}am6{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      boot:
+        url: {{DOWNLOAD_URL}}/boot_fit.img
+      userdata:
+        url: {{ANDROID_DATA}}
+      system:
+        url: {{ANDROID_SYSTEM}}
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/am65x-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/am65x-boot b/android-lcr/lava-job-definitions/devices/am65x-boot
new file mode 100644
index 0000000000..07f2d3c8fb
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/am65x-boot
@@ -0,0 +1,8 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey b/android-lcr/lava-job-definitions/devices/hi6220-hikey
new file mode 100644
index 0000000000..ad256f70cf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey
@@ -0,0 +1,24 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}hi6220-hikey-r2{% endblock %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+{% if ANDROID_VERSION_SUFFIX is defined %}
+{% include "devices/hi6220-hikey-deploy-" + ANDROID_VERSION_SUFFIX %}
+{% else %}
+{% include "devices/hi6220-hikey-deploy" %}
+{% endif %}
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/hi6220-hikey-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl
new file mode 100644
index 0000000000..22e296102a
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl
@@ -0,0 +1,56 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}hi6220-hikey-bl{% endblock %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block actions %}
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - zip
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2701
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r27.0.1-linux.zip'
+
+{% include "devices/hi6220-hikey-bl-deploy" %}
+{% include "devices/hi6220-hikey-bl-boot" %}
+
+{% include "devices/hi6220-hikey-bl-deploy-fastboot" %}
+{% include "devices/hi6220-hikey-boot" %}
+
+{% block test_target %}
+{% endblock test_target %}
+
+{% include "devices/hi6220-hikey-bl-deploy" %}
+
+{% endblock actions %}
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-boot b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-boot
new file mode 100644
index 0000000000..8358d25fd0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-boot
@@ -0,0 +1,6 @@
+- boot:
+    namespace: recovery
+    timeout:
+      minutes: 5
+    method: recovery
+    commands: exit
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-deploy b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-deploy
new file mode 100644
index 0000000000..1f30fae0f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-deploy
@@ -0,0 +1,20 @@
+- deploy:
+    timeout:
+      minutes: 10
+    to: recovery
+    namespace: recovery
+    connection: lxc
+    images:
+      script:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/hikey/release/hisi-idt.py
+      recovery:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/hikey/release/recovery.bin
+      loader:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/hikey/release/l-loader.bin
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/hikey/release/ptable-linux-8g.img
+      fastboot:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/hikey/release/fip.bin
+      nvme:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/70/hikey/release/nvme.img
+    os: debian
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-deploy-fastboot b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-deploy-fastboot
new file mode 100644
index 0000000000..dbb1b7ce14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-bl-deploy-fastboot
@@ -0,0 +1,36 @@
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      ptable:
+        url: {{DOWNLOAD_URL}}/ptable-aosp-8g.img.xz
+        compression: xz
+        reboot: hard-reset
+      boot:
+        reboot: hard-reset
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{DOWNLOAD_URL}}/userdata.img.xz
+        compression: xz
+      system:
+        url: {{DOWNLOAD_URL}}/system.img.xz
+        compression: xz
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img.xz
+        compression: xz
+      nvme:
+        url: {{DOWNLOAD_URL}}/nvme.img.xz
+        compression: xz
+      fastboot:
+        url: {{DOWNLOAD_URL}}/fip.bin.xz
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-boot b/android-lcr/lava-job-definitions/devices/hi6220-hikey-boot
new file mode 100644
index 0000000000..ae95f04980
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-boot
@@ -0,0 +1,10 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-deploy b/android-lcr/lava-job-definitions/devices/hi6220-hikey-deploy
new file mode 100644
index 0000000000..be3d99a5b3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-deploy
@@ -0,0 +1,29 @@
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        reboot: hard-reset
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      cache:
+        url: {{ANDROID_CACHE}}
+        compression: xz
+      userdata:
+        url: {{ANDROID_DATA}}
+        compression: xz
+      system:
+        url: {{ANDROID_SYSTEM}}
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
diff --git a/android-lcr/lava-job-definitions/devices/hi6220-hikey-deploy-master b/android-lcr/lava-job-definitions/devices/hi6220-hikey-deploy-master
new file mode 100644
index 0000000000..d505cea7c0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi6220-hikey-deploy-master
@@ -0,0 +1,29 @@
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        reboot: hard-reset
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{ANDROID_DATA}}
+        compression: xz
+      system:
+        url: {{ANDROID_SYSTEM}}
+        compression: xz
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img.xz
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
diff --git a/android-lcr/lava-job-definitions/devices/hi960-hikey b/android-lcr/lava-job-definitions/devices/hi960-hikey
new file mode 100644
index 0000000000..97abb23845
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi960-hikey
@@ -0,0 +1,20 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}hi960-hikey{% endblock %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+{% include "devices/hi960-hikey-deploy" %}
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/hi960-hikey-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/hi960-hikey-boot b/android-lcr/lava-job-definitions/devices/hi960-hikey-boot
new file mode 100644
index 0000000000..8f8cc064b6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi960-hikey-boot
@@ -0,0 +1,10 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
diff --git a/android-lcr/lava-job-definitions/devices/hi960-hikey-deploy b/android-lcr/lava-job-definitions/devices/hi960-hikey-deploy
new file mode 100644
index 0000000000..134f952969
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/hi960-hikey-deploy
@@ -0,0 +1,28 @@
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      boot:
+        reboot: hard-reset
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      dts:
+        url: {{DOWNLOAD_URL}}/dt.img
+      userdata:
+        url: {{ANDROID_DATA}}
+        compression: xz
+      system:
+        url: {{ANDROID_SYSTEM}}
+        compression: xz
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img.xz
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
diff --git a/android-lcr/lava-job-definitions/devices/x15 b/android-lcr/lava-job-definitions/devices/x15
new file mode 100644
index 0000000000..16f5d083c3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/x15
@@ -0,0 +1,34 @@
+{% extends "lcr.jinja2" %}
+
+{% block device_type %}x15{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      boot_a:
+        url: {{DOWNLOAD_URL}}/boot.img
+      boot_b:
+        url: {{DOWNLOAD_URL}}/boot.img
+      vbmeta_a:
+        url: {{DOWNLOAD_URL}}/vbmeta.img
+      vbmeta_b:
+        url: {{DOWNLOAD_URL}}/vbmeta.img
+      userdata:
+        url: {{DOWNLOAD_URL}}/userdata.img
+      super:
+        url: {{DOWNLOAD_URL}}/super.img
+      recovery:
+        url: {{DOWNLOAD_URL}}/recovery.img
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/x15-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/devices/x15-boot b/android-lcr/lava-job-definitions/devices/x15-boot
new file mode 100644
index 0000000000..3c52fbe824
--- /dev/null
+++ b/android-lcr/lava-job-definitions/devices/x15-boot
@@ -0,0 +1,17 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'am57xevm:/'
+    - 'console:/'
+    timeout:
+      minutes: 15
+{% if X15_BOOT_ARGS is defined %}
+    commands:
+    - setenv bootargs "{{X15_BOOT_ARGS}}"
+    - run findfdt
+    - run emmc_android_boot
+    method: u-boot
+{% else %}
+    method: fastboot
+{% endif %}
diff --git a/android-lcr/lava-job-definitions/lcr.jinja2 b/android-lcr/lava-job-definitions/lcr.jinja2
new file mode 100644
index 0000000000..9f73e36314
--- /dev/null
+++ b/android-lcr/lava-job-definitions/lcr.jinja2
@@ -0,0 +1,83 @@
+{% extends "master.jinja2" %}
+
+{% block global_settings %}
+context:
+  test_character_delay: 10
+
+timeouts:
+  job:
+    minutes: {% if job_timeout is defined %}{{ job_timeout }}{% else %}90{% endif %}
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+{% endblock global_settings %}
+
+{% block priority %}{{LAVA_JOB_PRIORITY}}{% endblock priority %}
+{% block visibility %}
+visibility:
+  group:
+      - lkft
+{% endblock visibility %}
+
+{% block metadata %}
+  android.build: {{ANDROID_META_BUILD}}
+  android.name: {{ANDROID_META_NAME}}
+  android.url: {{ANDROID_META_URL}}
+  android.fastboot: "platform-tools_r27.0.1"
+{% endblock metadata %}
+
+{% block protocols %}
+protocols:
+  lava-lxc:
+    name: lxc-target
+    template: ubuntu
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+{% endblock protocols %}
+
+{% block actions %}
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - zip
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2701
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r27.0.1-linux.zip'
+
+{% block deploy_target %}
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
+
+{% endblock actions %}
diff --git a/android-lcr/lava-job-definitions/master.jinja2 b/android-lcr/lava-job-definitions/master.jinja2
new file mode 100644
index 0000000000..e4962061aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master.jinja2
@@ -0,0 +1,24 @@
+{% block global_settings %}
+{% endblock global_settings %}
+
+device_type: {% block device_type %}{% endblock %}
+job_name: {% block job_name %}{% endblock %}
+priority: {% block priority %}{% endblock %}
+{% block visibility %}
+{% endblock %}
+
+{% block secrets %}
+secrets:
+  ARTIFACTORIAL_TOKEN: "{{ARTIFACTORIAL_TOKEN}}"
+{% endblock %}
+
+metadata:
+{% block metadata %}
+{% endblock metadata %}
+
+{% block protocols %}
+{% endblock protocols %}
+
+actions:
+{% block actions %}
+{% endblock actions %}
diff --git a/android-lcr/lava-job-definitions/master/template-apk-automation.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-apk-automation.yaml.jinja2
new file mode 100644
index 0000000000..3e74bfb84b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-apk-automation.yaml.jinja2
@@ -0,0 +1,30 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+{% if DEVICE_TYPE == 'hi6220-hikey' %}
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/adb-join-wifi/adb-join-wifi.yaml
+          name: adb-join-wifi
+{% endif %}
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/apk-automation/apk-automation.yaml
+          name: {{testname}}
+          params:
+            TEST_NAME: {{testname}}
+{% if loopcount is defined %}
+            LOOPS: {{loopcount}}
+{% else %}
+            LOOPS: 5
+{% endif %}
+
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/master/template-cts-module.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-cts-module.yaml.jinja2
new file mode 100644
index 0000000000..579e8f1775
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-cts-module.yaml.jinja2
@@ -0,0 +1,27 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}-abi-all{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts {{testcommand}} --disable-reboot --skip-preconditions --skip-device-info"
+{% if CTS_PKG_URL is defined %}
+        TEST_URL: "{{CTS_PKG_URL}}"
+{% else %}
+        TEST_URL: "http://testdata.linaro.org/cts/18.06/android-cts-8.1_r6-linux_x86-arm-linaro.zip"
+{% endif %}
+{% if ANDROID_VERSION_SUFFIX is defined and ANDROID_VERSION_SUFFIX == 'master' %}
+        ANDROID_VERSION: "aosp-master"
+{% endif %}
+        FAILURES_PRINTED: "300"
+      name: {{testname}}-abi-all
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2
new file mode 100644
index 0000000000..87bc317ebc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-cts.yaml.jinja2
@@ -0,0 +1,27 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}-{{abi}}{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "{{testname}} --abi {{abi}} --disable-reboot --skip-preconditions --skip-device-info"
+{% if CTS_PKG_URL is defined %}
+        TEST_URL: "{{CTS_PKG_URL}}"
+{% else %}
+        TEST_URL: "http://testdata.linaro.org/cts/18.06/android-cts-8.1_r6-linux_x86-arm-linaro.zip"
+{% endif %}
+{% if ANDROID_VERSION_SUFFIX is defined and ANDROID_VERSION_SUFFIX == 'master' %}
+        ANDROID_VERSION: "aosp-master"
+{% endif %}
+        FAILURES_PRINTED: "300"
+      name: {{testname}}-{{abi}}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2 b/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2
new file mode 100644
index 0000000000..5d54d9ce9a
--- /dev/null
+++ b/android-lcr/lava-job-definitions/master/template-vts.yaml.jinja2
@@ -0,0 +1,30 @@
+{% extends device_type %}
+
+{% block job_name %}{{JOB_NAME}}-{{ANDROID_META_BUILD}}-{{testname}}{% endblock job_name %}
+
+{% block test_target %}
+{{ super() }}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}300{% endif %}
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+{% if VTS_PKG_URL is defined %}
+        TEST_URL: "{{VTS_PKG_URL}}"
+{% else %}
+        TEST_URL: "http://testdata.linaro.org/vts/oreo-mr1-vts-release-06262018/android-vts.zip"
+{% endif %}
+{% if ANDROID_VERSION_SUFFIX is defined and ANDROID_VERSION_SUFFIX == 'master' %}
+        ANDROID_VERSION: "aosp-master"
+{% endif %}
+        TEST_PARAMS: "{{testcommand}} --skip-device-info"
+        TEST_PATH: "android-vts"
+{% if testrebootexpected is defined %}
+        TEST_REBOOT_EXPECTED: "{{testrebootexpected}}"
+{% endif %}
+      name: {{testname}}
+{% endblock test_target %}
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_change_am65x-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/basic.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_am65x/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_am65x/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_am65x/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-auto/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-auto/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey-bl/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey-bl/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey-bl/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/basic.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-hikey/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/basic.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi6220-p/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_hi6220-p/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi6220-p/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey-auto/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/basic.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_hi960-hikey/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_hi960-hikey/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey-bl b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey-bl
new file mode 120000
index 0000000000..c4b1b363c3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey-bl
@@ -0,0 +1 @@
+plan_change_swg_hi6220-hikey
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/cts-module-keystore-abi-all.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/cts-module-keystore-abi-all.yaml
new file mode 120000
index 0000000000..18a7ab3e71
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/cts-module-keystore-abi-all.yaml
@@ -0,0 +1 @@
+../definitions/cts-module-keystore-abi-all.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/gtest-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/gtest-gatekeeper-keymaster.yaml
new file mode 120000
index 0000000000..009701cace
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/gtest-gatekeeper-keymaster.yaml
@@ -0,0 +1 @@
+../definitions/gtest-gatekeeper-keymaster.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/gtest-kmgk.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/gtest-kmgk.yaml
new file mode 120000
index 0000000000..e997df00ef
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/gtest-kmgk.yaml
@@ -0,0 +1 @@
+../definitions/gtest-kmgk.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml
new file mode 120000
index 0000000000..06272b396f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-gatekeeper-keymaster.yaml
@@ -0,0 +1 @@
+../definitions/vts-gatekeeper-keymaster.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-kmgk.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-kmgk.yaml
new file mode 120000
index 0000000000..e2e1230da4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/vts-kmgk.yaml
@@ -0,0 +1 @@
+../definitions/vts-kmgk.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi6220-hikey/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_swg_hi960-hikey/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_change_swg_hi960-hikey/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_swg_hi960-hikey/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto-master/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto-master/basic.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto-master/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto-master/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto-master/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto-master/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto-master/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_change_x15-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-master/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_x15-master/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-master/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-master/basic.yaml b/android-lcr/lava-job-definitions/plan_change_x15-master/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-master/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-master/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_x15-master/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-master/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15-master/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_x15-master/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15-master/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15/antutu6.yaml b/android-lcr/lava-job-definitions/plan_change_x15/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15/basic.yaml b/android-lcr/lava-job-definitions/plan_change_x15/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15/boottime.yaml b/android-lcr/lava-job-definitions/plan_change_x15/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_x15/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_change_x15/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_change_x15/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_change_x15/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_change_x15/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x-auto/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_am65x/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_am65x/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_am65x/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-auto/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey-bl/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey-bl/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey-bl/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/geekbench3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/geekbench3.yaml
new file mode 120000
index 0000000000..ef1d3a829d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/geekbench3.yaml
@@ -0,0 +1 @@
+../definitions/geekbench3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-hikey/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi6220-p/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey-auto/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused1-v8a.yaml
new file mode 120000
index 0000000000..8559cd74d8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused2-v8a.yaml
new file mode 120000
index 0000000000..c858f83b9e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-focused2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media-v8a.yaml
new file mode 120000
index 0000000000..94a0ad34f7
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media2-v8a.yaml
new file mode 120000
index 0000000000..91afe7cb95
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-media2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-opengl-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-opengl-v8a.yaml
new file mode 120000
index 0000000000..dccac81c14
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-opengl-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part1-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part1-v8a.yaml
new file mode 120000
index 0000000000..5d025854a0
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part1-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part2-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part2-v8a.yaml
new file mode 120000
index 0000000000..5d8737f8b4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part2-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part3-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part3-v8a.yaml
new file mode 120000
index 0000000000..d5cb87f73c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part3-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part4-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part4-v8a.yaml
new file mode 120000
index 0000000000..b9362f3fd8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part4-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part5-v8a.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part5-v8a.yaml
new file mode 120000
index 0000000000..4da33e2ef8
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/cts-part5-v8a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v8a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/xtest-lmg.yaml b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/xtest-lmg.yaml
new file mode 120000
index 0000000000..b68fa8e841
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_hi960-hikey/xtest-lmg.yaml
@@ -0,0 +1 @@
+../definitions/xtest-lmg.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey
new file mode 120000
index 0000000000..c4b1b363c3
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey
@@ -0,0 +1 @@
+plan_change_swg_hi6220-hikey
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey-bl b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey-bl
new file mode 120000
index 0000000000..427bb968ac
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_swg_hi6220-hikey-bl
@@ -0,0 +1 @@
+plan_change_swg_hi6220-hikey-bl
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_swg_hi960-hikey b/android-lcr/lava-job-definitions/plan_weekly_swg_hi960-hikey
new file mode 120000
index 0000000000..48d414e5f5
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_swg_hi960-hikey
@@ -0,0 +1 @@
+plan_change_swg_hi960-hikey
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cts-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cts-v7a.yaml
new file mode 120000
index 0000000000..773b5e2b65
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/cts-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto-master/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-CtsCarTestCases.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-CtsCarTestCases.yaml
new file mode 120000
index 0000000000..cbbad4e7aa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-CtsCarTestCases.yaml
@@ -0,0 +1 @@
+../definitions/cts-CtsCarTestCases.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-hal-auto.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-hal-auto.yaml
new file mode 120000
index 0000000000..8cc5920d3f
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-hal-auto.yaml
@@ -0,0 +1 @@
+../definitions/vts-hal-auto.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-auto/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-auto/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/cts-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/cts-v7a.yaml
new file mode 120000
index 0000000000..773b5e2b65
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/cts-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15-master/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15-master/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15-master/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/andebenchpro2015.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/andebenchpro2015.yaml
new file mode 120000
index 0000000000..1229c06395
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/andebenchpro2015.yaml
@@ -0,0 +1 @@
+../definitions/andebenchpro2015.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/antutu6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/antutu6.yaml
new file mode 120000
index 0000000000..644d91912e
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/antutu6.yaml
@@ -0,0 +1 @@
+../definitions/antutu6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/basic.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/basic.yaml
new file mode 120000
index 0000000000..807b51b3ce
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/basic.yaml
@@ -0,0 +1 @@
+../definitions/basic.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/benchmarkpi.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/benchmarkpi.yaml
new file mode 120000
index 0000000000..66e3b5d190
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/benchmarkpi.yaml
@@ -0,0 +1 @@
+../definitions/benchmarkpi.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/boottime.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/boottime.yaml
new file mode 120000
index 0000000000..301e56303b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/boottime.yaml
@@ -0,0 +1 @@
+../definitions/boottime.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/caffeinemark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/caffeinemark.yaml
new file mode 120000
index 0000000000..42d4b0ac3c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/caffeinemark.yaml
@@ -0,0 +1 @@
+../definitions/caffeinemark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cf-bench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cf-bench.yaml
new file mode 120000
index 0000000000..e57ff8377c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cf-bench.yaml
@@ -0,0 +1 @@
+../definitions/cf-bench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-focused1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-focused1-v7a.yaml
new file mode 120000
index 0000000000..e77bc086f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-focused1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-focused2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-focused2-v7a.yaml
new file mode 120000
index 0000000000..3688f5346b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-focused2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-focused2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-media-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-media-v7a.yaml
new file mode 120000
index 0000000000..78654c9948
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-media-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-media2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-media2-v7a.yaml
new file mode 120000
index 0000000000..31ea7fda49
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-media2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-media2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-opengl-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-opengl-v7a.yaml
new file mode 120000
index 0000000000..eff09e1271
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-opengl-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-opengl-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part1-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part1-v7a.yaml
new file mode 120000
index 0000000000..2fe2c0c5d6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part1-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part1-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part2-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part2-v7a.yaml
new file mode 120000
index 0000000000..d0db2e0611
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part2-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part2-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part3-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part3-v7a.yaml
new file mode 120000
index 0000000000..7753e2d0bf
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part3-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part3-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part4-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part4-v7a.yaml
new file mode 120000
index 0000000000..69f6afc274
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part4-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part4-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part5-v7a.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part5-v7a.yaml
new file mode 120000
index 0000000000..1bb25f192c
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/cts-part5-v7a.yaml
@@ -0,0 +1 @@
+../definitions/cts-part5-v7a.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/gearses2eclair.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/gearses2eclair.yaml
new file mode 120000
index 0000000000..e71a4ccaf2
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/gearses2eclair.yaml
@@ -0,0 +1 @@
+../definitions/gearses2eclair.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/geekbench4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/geekbench4.yaml
new file mode 120000
index 0000000000..d2fcfc9c09
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/geekbench4.yaml
@@ -0,0 +1 @@
+../definitions/geekbench4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/glbenchmark25.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/glbenchmark25.yaml
new file mode 120000
index 0000000000..862dc229e9
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/glbenchmark25.yaml
@@ -0,0 +1 @@
+../definitions/glbenchmark25.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/javawhetstone.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/javawhetstone.yaml
new file mode 120000
index 0000000000..72abd1c48b
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/javawhetstone.yaml
@@ -0,0 +1 @@
+../definitions/javawhetstone.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/jbench.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/jbench.yaml
new file mode 120000
index 0000000000..2af4b35311
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/jbench.yaml
@@ -0,0 +1 @@
+../definitions/jbench.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/linpack.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/linpack.yaml
new file mode 120000
index 0000000000..290828eb74
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/linpack.yaml
@@ -0,0 +1 @@
+../definitions/linpack.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/monkey.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/monkey.yaml
new file mode 120000
index 0000000000..cf21ee5916
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/monkey.yaml
@@ -0,0 +1 @@
+../definitions/monkey.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/quadrantpro.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/quadrantpro.yaml
new file mode 120000
index 0000000000..87f8094723
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/quadrantpro.yaml
@@ -0,0 +1 @@
+../definitions/quadrantpro.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/rl-sqlite.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/rl-sqlite.yaml
new file mode 120000
index 0000000000..280e391c26
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/rl-sqlite.yaml
@@ -0,0 +1 @@
+../definitions/rl-sqlite.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/scimark.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/scimark.yaml
new file mode 120000
index 0000000000..8b48f7ddb6
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/scimark.yaml
@@ -0,0 +1 @@
+../definitions/scimark.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vellamo3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vellamo3.yaml
new file mode 120000
index 0000000000..762515befa
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vellamo3.yaml
@@ -0,0 +1 @@
+../definitions/vellamo3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part1.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part1.yaml
new file mode 120000
index 0000000000..8852ec28d1
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part1.yaml
@@ -0,0 +1 @@
+../definitions/vts-part1.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part2.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part2.yaml
new file mode 120000
index 0000000000..4412b556f4
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part2.yaml
@@ -0,0 +1 @@
+../definitions/vts-part2.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part3.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part3.yaml
new file mode 120000
index 0000000000..947ad849df
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part3.yaml
@@ -0,0 +1 @@
+../definitions/vts-part3.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part4.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part4.yaml
new file mode 120000
index 0000000000..6abd9fa4bc
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part4.yaml
@@ -0,0 +1 @@
+../definitions/vts-part4.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part5.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part5.yaml
new file mode 120000
index 0000000000..9f85fe138d
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part5.yaml
@@ -0,0 +1 @@
+../definitions/vts-part5.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part6.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part6.yaml
new file mode 120000
index 0000000000..3239edf334
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/vts-part6.yaml
@@ -0,0 +1 @@
+../definitions/vts-part6.yaml
\ No newline at end of file
diff --git a/android-lcr/lava-job-definitions/plan_weekly_x15/weekly.yaml b/android-lcr/lava-job-definitions/plan_weekly_x15/weekly.yaml
new file mode 120000
index 0000000000..f37d422195
--- /dev/null
+++ b/android-lcr/lava-job-definitions/plan_weekly_x15/weekly.yaml
@@ -0,0 +1 @@
+../definitions/weekly.yaml
\ No newline at end of file
diff --git a/android-lcr/x15/builders-v2-jinja2.yaml.inc b/android-lcr/x15/builders-v2-jinja2.yaml.inc
new file mode 100644
index 0000000000..9036aaa6e9
--- /dev/null
+++ b/android-lcr/x15/builders-v2-jinja2.yaml.inc
@@ -0,0 +1,15 @@
+        - shell:
+            !include-raw:
+                - android-lcr/common/builders.sh
+                - android-lcr/x15/builders-v2.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - shell:
+            !include-raw:
+                - android-lcr/common/submit_for_testing.sh
diff --git a/android-lcr/x15/builders-v2-premerge-ci.yaml.inc b/android-lcr/x15/builders-v2-premerge-ci.yaml.inc
deleted file mode 100644
index 76f804baa8..0000000000
--- a/android-lcr/x15/builders-v2-premerge-ci.yaml.inc
+++ /dev/null
@@ -1,38 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/x15/builders-v2.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-boottime.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-focused1-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-focused2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-benchmarkpi.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-lcr/x15/builders-v2.sh b/android-lcr/x15/builders-v2.sh
index 5997268a94..917429b011 100755
--- a/android-lcr/x15/builders-v2.sh
+++ b/android-lcr/x15/builders-v2.sh
@@ -7,7 +7,7 @@ if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
 fi
 
 # Clean android-patchsets and repositories in device
-rm -rf build/out build/android-patchsets build/device
+rm -rf build/out build/android-patchsets build/device build/build-info
 mkdir -p build
 
 # Build Android
@@ -16,6 +16,16 @@ cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${
 
 if [[ ${JOB_NAME} == "android-lcr-member-x15-n" || ${JOB_NAME} == "android-lcr-member-x15-n-premerge-ci" ]]; then
   wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/x15/build-info/template.txt -O build/out/BUILD-INFO.txt
+else
+  rm -rf build/out/BUILD-INFO.txt
+  wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O build/out/BUILD-INFO.txt
+fi
+
+if [[ ${JOB_NAME} == "lkft-x15-android-8.1-4.14" ]]; then
+    # export KERNEL_DESCRIBE variant for lkft-x15-android-8.1-4.14.yaml build
+    cd build/kernel/ti/x15/
+    export KERNEL_DESCRIBE=$(git rev-parse --short HEAD)
+    cd -
 fi
 
 # Delete sources after build to save space
@@ -23,17 +33,27 @@ cd build
 rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
 cd -
 
+if [[ ${JOB_NAME} == "lkft-x15-android-8.1-4.14" ]]; then
 # Publish parameters
 cat << EOF > ${WORKSPACE}/publish_parameters
 PUB_SRC=${PWD}/build/out
 PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
 PUB_EXTRA_INC=^[^/]+[._](u-boot|dtb)$|MLO
 EOF
+else
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_SRC=${PWD}/build/out
+PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
+PUB_EXTRA_INC=^[^/]+[._](u-boot|dtb)$|MLO
+EOF
+fi
 
 PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
 # Construct post-build-lava parameters
 source build-configs/${BUILD_CONFIG_FILENAME}
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+SKIP_LAVA=${SKIP_LAVA}
 DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
 TARGET_PRODUCT=${TARGET_PRODUCT}
 MAKE_TARGETS=${MAKE_TARGETS}
@@ -46,4 +66,11 @@ FRONTEND_JOB_NAME=${JOB_NAME}
 DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
 CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template.yaml
 SKIP_REPORT=false
+CTS_PKG_URL=${CTS_PKG_URL}
+VTS_PKG_URL=${VTS_PKG_URL}
+X15_BOOT_ARGS=${X15_BOOT_ARGS}
+ANDROID_VERSION_SUFFIX=${ANDROID_VERSION_SUFFIX}
+KERNEL_DESCRIBE=${KERNEL_DESCRIBE}
+PLAN_CHANGE=${PLAN_CHANGE}
+PLAN_WEEKLY=${PLAN_WEEKLY}
 EOF
diff --git a/android-lcr/x15/builders-v2.yaml.inc b/android-lcr/x15/builders-v2.yaml.inc
deleted file mode 100644
index 6d1225cf0b..0000000000
--- a/android-lcr/x15/builders-v2.yaml.inc
+++ /dev/null
@@ -1,221 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/x15/builders-v2.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-boottime.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-monkey.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-focused1-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-focused2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-benchmarkpi.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cf-bench.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-gearses2eclair.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-geekbench3.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-javawhetstone.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-jbench.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-linpack.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-quadrantpro.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-scimark.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-rl-sqlite.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vellamo3.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-caffeinemark.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-antutu6.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            if [ -n "$GERRIT_PROJECT" ]; then
-                echo "SKIP_LAVA=1" >> ${WORKSPACE}/post_build_lava_parameters
-            fi
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-part1-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-part2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-part3-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-part4-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-part5-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-opengl-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-media2-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-cts-media-v7a.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vts-part1.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vts-part2.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vts-part3.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vts-part4.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vts-part5.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-vts-part6.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-andebenchpro2015.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-glbenchmark25.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15-v2/template-weekly.yaml#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-lcr/x15/builders.sh b/android-lcr/x15/builders.sh
deleted file mode 100755
index 763302aa9f..0000000000
--- a/android-lcr/x15/builders.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-# Early test
-
-if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-  echo "in android-build-configs.git"
-  exit 1
-fi
-
-# Clean android-patchsets and repositories in device
-rm -rf build/out build/android-patchsets build/device
-mkdir -p build
-
-# Build Android
-build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
-
-if [[ ${JOB_NAME} == "android-lcr-member-x15-n" || ${JOB_NAME} == "android-lcr-member-x15-n-premerge-ci" ]]; then
-  wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/x15/build-info/template.txt -O build/out/BUILD-INFO.txt
-fi
-
-# Delete sources after build to save space
-cd build
-rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
-cd -
-
-# Publish parameters
-cat << EOF > ${WORKSPACE}/publish_parameters
-PUB_SRC=${PWD}/build/out
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-PUB_EXTRA_INC=^[^/]+[._](u-boot|dtb)$|MLO
-EOF
-
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-# Construct post-build-lava parameters
-source build-configs/${BUILD_CONFIG_FILENAME}
-cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
-TARGET_PRODUCT=${TARGET_PRODUCT}
-MAKE_TARGETS=${MAKE_TARGETS}
-JOB_NAME=${JOB_NAME}
-BUILD_NUMBER=${BUILD_NUMBER}
-BUILD_URL=${BUILD_URL}
-LAVA_SERVER=validation.linaro.org/RPC2/
-IMAGE_EXTENSION=img
-FRONTEND_JOB_NAME=${JOB_NAME}
-DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
-CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template.json
-SKIP_REPORT=false
-EOF
diff --git a/android-lcr/x15/builders.yaml.inc b/android-lcr/x15/builders.yaml.inc
deleted file mode 100644
index aabf110067..0000000000
--- a/android-lcr/x15/builders.yaml.inc
+++ /dev/null
@@ -1,173 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/x15/builders.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-boottime.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-focused1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-focused2.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-benchmarkpi.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cf-bench.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-gearses2eclair.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-geekbench3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-javawhetstone.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-jbench.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-linpack.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-quadrantpro.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-scimark.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-rl-sqlite.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-vellamo3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-applications.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-caffeinemark.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-antutu6.0.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            if [ -n "$GERRIT_PROJECT" ]; then
-                echo "SKIP_LAVA=1" >> ${WORKSPACE}/post_build_lava_parameters
-            fi
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-part1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-part2.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-part3.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-part4.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-opengl.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-cts-media.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-andebenchpro2015.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-glbenchmark-2.5.1.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/x15/template-weekly.json#g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-lcr/x20/build-info/template.txt b/android-lcr/x20/build-info/template.txt
deleted file mode 100644
index 70769e861c..0000000000
--- a/android-lcr/x20/build-info/template.txt
+++ /dev/null
@@ -1,110 +0,0 @@
-Format-Version: 0.5
-
-Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz,  boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img,  userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.zip, *.sh,
-License-Type: protected
-Auth-Groups: lmg-member-only, team-qa-services, team-android-engineering
-
-Files-Pattern: system.img, system.img.xz
-License-Type: protected
-Auth-Groups: lmg-member-only, team-qa-services, team-android-engineering
-Theme: linaro
-License-Text: <strong>END USER LICENCE AGREEMENT FOR THE SOFTWARE PACKAGE (“Software”)</strong>
-<p>
-THIS END USER LICENCE AGREEMENT (“LICENCE”) IS A LEGAL AGREEMENT BETWEEN YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND MEDIATEK INC., ("MTK") FOR THE USE OF THE SOFTWARE ACCOMPANYING THIS LICENCE. MTK IS ONLY WILLING TO LICENSE THE SOFTWARE TO YOU ON CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS LICENCE. BY CLICKING “I AGREE” OR BY INSTALLING OR OTHERWISE USING OR COPYING THE SOFTWARE YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, MTK IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND YOU MAY NOT INSTALL, USE OR COPY THE SOFTWARE, AND YOU SHOULD PROMPTLY RETURN THE SOFTWARE TO YOUR SUPPLIER.
-</p>
-<p>
-“Applications” means applications for use solely in conjunction with MTK’s wireless communication platforms and/or products. 
-</p>
-<p>
-“Output” means data resulting from your use of the Software and all direct and indirect derivatives thereof. 
-</p>
-<p>
-“Software” means any software, firmware and data accompanying this Licence, any printed, electronic or online documentation supplied with it under the terms of this Licence for the Software. 
-</p>
-<p>
-<h2>
-1. LICENCE GRANTS TO YOU
-</h2>
-1.1 MTK hereby grants to you, subject to the terms and conditions of this Licence, a non-exclusive, non-transferable, non-sublicensable, revocable, royalty-free and limited license to: 
-1. use and copy the Software or certain components or optional functionality in the Software, as applicable, solely for the purposes of internally running, designing or developing Applications
-</p>
-<p>
-<h2>
-2. RESTRICTIONS ON USE OF THE SOFTWARE
-</h2>
-BENCHMARKING: This Licence does not prevent you from using the Software for benchmarking purposes. However, you shall ensure that any and all benchmarking data relating to the Software, and any other results of your use or testing of the Software which are indicative of its performance, efficacy, reliability or quality, shall not be used to disparage MTK, its products or services, or in a manner that, in MTK’s reasonable judgment, may diminish or otherwise damage the reputation of MTK.
-Except as specified in this License, you shall not: (i) modify or create any derivative works of the Software; (ii) decompile, disassemble, or reverse engineer the Software (iii) redistribute, encumber, sell, rent, lease, sublicense, or otherwise transfer rights to the Software except as set forth in this License; or (iv) remove or alter any trademark, logo, copyright or other proprietary notices, legends, symbols or labels in the Software. 
-COPYRIGHT AND RESERVATION OF RIGHTS: The Software is owned by MTK or its licensors and is protected by copyright and other intellectual property laws and international treaties. The Software is licensed not sold. You acquire no rights to the Software other than as expressly provided by this Licence. You shall not remove from the Software any copyright notice or other notice and shall ensure that any such notice is reproduced in any copies of the whole or any part of the Software made by you or other permitted users.
-</p>
-<p>
-REVERSE ENGINEERING: Except to the extent that such activity is permitted by applicable law you shall not reverse engineer, decompile or disassemble any of the Software. If the Software was provided to you in Europe you shall not reverse engineer, decompile or disassemble any of the Software for the purposes of error correction.
-</p>
-<p>
-RESTRICTED USE
-You agree that you shall not use the Software or the Output other than pursuant to and in accordance with the exercise of any of the licences granted under this Licence. Without limiting the generality of the foregoing, you shall not use the Software or any Output: (a) for determining if any features, functions or processes provided by the Software are covered by any patents or patent applications owned by you or a third party; or (b)  for developing technology, applications or products which avoid  any of MTK’s intellectual property in the Software licensed hereunder; or (c) as a reference for modifying existing patents or patent applications or creating any continuation, continuation in part, or extension of existing patents or patent applications.
-<h2>
-3. CONFIDENTIAL INFORMATION
-</h2>
-Confidential Information shall mean: (a) the Software; and (b) Information disclosed by MTK to you in any other manner that is identified as confidential at the time of disclosure and summarized and designated as confidential in a written memorandum delivered to you within thirty (30) days of the disclosure. 
-</p>
-<p>
-Confidential Information shall not include information which:  (a) is or becomes public knowledge through no fault of the recipient; (b) was in your possession before receipt from the party providing such Confidential Information; (c) is rightfully received by the receiving party from a third party without any duty of confidentiality; (d) is disclosed to a third party by MTK providing the Confidential Information without a duty of confidentiality on the third party; (e) is independently developed by you without reference of Confidential Information ; (f) is disclosed under operation of law; or (g) is disclosed with the prior written approval of MTK providing such Confidential Information.  
-</p>
-<p>
-MTK shall retain all Intellectual Property Rights in any Confidential Information disclosed to you.  You agree, both during the term of this License and for a period of three (3) years after termination or expiration of this License, to hold MTK's Confidential Information in confidence and to protect the disclosed Confidential Information by using the same degree of care to prevent the unauthorized use, dissemination or publication of the Confidential Information as they use to protect their own confidential information of a like nature, but no less than reasonable care.  You acknowledge that any disclosure, use or misappropriation of Confidential Information in violation of this License would cause MTK irreparable harm for which there may be no adequate remedy at law. Accordingly, you agree that MTK shall have the right to apply to any court of competent jurisdiction for injunctive relief and specific performance, without prejudice to any remedies otherwise available to MTK at law or in equity.
-</p>
-<p>
-<h2>
-4. SUPPORT
-</h2>
-MTK is not under an obligation to provide support, but it may do so at its own discretion, and if it does, it will only be in respect of the Software as delivered. 
-</p>
-<p>
-<h2>
-5. NO WARRANTIES
-</h2>
-YOU AGREE THAT THE SOFTWARE IS LICENSED “AS IS”, AND THAT MTK EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR OTHER TERMS, EXPRESS OR IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE.
-</p>
-<p>
-MTK SHALL NOT BE RESPONSIBLE FOR ANY SOFTWARE RELEASES MADE TO YOUR SPECIFICATION OR CONFORMING TO A PARTICULAR STANDARD OR OPEN FORUM. FURTHER, MTK DOES NOT REPRESENT OR WARRANT THAT ANY PORTION OF THE SOFTWARE IS FREE OF INACCURACIES, ERRORS, BUGS OR INTERRUPTIONS, OR IS RELIABLE, ACCURATE, COMPLETE, OR OTHERWISE VALID. YOUR USE OR OPERATION OF THE SOFTWARE IS AT YOUR OWN DISCRETION AND RISK.
-YOU HEREBY ACKNOWLEDGES THAT THE SOFTWARE PROVIDED UNDER THE LICENSE MIGHT INCLUDE SOFTWARE FROM ONE OR MORE THIRD PARTIES (E.G. OPEN SOURCE OR PROPRIETARY, COLLECTIVELY AS “THIRD PARTY SOFTWARE”) AND THE USE OF SUCH SHALL BE IN ACCORDANCE WITH THE TERMS AND CONDITIONS OF THE LICENSE UNLESS OTHERWISE SPECIFIED IN THE THIRD PARTY SOFTWARE LICENSE AGREEMENT ACCOMPANYING SUCH THIRD PARTY SOFTWARE. YOU EXPRESSLY ACKNOWLEDGE THAT IT YOUR SOLE RESPONSIBILITY TO OBTAIN FROM ANY THIRD PARTY ALL PROPER LICENSES CONTAINED IN THE SOFTWARE. NOTWITHSTANDING ANY WARRANTY SET FORTH UNDER THIS LICENSE TO THE CONTRARY, MTK HEREBY EXPRESSLY DISCLAIMS ANY AND ALL WARRANTIES, EXPRESS OR IMPLIED, TO THE EXTENT ALLOWED BY APPLICABLE LAWS, WITH RESPECT TO ANY THIRD PARTY SOFTWARE. 
-</p>
-<p>
-<h2>
-6. LIMITATION OF LIABILITY
-</h2>
-TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL MTK BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF PROFITS) ARISING OUT OF THE USE OR INABILITY TO USE THE SOFTWARE WHETHER BASED ON A CLAIM UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, EVEN IF MTK WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-</p>
-<p>
-NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, THE MAXIMUM LIABILITY OF MTK TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST MTK IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE SUBJECT MATTER OF THIS LICENCE SHALL NOT EXCEED (I) THE TOTAL OF SUMS PAID BY YOU TO MTK (IF ANY) FOR THIS LICENCE. THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT.
-</p>
-<p>
-<h2>
-7. EXPORT COMPLIANCE 
-</h2>
-YOU ACKNOWLEDGE THAT SOFTWARE MAY BE SUBJECT TO THE LAWS AND REGULATIONS OF RELATED JURISDICTIONS, INCLUDING U.K., EUROPEAN UNION, AND U.S. EXPORT CONTROL LAWS AND REGULATIONS, AND INCLUDING THE U.S. EXPORT ADMINISTRATION ACT AND ITS ASSOCIATED REGULATIONS, GOVERNING THE EXPORT, RE-EXPORT OR IMPORT OF CONTROL COMMODITIES. YOU SHALL NOT EXPORT, RE-EXPORT, IMPORT OR OTHERWISE SELL, TRANSFER, DIRECTLY OR INDIRECTLY, SOFTWARE OBTAINED HEREUNDER EXCEPT IN STRICT COMPLIANCE WITH ALL SUCH APPLICABLE LAWS AND REGULATIONS. YOU EXPRESSLY AGREE THAT SOFTWARE SHALL NOT BE DOWNLOADED OR OTHERWISE EXPORTED OR RE-EXPORTED INTO (OR TO A NATIONAL OR RESIDENT OF) ANY EMBARGOED COUNTRIES, NOR TO ANYONE ON RELATED DENIAL LISTS, INCLUDING BUT NOT LIMITED TO THE U.S. TREASURY DEPARTMENT’S LIST OF SPECIALLY DESIGNATED NATIONALS OR THE U.S. COMMERCE DEPARTMENT’S TABLE OF DENIAL ORDERS. YOU HEREBY REPRESENT AND WARRANT THAT IT IS NOT LOCATED IN, UNDER THE CONTROL OF, OR A NATIONAL OR RESIDENT OF, ANY SUCH COUNTRY, OR ON ANY SUCH LIST. WITHOUT LIMITING THE FOREGOING, YOU AGREE THAT SOFTWARE PROVIDED HEREUNDER SHALL NOT BE EXPORTED, RE-EXPORTED, OR TRANSFERRED BY YOU TO ANY END-USER ENGAGED IN ACTIVITIES, OR FOR ANY END-USE, DIRECTLY OR INDIRECTLY RELATED TO THE DESIGN, DEVELOPMENT, PRODUCTION, USE, OR STOCKPILING OF WEAPONS OF MASS DESTRUCTION (E.G., NUCLEAR, CHEMICAL, OR BIOLOGICAL WEAPONS, AND THE MISSILE TECHNOLOGY TO DELIVER THEM).
-</p>
-<p>
-<h2>
-8. U.S. GOVERNMENT END USERS
-</h2>
-US Government Restrictions: Use, duplication, reproduction, release, modification, disclosure or transfer of the Software is restricted in accordance with the terms of this Licence.     
-</p>
-<p>
-<h2>
-9. TERM AND TERMINATION
-</h2>
-This Licence shall remain in force until terminated by MTK.  Without prejudice to any of its other rights if you are in breach of any of the terms and conditions of this Licence then MTK may terminate this Licence immediately upon giving written notice to you or on thirty (30) days written notice without cause. MTK may terminate this Licence at any time. Upon termination of this Licence by MTK , you shall stop using the Software and destroy all copies of the Software in your possession, together with all documentation and related materials. The provisions of clauses 2, 3,  5, 6, 7, 8, 9 and 10  shall survive termination of this Licence.
-</p>
-<p>
-<h2>
-10. GENERAL
-</h2>
-This License is governed and interpreted in accordance with the laws of the Republic of China without regard to any conflict of laws provisions. Except where MTK agrees otherwise in: (i) a written contract signed by you and MTK; or (ii) a written contract provided by MTK and accepted by you, this is the only agreement between you and MTK relating to the Software and it may only be modified by written agreement between you and MTK. If any clause or sentence in this Licence is held by a court of law to be illegal or unenforceable the remaining provisions of this Licence shall not be affected thereby. The failure by MTK to enforce any of the provisions of this Licence, unless waived in writing, shall not constitute a waiver of MTK's rights to enforce such provision or any other provision of this Licence in the future.
-</p>
-<p>
-At MTK’s request, you agree to check your computers for installations of the Software and any other information requested by MTK relating to Software installation and to provide this information to MTK. You agree that auditors nominated by MTK may also perform such checking and reporting on behalf of MTK by prior appointment during your normal business hours on seven (7) days’ notice. MTK shall bear the auditors’ costs for that audit unless it reveals unlicensed usage in which case you shall promptly reimburse MTK for all reasonable costs and expenses, including professional fees, relating to such audit. Any information which is disclosed to MTK or such auditors during checking or audit shall be treated as your confidential information and shall only be used by MTK for licence management, compliance and enforcement purposes.
-</p>
-<p>
-You may not assign this License, in whole or in part, without MTK’s prior written consent, and any attempt to do so without such consent shall be void. MTK may assign this License without your consent. This License shall be binding upon and shall inure to the benefit of the parties hereto and their respective successors and permitted assigns. Any Change of Control event shall be deemed an assignment requiring MTK’s prior written consent under this License. Subject to the foregoing, all of the rights and obligations of you under this License will bind and inure to the benefit of your respective successors and permitted assigns. For the purpose of clarification, “Change of Control” means shall mean (i) a change in more than fifty percent (50%) in voting or common share ownership or change in actual control over board of directors’ decisions; or (ii) a sale of all or substantially all assets of a party. This License will not be construed as creating an agency, partnership, joint venture, fiduciary duty, or any other form of legal relationship between MTK and you, and you must not represent the existence of any such relationship, whether expressly, by implication or otherwise.
-</p>
diff --git a/android-lcr/x20/builders.sh b/android-lcr/x20/builders.sh
deleted file mode 100755
index 803b214a44..0000000000
--- a/android-lcr/x20/builders.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-# Early test
-if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-  echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-  echo "in android-build-configs.git"
-  exit 1
-fi
-
-# Clean android-patchsets and repositories in device
-rm -rf build/out build/android-patchsets build/device
-
-mkdir -p build/
-
-# Build Android
-build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
-
-cd build/out
-rm -f ramdisk.img
-for image in "boot.img" "system.img" "userdata.img" "cache.img"; do
-  echo "Compressing ${image}"
-  xz ${image}
-done
-cd -
-
-rm -rf build/out/BUILD-INFO.txt
-wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/x20/build-info/template.txt -O build/out/BUILD-INFO.txt
-
-# Publish parameters
-cat << EOF > ${WORKSPACE}/publish_parameters
-PUB_SRC=${PWD}/build/out
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-EOF
diff --git a/android-lcr/x20/builders.yaml.inc b/android-lcr/x20/builders.yaml.inc
deleted file mode 100644
index b012dd13ac..0000000000
--- a/android-lcr/x20/builders.yaml.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-lcr/x20/builders.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
diff --git a/android-lmg-vexpress-aosp-master.yaml b/android-lmg-vexpress-aosp-master.yaml
index e68ef8cb90..b5a009fd74 100644
--- a/android-lmg-vexpress-aosp-master.yaml
+++ b/android-lmg-vexpress-aosp-master.yaml
@@ -9,11 +9,11 @@
         - authorization:
             anonymous:
                 - job-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
-    disabled: false
-    node: docker-utopic-aosp
+    disabled: true
+    node: docker-xenial-aosp
     display-name: 'Versatile Express - AOSP Master LSK (Android)'
     concurrent: true
     wrappers:
@@ -31,7 +31,7 @@
             sudo add-apt-repository ppa:linaro-maintainers/tools
             sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
             sudo apt-get update
-            sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch linaro-image-tools
+            sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch
 
             mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
             curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
@@ -116,7 +116,7 @@
             artifacts: '*.xml'
             latest-only: true
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
diff --git a/android-master-clang.yaml b/android-master-clang.yaml
index bfb9610832..a88943bc9a 100644
--- a/android-master-clang.yaml
+++ b/android-master-clang.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -47,7 +47,7 @@
               block: true
     publishers:
         - email-ext:
-            recipients: 'minseong.kim@linaro.org,vishal.bhoj@linaro.org,daniel.diaz@linaro.org'
+            recipients: 'bernhard.rosenkranzer@linaro.org,vishal.bhoj@linaro.org,daniel.diaz@linaro.org'
             content-type: text
             body: |
                 Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
@@ -57,7 +57,7 @@
                 Errors:
                 ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
             unstable-on-warning: false
             fail-on-error: false
         - fingerprint:
diff --git a/android-master-clang/builders.sh b/android-master-clang/builders.sh
index 691d5a38c8..778c211e34 100755
--- a/android-master-clang/builders.sh
+++ b/android-master-clang/builders.sh
@@ -6,7 +6,7 @@ export PATH=$PATH:/home/buildslave/bin/
 
 # Install needed packages
 sudo apt-get -q=2 update
-sudo apt-get -q=2 install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync linaro-image-tools pxz gawk
+sudo apt-get -q=2 install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync pxz gawk
 
 wget -q \
   http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb
diff --git a/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml b/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml
index 2c088436dc..4d36e667fc 100644
--- a/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml
+++ b/android-master-clang/lava-job-definitions/boottime-android-master-clang.yaml
@@ -52,21 +52,12 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
 
 - deploy:
     timeout:
diff --git a/android-r-lcr-manifest.yaml b/android-r-lcr-manifest.yaml
index 617b04ab50..df624261d5 100644
--- a/android-r-lcr-manifest.yaml
+++ b/android-r-lcr-manifest.yaml
@@ -6,7 +6,7 @@
         - authorization:
             anonymous:
                 - job-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -25,8 +25,8 @@
             name: GERRIT_USER
             default: ''
             description: "Gerrit username to be used for pushing the tags to the git repository"
-    disabled: false
-    node: docker-utopic-aosp
+    disabled: true
+    node: docker-xenial-aosp
     display-name: 'Job to generate R-LCR Manifest'
     wrappers:
         - timestamps
@@ -61,7 +61,7 @@
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
             PUB_DEST=/android/${JOB_NAME}/${RELEASE_TAG}-${BUILD_NUMBER}
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --manifest \
               --link-latest \
diff --git a/android-rockpi-cuttlefish.yaml b/android-rockpi-cuttlefish.yaml
new file mode 100644
index 0000000000..245ea5fd6c
--- /dev/null
+++ b/android-rockpi-cuttlefish.yaml
@@ -0,0 +1,87 @@
+- job:
+    name: android-rockpi-cuttlefish
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 365
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: ANDROID_MANIFEST_URL
+            default: https://android.googlesource.com/platform/manifest
+        - string:
+            name: ANDROID_MANIFEST_BRANCH
+            default: master
+        - string:
+            name: UBOOT_MANIFEST_URL
+            default: https://android.googlesource.com/kernel/manifest/
+        - string:
+            name: UBOOT_MANIFEST_BRANCH
+            default: u-boot-mainline
+        - string:
+            name: KERNEL_MANIFEST_URL
+            default: https://android.googlesource.com/kernel/manifest/
+        - string:
+            name: KERNEL_MANIFEST_BRANCH
+            default: common-android14-5.15
+        - string:
+            name: REPO_PACKAGE_URL
+            default: https://salsa.debian.org/android-tools-team/repo.git
+        - string:
+            name: LOCAL_AOSP_CUTTLEFISH_GIT_URL
+            default: https://git.linaro.org/people/paul.liu/rockpi4cuttlefish/aosp/device/google/cuttlefish.git
+        - string:
+            name: LOCAL_AOSP_CUTTLEFISH_GIT_BRANCH
+            default: paulliu-local-patch
+        - string:
+            name: LOCAL_AOSP_KERNEL_TESTS_GIT_URL
+            default: https://git.linaro.org/people/paul.liu/rockpi4cuttlefish/aosp/kernel/tests.git
+        - string:
+            name: LOCAL_AOSP_KERNEL_TESTS_GIT_BRANCH
+            default: paulliu-local-patch
+        - string:
+            name: LOCAL_KERNEL_COMMON_GIT_URL
+            default: https://git.linaro.org/people/paul.liu/rockpi4cuttlefish/kernel/common.git
+        - string:
+            name: LOCAL_KERNEL_COMMON_GIT_BRANCH
+            default: paulliu-local-patch
+        - string:
+            name: LOCAL_UBOOTMAINLINE_UBOOT_GIT_URL
+            default: https://git.linaro.org/people/paul.liu/rockpi4cuttlefish/u-boot-mainline/u-boot.git
+        - string:
+            name: LOCAL_UBOOTMAINLINE_UBOOT_GIT_BRANCH
+            default: paulliu-local-patch
+        - string:
+            name: LUNCH_TARGET
+            default: aosp_cf_x86_64_phone-userdebug
+        - bool:
+            name: USE_DEBIAN_BACKPORTS
+            default: False
+        - string:
+            name: KERNEL_DIST
+            default: source
+            description: 'source, prebuilt, androidci, androidci-mainline'
+        - string:
+            name: UBOOT_DIST
+            default: source
+            description: 'source, prebuilt, androidci'
+    disabled: false
+    node: docker-bullseye-amd64
+    display-name: 'Android RockPi Cuttlefish Build'
+    concurrent: true
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+    builders:
+        !include: android-rockpi-cuttlefish/builders.yaml.inc
+    publishers:
+        !include: android-rockpi-cuttlefish/publishers.yaml.inc
diff --git a/android-rockpi-cuttlefish/builders.sh b/android-rockpi-cuttlefish/builders.sh
new file mode 100755
index 0000000000..c5c721ad79
--- /dev/null
+++ b/android-rockpi-cuttlefish/builders.sh
@@ -0,0 +1,159 @@
+#!/bin/bash
+
+# Setup environment variables for building Android cuttlefish rockpi
+export PATH=${PATH}:/sbin:/usr/sbin:${HOME}/bin
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+
+# Prepare for building the image
+echo Starting at `date -Iseconds`
+if [[ -d build/aosp ]]; then
+    cd build/aosp
+elif [[ -d aosp ]]; then
+    cd aosp
+fi
+
+mkdir -p ../output/host/image
+rm -f ../output/host/image/*
+
+source build/envsetup.sh
+lunch ${LUNCH_TARGET}
+
+wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/generic/build-info/public-template.txt -O ../pub/BUILD-INFO.txt
+
+# Build u-boot
+if [ x"${UBOOT_DIST}" = x"source" ]; then
+    pushd ../u-boot-mainline
+    ./tools/bazel run --jobs=1 --curses=no --color=no //u-boot:rockpi4_dist
+    popd
+fi
+
+# Build kernel
+if [ x"${KERNEL_DIST}" = x"source" ]; then
+    pushd ../kernel
+    ./tools/bazel run --curses=no --color=no //common:rockpi4_dist
+    popd
+fi
+
+# Build image
+if [ x"${UBOOT_DIST}" = x"prebuilt" -a x"${KERNEL_DIST}" = x"prebuilt" ]; then
+    ./device/google/cuttlefish/tools/create_base_image_arm.sh \
+	../output/host/image/test.img
+else
+    UBOOT_DIST_DIR="device/google/cuttlefish_prebuilts/bootloader/rockpi_aarch64"
+    KERNEL_DIST_DIR="device/google/cuttlefish_prebuilts/kernel/5.15-arm64-rockpi"
+    if [ x"${UBOOT_DIST}" = x"source" ]; then
+	UBOOT_DIST_DIR="../u-boot-mainline/out/u-boot-mainline/dist"
+    elif [ x"${UBOOT_DIST}" = x"androidci" ]; then
+	UBOOT_DIST_DIR="../u-boot-androidci"
+    fi
+
+    if [ x"${KERNEL_DIST}" = x"source" ]; then
+	KERNEL_DIST_DIR=$(echo ../kernel/out/rockpi4/dist)
+    elif [ x"${KERNEL_DIST}" = x"androidci" -o x"${KERNEL_DIST}" = x"androidci-mainline" ]; then
+	KERNEL_DIST_DIR="../kernel-androidci"
+    fi
+
+    ./device/google/cuttlefish/tools/create_base_image_arm.sh \
+	"${UBOOT_DIST_DIR}" "${KERNEL_DIST_DIR}" \
+	../output/host/image/test.img
+fi
+
+# Sanity Check
+
+SANITYCHECKTMPDIR=$(mktemp -d)
+
+## check if image exist.
+if [[ ! -e ../output/host/image/test.img ]]; then
+    echo "Check: Error: image is not generated. Failed."
+    exit 1
+fi
+
+## check image size. Should be at least 16MB.
+imagesize=$(stat -c %s "../output/host/image/test.img")
+if [[ ${imagesize} -lt 16777216 ]]; then
+    echo "Check: Error: image size too small. Failed."
+    exit 1
+fi
+
+## check if TPL is in the image. idbloader is put on sector 64. However
+## the header is encrypted. By offset 0x800 there is TPL, we can verify it.
+## TPL will start with "RK33" as magic number.
+dd if="../output/host/image/test.img" of="${SANITYCHECKTMPDIR}/tplrk33" \
+   bs=1 skip=34816 count=4
+echo -n "RK33" > "${SANITYCHECKTMPDIR}/rk33"
+if ! cmp -s "${SANITYCHECKTMPDIR}/tplrk33" "${SANITYCHECKTMPDIR}/rk33"; then
+    echo "Check: Error: didn't found TPL"
+    exit 1
+fi
+
+## check if U-boot.itb is in place located at sector 0x4000. Since it is
+## an itb file the magic number is "d00dfeed".
+dd if="../output/host/image/test.img" of="${SANITYCHECKTMPDIR}/uboothead" \
+   bs=1 skip=8388608 count=4
+printf '\xd0\x0d\xfe\xed' > "${SANITYCHECKTMPDIR}/d00dfeed"
+if ! cmp -s "${SANITYCHECKTMPDIR}/uboothead" "${SANITYCHECKTMPDIR}/d00dfeed"; then
+    echo "Check: Error: didn't found U-boot"
+    exit 1
+fi
+
+rm -rf "${SANITYCHECKTMPDIR}"
+
+# Generate simg
+image="../output/host/image/test-e.img"
+cp -f "../output/host/image/test.img" "${image}"
+rootfs_partition=7
+disksize=$(stat -c %s ${image})
+targetsize=$((14*1024*1024*1024))
+if [ ${disksize} -lt ${targetsize} ]; then
+    truncate -s "${targetsize}" "${image}"
+    sgdisk -e ${image}
+    sgdisk --delete=${rootfs_partition} ${image}
+    sgdisk --new=${rootfs_partition}:145M:0 --typecode=${rootfs_partition}:8305 --change-name=${rootfs_partition}:rootfs --attributes=${rootfs_partition}:set:2 ${image}
+    sgdisk -e ${image}
+    rootfs_partition_start=$(partx -g -o START -s -n "${rootfs_partition}" "${image}" | xargs)
+    rootfs_partition_end=$(partx -g -o END -s -n "${rootfs_partition}" "${image}" | xargs)
+    rootfs_partition_num_sectors=$((${rootfs_partition_end} - ${rootfs_partition_start} + 1))
+    rootfs_partition_offset=$((${rootfs_partition_start} * 512))
+    rootfs_partition_size=$((${rootfs_partition_num_sectors} * 512))
+    e2fsck -fy "${image}"?offset=${rootfs_partition_offset}
+    resize2fs "${image}"?offset=${rootfs_partition_offset} ${rootfs_partition_num_sectors}s
+    truncate -s "${targetsize}" "${image}"
+    sgdisk -e ${image}
+    e2fsck -fy "${image}"?offset=${rootfs_partition_offset}
+fi
+img2simg "${image}" ../output/host/image/test.simg
+rm -f "${image}"
+
+# Publish
+xz -9e ../output/host/image/test.img
+xz -9e ../output/host/image/test.simg
+
+if [[ -d ../pub ]]; then
+    cp ../output/host/image/test.img.xz ../pub/
+    cp ../output/host/image/test.simg.xz ../pub/
+else
+    echo "Didn't publish test.img.xz because publish directory is not exist."
+fi
+
+# Delete sources after build to save space
+if [[ -z "${KEEP_SOURCE_CODE}" ]]; then
+    rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* ../output
+    rm -fr .repo
+fi
+
+cd ..
+
+# need to convert '_' to '-'
+# otherwise, aosp_arm64-userdebug will be translated to '~aosp/arm64-userdebug'
+# when upload to snapshot.linaro.org via linaro-cp.py
+# like reported here:
+# https://ci.linaro.org/job/android-cts/20/console
+lunch_target_str=$(echo ${LUNCH_TARGET}|tr '_' '-')
+# Publish parameters
+if [[ -d ${WORKSPACE} ]]; then
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_SRC=${PWD}/pub
+PUB_DEST=/android/${JOB_NAME}/${lunch_target_str}/${BUILD_NUMBER}/${ANDROID_MANIFEST_BRANCH}
+PUB_EXTRA_INC=^[^/]+xz
+EOF
+fi
diff --git a/android-rockpi-cuttlefish/builders.yaml.inc b/android-rockpi-cuttlefish/builders.yaml.inc
new file mode 100644
index 0000000000..d2d8c78249
--- /dev/null
+++ b/android-rockpi-cuttlefish/builders.yaml.inc
@@ -0,0 +1,10 @@
+        - shell:
+            !include-raw:
+                - android-rockpi-cuttlefish/downloader.sh
+                - android-rockpi-cuttlefish/builders.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
diff --git a/android-rockpi-cuttlefish/downloader.sh b/android-rockpi-cuttlefish/downloader.sh
new file mode 100755
index 0000000000..80b1f25079
--- /dev/null
+++ b/android-rockpi-cuttlefish/downloader.sh
@@ -0,0 +1,211 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+sudo apt-get install -y unattended-upgrades
+sudo unattended-upgrades --verbose
+if [ x"${USE_DEBIAN_BACKPORTS}" = x"1" -o x"${USE_DEBIAN_BACKPORTS}" = x"True" ]; then
+    echo "deb http://deb.debian.org/debian bullseye-backports main" | sudo tee /etc/apt/sources.list.d/backports.list
+    sudo apt-get update
+    sudo unattended-upgrades --verbose
+fi
+sudo apt-get install -y curl rsync wget onionshare
+sudo apt-get install -y lz4 cpio xz-utils zstd p7zip-full
+sudo apt-get install -y gcc-aarch64-linux-gnu gcc-arm-none-eabi
+if [ x"${USE_DEBIAN_BACKPORTS}" = x"1" -o x"${USE_DEBIAN_BACKPORTS}" = x"True" ]; then
+    sudo apt-get install -y -t bullseye-backports qemu-user-static
+    sudo apt-get install -y -t bullseye-backports qemu-system-arm
+else
+    sudo apt-get install -y qemu-user-static
+    sudo apt-get install -y qemu-system-arm
+fi
+if [ x"${USE_DEBIAN_BACKPORTS}" = x"1" -o x"${USE_DEBIAN_BACKPORTS}" = x"True" ]; then
+    sudo apt-get install -y -t bullseye-backports debootstrap arch-test
+else
+    sudo apt-get install -y debootstrap arch-test
+fi
+sudo apt-get install -y procps gdisk dosfstools
+sudo apt-get install -y git-buildpackage equivs pristine-tar
+sudo apt-get install -y android-sdk-libsparse-utils
+sudo apt-get install -y bc flex bison
+sudo apt-get install -y e2tools efitools dfu-util
+sudo apt-get install -y tree sharutils device-tree-compiler
+sudo apt-get install -y libssl-dev openssl
+sudo apt-get install -y gnutls-dev
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+mkdir -p repo_build_space
+pushd repo_build_space
+gbp clone ${REPO_PACKAGE_URL}
+pushd repo
+sudo mk-build-deps --install --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
+gbp buildpackage --git-ignore-new --git-builder="debuild --no-lintian --set-envvar=DEB_BUILD_OPTIONS=nocheck -i -us -uc -b"
+popd
+sudo apt-get install -y -f ./repo_*.deb
+popd
+
+# Setup git config
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+
+# change to the build directory to repo sync and build
+mkdir -p build
+pushd build
+
+if [ x"${UBOOT_DIST}" = x"source" ]; then
+    mkdir -p u-boot-mainline
+    pushd u-boot-mainline
+    repo init -u ${UBOOT_MANIFEST_URL} -b ${UBOOT_MANIFEST_BRANCH}
+    repo sync
+    popd
+elif [ x"${UBOOT_DIST}" = x"androidci" ]; then
+    mkdir -p u-boot-androidci
+    rm -f u-boot-androidci/*
+
+    GRIDURL="https://ci.android.com/builds/branches/aosp_u-boot-mainline/grid?"
+    URL=https://ci.android.com/builds/latest/branches/aosp_u-boot-mainline/targets/u-boot_rockpi4/view/BUILD_INFO
+
+    RURL=$(curl -Ls -o /dev/null -w %{url_effective} ${URL})
+
+    wget -O u-boot-androidci/idbloader.img \
+	 -nv ${RURL%/view/BUILD_INFO}/raw/idbloader.img
+    wget -O u-boot-androidci/u-boot.itb \
+	 -nv ${RURL%/view/BUILD_INFO}/raw/u-boot.itb
+fi
+
+if [ x"${KERNEL_DIST}" = x"source" ]; then
+    mkdir -p kernel
+    pushd kernel
+    repo init -u ${KERNEL_MANIFEST_URL} -b ${KERNEL_MANIFEST_BRANCH}
+    repo sync
+    popd
+elif [ x"${KERNEL_DIST}" = x"androidci" -o x"${KERNEL_DIST}" = x"androidci-mainline" ]; then
+    mkdir -p kernel-androidci
+    GRIDURL="https://ci.android.com/builds/branches/aosp_kernel-common-android14-5.15/grid?"
+    URL=https://ci.android.com/builds/latest/branches/aosp_kernel-common-android14-5.15/targets/kernel_rockpi4/view/BUILD_INFO
+
+    if [ x"${KERNEL_DIST}" = x"androidci-mainline" ]; then
+	GRIDURL="https://ci.android.com/builds/branches/aosp_kernel-common-android-mainline/grid?"
+	URL=https://ci.android.com/builds/latest/branches/aosp_kernel-common-android-mainline/targets/kernel_rockpi4/view/BUILD_INFO
+    fi
+
+    RURL=$(curl -Ls -o /dev/null -w %{url_effective} ${URL})
+
+    rm -f kernel-androidci/*
+
+    wget -O kernel-androidci/BUILD_INFO \
+	 -nv ${RURL%/view/BUILD_INFO}/raw/BUILD_INFO
+    wget -O kernel-androidci/Image -nv ${RURL%/view/BUILD_INFO}/raw/Image
+    wget -O kernel-androidci/initramfs.img \
+	 -nv ${RURL%/view/BUILD_INFO}/raw/initramfs.img
+    wget -O kernel-androidci/rk3399-rock-pi-4b.dtb \
+	 -nv ${RURL%/view/BUILD_INFO}/raw/rk3399-rock-pi-4b.dtb
+    wget -O kernel-androidci/System.map \
+	 -nv ${RURL%/view/BUILD_INFO}/raw/System.map
+
+    FILESSET1="modules.builtin modules.builtin.modinfo modules.load"
+    for i in ${FILESSET1}; do
+	wget -O "kernel-androidci/${i}" -nv ${RURL%/view/BUILD_INFO}/raw/"${i}"
+    done
+
+    FILESSET2="vmlinux.symvers gki_aarch64_modules"
+    for i in ${FILESSET2}; do
+	wget -O "kernel-androidci/${i}" -nv ${RURL%/view/BUILD_INFO}/raw/"${i}"
+    done
+
+    # download all the *.ko files
+    KOFILES=$(egrep "[\"].*[.]ko[\"]" ${DISTDIR}/BUILD_INFO  | sed 's/["]\(.*[.]ko\)["][,]/\1/' | xargs)
+
+    for i in ${KOFILES}; do
+	wget -O "kernel-androidci/${i}" -nv ${RURL%/view/BUILD_INFO}/raw/"${i}"
+    done
+fi
+
+mkdir -p aosp
+pushd aosp
+repo init -u ${ANDROID_MANIFEST_URL} -b ${ANDROID_MANIFEST_BRANCH}
+repo sync
+popd
+
+# clean output and re-create directories
+rm -rf output/
+mkdir -p output/host/image
+mkdir -p pub
+
+# output manifest
+pushd aosp
+repo manifest -r -o ../pub/pinned-manifest.xml
+popd
+
+# apply local patches
+function is_in_remote() {
+    local repository=${1}
+    local branch=${2}
+
+    local existed_in_remote=$(git ls-remote --heads ${repository} ${branch})
+
+    if [[ -z ${existed_in_remote} ]]; then
+        return 0
+    else
+        return 1
+    fi
+}
+
+pushd aosp/device/google/cuttlefish
+head_commit=$(git rev-parse --verify HEAD)
+git remote add linarolocalpatch ${LOCAL_AOSP_CUTTLEFISH_GIT_URL}
+git remote update
+if is_in_remote linarolocalpatch ${LOCAL_AOSP_CUTTLEFISH_GIT_BRANCH}; then
+    echo "No local patches for aosp/device/google/cuttlefish"
+else
+    git checkout linarolocalpatch/${LOCAL_AOSP_CUTTLEFISH_GIT_BRANCH}
+    git rebase ${head_commit}
+fi
+popd
+
+pushd aosp/kernel/tests
+head_commit=$(git rev-parse --verify HEAD)
+git remote add linarolocalpatch ${LOCAL_AOSP_KERNEL_TESTS_GIT_URL}
+git remote update
+if is_in_remote linarolocalpatch ${LOCAL_AOSP_KERNEL_TESTS_GIT_BRANCH}; then
+    echo "No local patches for aosp/kernel/tests"
+else
+    git checkout linarolocalpatch/${LOCAL_AOSP_KERNEL_TESTS_GIT_BRANCH}
+    git rebase ${head_commit}
+fi
+popd
+
+if [ x"${KERNEL_DIST}" = x"source" ]; then
+    pushd kernel/common
+    head_commit=$(git rev-parse --verify HEAD)
+    git remote add linarolocalpatch ${LOCAL_KERNEL_COMMON_GIT_URL}
+    git remote update
+    if is_in_remote linarolocalpatch ${LOCAL_KERNEL_COMMON_GIT_BRANCH}; then
+	echo "No local patches for kernel/common"
+    else
+	git checkout linarolocalpatch/${LOCAL_KERNEL_COMMON_GIT_BRANCH}
+	git rebase ${head_commit}
+    fi
+    popd
+fi
+
+if [ x"${UBOOT_DIST}" = x"source" ]; then
+    pushd u-boot-mainline/u-boot
+    head_commit=$(git rev-parse --verify HEAD)
+    git remote add linarolocalpatch ${LOCAL_UBOOTMAINLINE_UBOOT_GIT_URL}
+    git remote update
+    if is_in_remote linarolocalpatch ${LOCAL_UBOOTMAINLINE_UBOOT_GIT_BRANCH}; then
+	echo "No local patches for u-boot-mainline/u-boot"
+    else
+	git checkout linarolocalpatch/${LOCAL_UBOOTMAINLINE_UBOOT_GIT_BRANCH}
+	git rebase ${head_commit}
+    fi
+    popd
+fi
+
+# Download extra tools for testing purpose.
+git clone https://github.com/matthuisman/gdrivedl.git
+git clone https://git.linaro.org/people/paul.liu/rockpi4cuttlefish/rockpi-buildscripts.git
+
+popd
diff --git a/android-rockpi-cuttlefish/publishers.yaml.inc b/android-rockpi-cuttlefish/publishers.yaml.inc
new file mode 100644
index 0000000000..decf6d1f01
--- /dev/null
+++ b/android-rockpi-cuttlefish/publishers.yaml.inc
@@ -0,0 +1,23 @@
+        - email-ext:
+            recipients: '${CI_MAIL_RECIPIENTS}'
+            content-type: text
+            body: |
+                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
+                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
+                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
+                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
+        - archive:
+            artifacts: '*.xml,*.json'
+            latest-only: true
+            allow-empty: true
+        - logparser:
+            parse-rules: '/var/lib/jenkins/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'peter.griffin@linaro.org paul.liu@linaro.org'
diff --git a/android-tv-hikey-n.yaml b/android-tv-hikey-n.yaml
deleted file mode 100644
index 344623ebc1..0000000000
--- a/android-tv-hikey-n.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- job:
-    name: android-tv-hikey-n
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-extended-read
-                - job-configure
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-        - string:
-            name: BUILD_DIR
-            default: r-lcr-nougat
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: android-tv-hikey-n
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'AOSP TV Build for HiKey based on Reference LCR Android N'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-n-workarounds'
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey-tv'
-                      - compare-type: 'PLAIN'
-                        pattern: 'NOUGAT-RLCR-PATCHSET'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-nougat-tv'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'hikey.xml'
-                      - compare-type: 'PLAIN'
-                        pattern: 'linaro.xml'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'aosp-tv-hikey-n'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-tv/hikey/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-tv/hikey/build-info/aosp-master-template.txt b/android-tv/hikey/build-info/aosp-master-template.txt
deleted file mode 100644
index 4d5033e255..0000000000
--- a/android-tv/hikey/build-info/aosp-master-template.txt
+++ /dev/null
@@ -1,96 +0,0 @@
-Format-Version: 0.5
-
-Files-Pattern: *.png, installed-files.txt, changelog.txt, cache.img, cache.img.xz,  boot.img, ramdisk.img, boot_fat.img, boot_fat.uefi.img, boot_fat.uefi.img.xz, boot.img.xz, boot_fat.img.xz, userdata.img,  userdata-4gb.img.xz, userdata.img.xz, *.xml, kernel_config, MANIFEST, MD5SUMS, *.sh,
-License-Type: open
-
-Files-Pattern: system.img, system.img.xz, *.zip
-License-Type: open
-Theme: linaro
-License-Text: <strong>END USER LICENCE AGREEMENT FOR THE MALI GPU USERSPACE DRIVER (“MALI GPU DRIVER”)</strong>
- <p>
- THIS END USER LICENCE AGREEMENT (“LICENCE”) IS A LEGAL AGREEMENT BETWEEN YOU (EITHER A SINGLE INDIVIDUAL, OR SINGLE LEGAL ENTITY) AND ARM LIMITED ("ARM") FOR THE USE OF THE SOFTWARE ACCOMPANYING THIS LICENCE. ARM IS ONLY WILLING TO LICENSE THE SOFTWARE TO YOU ON CONDITION THAT YOU ACCEPT ALL OF THE TERMS IN THIS LICENCE. BY CLICKING “I AGREE” OR BY INSTALLING OR OTHERWISE USING OR COPYING THE SOFTWARE YOU INDICATE THAT YOU AGREE TO BE BOUND BY ALL OF THE TERMS OF THIS LICENCE. IF YOU DO NOT AGREE TO THE TERMS OF THIS LICENCE, ARM IS UNWILLING TO LICENSE THE SOFTWARE TO YOU AND YOU MAY NOT INSTALL, USE OR COPY THE SOFTWARE, AND YOU SHOULD PROMPTLY RETURN THE SOFTWARE TO YOUR SUPPLIER.
- </p>
- <p>
- “Software” means any software, firmware and data accompanying this Licence, any printed, electronic or online documentation supplied with it under the terms of this Licence for the MALI GPU Driver.
- </p>
- <p>
- <h2>
- 1. LICENCE GRANTS TO YOU.
- </h2>
- 1.1 ARM hereby grants to you, subject to the terms and conditions of this Licence, a non-exclusive, non-transferable, revocable, worldwide licence to: (i) use the Software or certain components or optional functionality in the Software, as applicable, solely for the purposes of designing or developing applications for use in conjunction with MALI GPU based products manufactured under licence from ARM; and (ii) modify the Software or certain components or optional functionality in the Software for the purposes of porting the Software to your target;
- </p>
- <p>
- <h2>
- 2. RESTRICTIONS ON USE OF THE SOFTWARE.
- </h2>
- COPYING: You shall not use or copy the Software except as expressly authorised in this Licence. You may make one additional copy of the delivered Software for backup or archival purposes.
- </p>
- <p>
- BENCHMARKING: This Licence does not prevent you from using the Software for internal benchmarking purposes. However, you shall treat any and all benchmarking data relating to the Software, and any other results of your use or testing of the Software which are indicative of its performance, efficacy, reliability or quality, as confidential information and you shall not disclose such information to any third party without the express written permission of ARM.
- </p>
- <p>
- COPYRIGHT AND RESERVATION OF RIGHTS: The Software is owned by ARM or its licensors and is protected by copyright and other intellectual property laws and international treaties. The Software is licensed not sold. You acquire no rights to the Software other than as expressly provided by this Licence. You shall not remove from the Software any copyright notice or other notice and shall ensure that any such notice is reproduced in any copies of the whole or any part of the Software made by you or other permitted users.
- </p>
- <p>
- REVERSE ENGINEERING: Except to the extent that such activity is permitted by applicable law you shall not reverse engineer, decompile or disassemble any of the Software. If the Software was provided to you in Europe you shall not reverse engineer, decompile or disassemble any of the Software for the purposes of error correction.
- </p>
- <p>
- <h2>
- 3. SUPPORT.
- </h2>
- ARM is not under an obligation to provide support, but it may do so at its own discretion, and if it does, it will only be in respect of the Software as delivered and not any modifications thereto.
- </p>
- <p>
- <h2>
- 4. NO WARRANTIES.
- </h2>
- YOU AGREE THAT THE SOFTWARE IS LICENSED “AS IS”, AND THAT ARM EXPRESSLY DISCLAIMS ALL REPRESENTATIONS, WARRANTIES, CONDITIONS OR OTHER TERMS, EXPRESS OR IMPLIED OR STATUTORY, INCLUDING WITHOUT LIMITATION THE IMPLIED WARRANTIES OF NON-INFRINGEMENT, SATISFACTORY QUALITY, AND FITNESS FOR A PARTICULAR PURPOSE.
- </p>
- <p>
- YOU EXPRESSLY ASSUME ALL LIABILITIES AND RISKS, FOR USE OR OPERATION OF SOFTWARE APPLICATIONS, INCLUDING WITHOUT LIMITATION, SOFTWARE APPLICATIONS DESIGNED OR INTENDED FOR MISSION CRITICAL APPLICATIONS, SUCH AS PACEMAKERS, WEAPONRY, AIRCRAFT NAVIGATION, FACTORY CONTROL SYSTEMS, ETC. SHOULD THE SOFTWARE PROVE DEFECTIVE, YOU ASSUME THE ENTIRE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
- </p>
- <p>
- <h2>
- 5. LIMITATION OF LIABILITY.
- </h2>
- TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL ARM BE LIABLE FOR ANY INDIRECT, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES (INCLUDING LOSS OF PROFITS) ARISING OUT OF THE USE OR INABILITY TO USE THE SOFTWARE WHETHER BASED ON A CLAIM UNDER CONTRACT, TORT OR OTHER LEGAL THEORY, EVEN IF ARM WAS ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-  </p>
- <p>
- ARM does not seek to limit or exclude liability for death or personal injury arising from ARM's negligence or ARM’s fraud and because some jurisdictions do not permit the exclusion or limitation of liability for consequential or incidental damages the above limitation relating to liability for consequential damages may not apply to you.
- </p>
- <p>
- NOTWITHSTANDING ANYTHING TO THE CONTRARY CONTAINED IN THIS LICENCE, THE MAXIMUM LIABILITY OF ARM TO YOU IN AGGREGATE FOR ALL CLAIMS MADE AGAINST ARM IN CONTRACT TORT OR OTHERWISE UNDER OR IN CONNECTION WITH THE SUBJECT MATTER OF THIS LICENCE SHALL NOT EXCEED THE GREATER OF: (I) THE TOTAL OF SUMS PAID BY YOU TO ARM (IF ANY) FOR THIS LICENCE; AND (II) $10.00 USD. THE EXISTENCE OF MORE THAN ONE CLAIM WILL NOT ENLARGE OR EXTEND THE LIMIT.
- </p>
- <p>
- <h2>
- 6. CONFIDENTIALITY.
- </h2>
- You acknowledge that the Software and any benchmarking data and related information mentioned in Clause 2 may contain trade secrets and confidential material and you  agree to maintain all such information in confidence and apply security measures no less stringent than the measures which you apply to protect your own like information, but not less than a reasonable degree of care, to prevent their  unauthorised disclosure and use. Subject to any restrictions imposed by applicable law, the period of confidentiality shall be indefinite. You agree not to use any such information other than in normal use of the Software under the licences granted in this Licence.
- </p>
- <p>
- <h2>
- 7. U.S. GOVERNMENT END USERS.
- </h2>
- US Government Restrictions: Use, duplication, reproduction, release, modification, disclosure or transfer of the Software is restricted in accordance with the terms of this Licence.
- </p>
- <p>
- <h2>
- 8. TERM AND TERMINATION.
- </h2>
- This Licence shall remain in force until terminated by you or by ARM.  Without prejudice to any of its other rights if you are in breach of any of the terms and conditions of this Licence then ARM may terminate this Licence immediately upon giving written notice to you or on thirty (30) days written notice without cause. You may terminate this Licence at any time. Upon termination of this Licence by you or by ARM , you shall stop using the Software and confidential information and destroy all copies of the Software and confidential information in your possession, together with all documentation and related materials. The provisions of clauses 4, 5, 6, 7,  8 and 9 shall survive termination of this Licence.
- </p>
- <p>
- <h2>
- 9. GENERAL.
- </h2>
- This Licence is governed by English Law. Except where ARM agrees otherwise in: (i) a written contract signed by you and ARM; or (ii) a written contract provided by ARM and accepted by you, this is the only agreement between you and ARM relating to the Software and it may only be modified by written agreement between you and ARM. Except as expressly agreed in writing, this Licence may not be modified by purchase orders, advertising or other representation by any person. If any clause or sentence in this Licence is held by a court of law to be illegal or unenforceable the remaining provisions of this Licence shall not be affected thereby. The failure by ARM to enforce any of the provisions of this Licence, unless waived in writing, shall not constitute a waiver of ARM's rights to enforce such provision or any other provision of this Licence in the future.
- </p>
- <p>
- At ARM’s request, you agree to check your computers for installations of the Software and any other information requested by ARM relating to Software installation and to provide this information to ARM. You agree that auditors nominated by ARM may also perform such checking and reporting on behalf of ARM by prior appointment during your normal business hours on seven (7) days’ notice. ARM shall bear the auditors’ costs for that audit unless it reveals unlicensed usage in which case you shall promptly reimburse ARM for all reasonable costs and expenses, including professional fees, relating to such audit. Any information which is disclosed to ARM or such auditors during checking or audit shall be treated as your confidential information and shall only be used by ARM for licence management, compliance and enforcement purposes.
- </p>
- <p>
- The Software provided under this Licence is subject to U.S. export control laws, including the U.S. Export Administration Act and its associated regulations, and may be subject to export or import regulations in other countries. You agree to comply fully with all laws and regulations of the United States and other countries ("Export Laws") to assure that the Software, is not (1) exported, directly or indirectly, in violation of Export Laws, either to any countries that are subject to U.S.A. export restrictions or to any end user who has been prohibited from participating in the U.S.A. export transactions by any federal agency of the U.S.A. government; or (2) intended to be used for any purpose prohibited by Export Laws, including, without limitation, nuclear, chemical, or biological weapons proliferation.
- </p>
- <p>
- Mali GPU Userspace LES-PRE-20376
- </p>
diff --git a/android-tv/hikey/builders.sh b/android-tv/hikey/builders.sh
deleted file mode 100755
index beb525f086..0000000000
--- a/android-tv/hikey/builders.sh
+++ /dev/null
@@ -1,86 +0,0 @@
-# Build Android
-rm -rf build/out build/android-patchsets build/device/linaro/hikey
-mkdir -p build/
-cd build/
-wget https://dl.google.com/dl/android/aosp/linaro-hikey-20170523-4b9ebaff.tgz
-tar -xvf linaro-hikey-20170523-4b9ebaff.tgz
-yes "I ACCEPT" | ./extract-linaro-hikey.sh
-cd -
-
-build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-cp -a /home/buildslave/srv/${BUILD_DIR}/build/out/*.json /home/buildslave/srv/${BUILD_DIR}/build/out/*.xml ${WORKSPACE}/
-
-# Build Live TV app
-cd build/
-source build/envsetup.sh
-tapas LiveTv arm64
-make LiveTv
-cp -r out/target/product/generic_arm64/system//priv-app/LiveTv/ out/system/priv-app/
-rm -rf out/target
-cd -
-
-mkdir -p apps/
-cd apps/
-export ANDROID_HOME=/home/buildslave/srv/android-sdk/
-mkdir -p /home/buildslave/.android/
-echo "count=0" > /home/buildslave/.android/repositories.cfg
-
-rm -rf ExoPlayer androidtv-sample-inputs
-
-mkdir -p /home/buildslave/srv/${BUILD_DIR}/build/out/data/app/
-
-git clone https://github.com/googlesamples/androidtv-sample-inputs
-cd androidtv-sample-inputs/
-sed -i "s/23.0.3/26.0.2/g" app/build.gradle library/build.gradle
-./gradlew assembleDebug
-cp app/build/outputs/apk/app-debug.apk /home/buildslave/srv/${BUILD_DIR}/build/out/data/app/
-cd -
-
-git clone https://github.com/google/ExoPlayer
-cd ExoPlayer
-sed -i "s/23.0.3/26.0.2/g" build.gradle
-./gradlew assembleDebug
-cp ./demos/main/buildout/outputs/apk/withExtensions/debug/demo-withExtensions-debug.apk /home/buildslave/srv/${BUILD_DIR}/build/out/data/app/
-cd -
-
-# Compress images
-cd /home/buildslave/srv/${BUILD_DIR}/build/out
-host/linux-x86/bin/make_ext4fs -s -T -1 -S root/file_contexts -L data -l 5588893184 -a data userdata.img data
-host/linux-x86/bin/make_ext4fs -s -T -1 -S root/file_contexts.bin -L system -l 1610612736 -a system system.img system system
-host/linux-x86/bin/make_ext4fs -s -T -1 -S root/file_contexts -L data -l 1342177280 -a data userdata-4gb.img data
-
-# publish fip.bin and l-loader.bin
-cp dist/fip.bin dist/l-loader.bin .
-rm -f ramdisk.img
-for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img" "fip.bin" "l-loader.bin"; do
-  echo "Compressing ${image}"
-  xz ${image}
-done
-
-rm -rf BUILD-INFO.txt
-wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-tv/hikey/build-info/aosp-master-template.txt -O BUILD-INFO.txt
-
-# Publish parameters
-cat << EOF > ${WORKSPACE}/publish_parameters
-PUB_SRC=${PWD}
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-EOF
-
-cd /home/buildslave/srv/${BUILD_DIR}
-PUB_DEST=/android/${JOB_NAME}/${BUILD_NUMBER}
-# Construct post-build-lava parameters
-source build-configs/${BUILD_CONFIG_FILENAME}
-cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
-TARGET_PRODUCT=${TARGET_PRODUCT}
-MAKE_TARGETS=${MAKE_TARGETS}
-JOB_NAME=${JOB_NAME}
-BUILD_NUMBER=${BUILD_NUMBER}
-BUILD_URL=${BUILD_URL}
-LAVA_SERVER=validation.linaro.org/RPC2/
-IMAGE_EXTENSION=img.xz
-FRONTEND_JOB_NAME=${JOB_NAME}
-DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
-CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/hikey-v2/template-xtest-lmg.yaml
-SKIP_REPORT=true
-EOF
diff --git a/android-tv/hikey/builders.yaml.inc b/android-tv/hikey/builders.yaml.inc
deleted file mode 100644
index 721b796933..0000000000
--- a/android-tv/hikey/builders.yaml.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-        - shell:
-            !include-raw:
-                - android-lcr/common/builders.sh
-                - android-tv/hikey/builders.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/android-vts.yaml b/android-vts.yaml
deleted file mode 100644
index 24c262cd46..0000000000
--- a/android-vts.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-- job:
-    name: android-vts
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ANDROID_MANIFEST_URL
-            default: https://android.googlesource.com/platform/manifest
-        - string:
-            name: MANIFEST_BRANCH
-            default: master
-        - string:
-            name: LUNCH_TARGET
-            default: hikey-userdebug
-        - string:
-            name: PATCHSETS
-            default: ''
-    disabled: false
-    node: docker-utopic-aosp
-    display-name: 'Android VTS Build'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        !include: android-vts/builders.yaml.inc
-    publishers:
-        !include: android-lcr/common/publishers.yaml.inc
diff --git a/android-vts/builders.sh b/android-vts/builders.sh
index d09f606ac2..f31e5ae608 100755
--- a/android-vts/builders.sh
+++ b/android-vts/builders.sh
@@ -1,7 +1,12 @@
+# Build Android vts
 export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 
-repo init -u ${ANDROID_MANIFEST_URL} -b ${MANIFEST_BRANCH}
+# change to the build directory to repo sync and build
+cd build
+repo init -u ${ANDROID_MANIFEST_URL} -b ${MANIFEST_BRANCH} \
+        --repo-branch=master --no-repo-verify
 repo sync -j"$(nproc)" -c
+rm -rf out/
 
 mkdir -p pub
 repo manifest -r -o pub/pinned-manifest.xml
@@ -14,22 +19,27 @@ if [ -n "$PATCHSETS" ]; then
     done
 fi
 
-
 source build/envsetup.sh
 lunch ${LUNCH_TARGET}
 make -j"$(nproc)" vts
 
 wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/generic/build-info/public-template.txt -O pub/BUILD-INFO.txt
 
-# Build Android
 cp out/host/linux-x86/vts/android-vts.zip pub/
 
 # Delete sources after build to save space
 rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* out/
-
+rm -fr .repo
+
+# need to convert '_' to '-'
+# otherwise, aosp_arm64-userdebug will be translated to '~aosp/arm64-userdebug'
+# when upload to snapshot.linaro.org via linaro-cp.py
+# like reported here:
+# https://ci.linaro.org/job/android-cts/20/console
+lunch_target_str=$(echo ${LUNCH_TARGET}|tr '_' '-')
 # Publish parameters
 cat << EOF > ${WORKSPACE}/publish_parameters
 PUB_SRC=${PWD}/pub
-PUB_DEST=/android/${JOB_NAME}/${MANIFEST_BRANCH}/${LUNCH_TARGET}/${BUILD_NUMBER}
+PUB_DEST=/android/${JOB_NAME}/${lunch_target_str}/${BUILD_NUMBER}/${MANIFEST_BRANCH}
 PUB_EXTRA_INC=^[^/]+zip
 EOF
diff --git a/android/linaro-art-microbenchmarks/builders.sh b/android/linaro-art-microbenchmarks/builders.sh
index 85fe29c5a9..627307ad90 100644
--- a/android/linaro-art-microbenchmarks/builders.sh
+++ b/android/linaro-art-microbenchmarks/builders.sh
@@ -28,7 +28,7 @@ PUB_DEST=${PUB_DEST:-/android/${JOB_NAME}/${BUILD_NUMBER}}
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --manifest \
   --link-latest \
   --split-job-owner \
diff --git a/android/linaro-publisher.sh b/android/linaro-publisher.sh
index 3865e5a031..94eacf0608 100644
--- a/android/linaro-publisher.sh
+++ b/android/linaro-publisher.sh
@@ -1,19 +1,24 @@
 #!/bin/bash
 
-set -x
+set -ex
 
 PUB_SRC=${PUB_SRC:-${HOME}/srv/${JOB_NAME}/build/out}
 PUB_DEST=${PUB_DEST:-/android/${JOB_NAME}/${BUILD_NUMBER}}
 
+# default to link latest
+# and set to not link latest when specified explicitly
+OPT_LINK_LATEST="--link-latest"
+if [ -n "${LINK_LATEST}" ] && [ "X${LINK_LATEST}" = "Xfalse" ]; then
+    OPT_LINK_LATEST=""
+fi
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --manifest \
   --no-build-info \
-  --link-latest \
+  ${OPT_LINK_LATEST} \
   --split-job-owner \
-  --server ${PUBLISH_SERVER} \
   ${PUB_SRC} \
   ${PUB_DEST} \
   --include "^[^/]+[._](img[^/]*|tar[^/]*|bin[^/]*|xml|sh|config|json)$" \
diff --git a/aosp-mesa-testing.yaml b/aosp-mesa-testing.yaml
new file mode 100644
index 0000000000..aa065f3039
--- /dev/null
+++ b/aosp-mesa-testing.yaml
@@ -0,0 +1,62 @@
+- job:
+    name: aosp-mesa-testing
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: BUILD_DIR
+            default: 'aosp-master'
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'AOSP Master mesa testing'
+    scm:
+        - git:
+            remotes:
+                - upstream-mesa:
+                    url: git://anongit.freedesktop.org/mesa/mesa
+                    refspec: +refs/heads/master:refs/remotes/upstream-mesa/master
+            branches:
+                - upstream-mesa/master
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+    concurrent: true
+    triggers:
+        - pollscm: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell:
+            !include-raw:
+                - android-lcr/common/builders.sh
+                - aosp-mesa-testing/builders.sh
+        - inject:
+            properties-file: publish_parameters
+    publishers:
+        - email-ext:
+            recipients: 'vishal.bhoj@linaro.org, john.stultz@linaro.org'
+            content-type: text
+            subject: 'errors for mesa master on AOSP master ${BUILD_NUMBER}'
+            body: |
+                AOSP master Build State without upstream mesa: ${AOSP_MASTER_BUILD}
+                Build Triggered by:  ${GIT_BRANCH} ${PATCH_SUBJECT}
+                Author: S{AUTHOR_EMAIL_ADDRESS}
+                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
+            first-failure: true
+            failure: false
diff --git a/aosp-mesa-testing/builders.sh b/aosp-mesa-testing/builders.sh
new file mode 100644
index 0000000000..e949d5f96b
--- /dev/null
+++ b/aosp-mesa-testing/builders.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+
+# Install needed packages
+sudo apt-get update
+sudo apt-get install -y bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-wand rsync liblz4-tool lzop libssl-dev libdrm-intel1 python-pip
+
+wget -q \
+  http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/a/android-tools/android-tools-fsutils_4.2.2+git20130218-3ubuntu41+linaro1_amd64.deb \
+  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+  http://old-releases.ubuntu.com/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+sudo dpkg -i --force-all *.deb
+rm -f *.deb
+
+# Install jinja2-cli and ruamel.yaml==0.16.13
+pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+java -version
+
+BUILD_DIR=aosp-master/build
+if [ ! -d "/home/buildslave/srv/${BUILD_DIR}" ]; then
+  sudo mkdir -p /home/buildslave/srv/${BUILD_DIR}
+  sudo chmod 777 /home/buildslave/srv/${BUILD_DIR}
+fi
+cd /home/buildslave/srv/${BUILD_DIR}
+
+# Download helper scripts (repo)
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+cd .repo
+rm -rf local_manifests
+cd -
+repo init -u https://android.googlesource.com/platform/manifest  -b main
+
+export AOSP_MASTER_BUILD=fail
+repo sync -j$(nproc) -c -f
+rm -rf build-info
+source build/envsetup.sh
+lunch db845c-userdebug
+mma -j$(nproc) libGLES_mesa hwcomposer.drm gralloc.gbm
+
+export AOSP_MASTER_BUILD=pass
+
+pushd external/mesa3d
+set +e
+git remote rm upstream
+set -e
+git remote add upstream git://anongit.freedesktop.org/mesa/mesa
+git fetch upstream 
+git checkout ${GIT_COMMIT}
+export AUTHOR_EMAIL_ADDRESS=$(git log --pretty=format:"%ae" HEAD -1)
+export PATCH_SUBJECT=$(git log --pretty=format:"%s" HEAD -1)
+popd
+
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+AUTHOR_EMAIL_ADDRESS=${AUTHOR_EMAIL_ADDRESS}
+PATCH_SUBJECT=${PATCH_SUBJECT}
+AOSP_MASTER_BUILD=${AOSP_MASTER_BUILD}
+EOF
+
+set -ex
+ln -sf /usr/bin/python prebuilts/build-tools/path/linux-x86/python
+mma -j$(nproc) libGLES_mesa hwcomposer.drm gralloc.gbm TEMPORARY_DISABLE_PATH_RESTRICTIONS=true
diff --git a/archive-primordial-jdk7-amd64.yaml b/archive-primordial-jdk7-amd64.yaml
deleted file mode 100644
index 71133e9a04..0000000000
--- a/archive-primordial-jdk7-amd64.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: archive-primordial-jdk7-amd64
-    project-type: freestyle
-    defaults: global
-    description: |
-        * This job archives (via a saved artifact) openjdk-7-jdk.
-    logrotate:
-        numToKeep: 10
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'OpenJDK - Archive primordial OpenJDK 7 (amd64)'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf *.deb openjdk-7 primordial-jdk7
-            }
-
-            new_name=primordial-jdk7
-            orig_name=java-7-openjdk-amd64
-
-            sudo apt-get update
-            apt-get download openjdk-7-jdk openjdk-7-jre openjdk-7-jre-headless
-            dpkg-deb -x openjdk-7-jdk_*.deb openjdk-7
-            dpkg-deb -x openjdk-7-jre_*.deb openjdk-7
-            dpkg-deb -x openjdk-7-jre-headless_*.deb openjdk-7
-
-            rm -rf ~/JVMs/${orig_name}
-            mkdir -p ~/JVMs
-            mv openjdk-7/usr/lib/jvm/${orig_name} ~/JVMs/
-
-            cp -a ~/JVMs/${orig_name} .
-            chmod ug+r .
-            mv ${orig_name} ${new_name}
-
-            test -d out || mkdir out
-            rm -f out/${new_name}.tar.gz
-            tar -cvf out/${new_name}.tar.gz ${new_name}/jre ${new_name}/lib ${new_name}/bin ${new_name}/include
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.gz'
diff --git a/archive-primordial-jdk7.yaml b/archive-primordial-jdk7.yaml
index 9f943279f9..9ead976d4d 100644
--- a/archive-primordial-jdk7.yaml
+++ b/archive-primordial-jdk7.yaml
@@ -12,7 +12,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK - Archive primordial OpenJDK 7'
     wrappers:
diff --git a/archive-primordial-jdk8.yaml b/archive-primordial-jdk8.yaml
index 7450954c06..902e964518 100644
--- a/archive-primordial-jdk8.yaml
+++ b/archive-primordial-jdk8.yaml
@@ -12,7 +12,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK - Archive primordial OpenJDK 8'
     wrappers:
diff --git a/archive-specjbb2013-product-tarball.yaml b/archive-specjbb2013-product-tarball.yaml
deleted file mode 100644
index 09754f0fea..0000000000
--- a/archive-specjbb2013-product-tarball.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-- job:
-    name: archive-specjbb2013-product-tarball
-    project-type: freestyle
-    defaults: global
-    description: |
-        * This job creates an archive of the SPECjbb2013 product.<br>
-          It can be copied as a *copy artifact* by other jobs.<br>
-        * <b>Note:</b> SPECjbb2013 should <b>not</b> be shared publically as there are licensing restrictions.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: build
-    display-name: 'OpenJDK - Archive SPECjbb2013 product'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - SPECjbb2013-1.00.tar.gz
-            relative-to: 'somewhereElse'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            rm -rf out
-            mkdir out
-
-            # Use copy-to-slave instead of the file under /work/openjdk-testing/
-            #tar -xf /work/openjdk-testing/SPECjbb2013-1.00.tar.gz
-            tar -xf SPECjbb2013-1.00.tar.gz
-
-            chmod -R ug+rw SPECjbb2013-1.00
-            tar -acf out/SPECjbb2013-1.00.tar.gz SPECjbb2013-1.00
-            rm -rf SPECjbb2013-1.00 SPECjbb2013-1.00.tar.gz
-    publishers:
-        - archive:
-            artifacts: 'out/SPECjbb2013-1.00.tar.gz'
diff --git a/archive-specjbb2015-product-tarball.yaml b/archive-specjbb2015-product-tarball.yaml
deleted file mode 100644
index d11fe0ddba..0000000000
--- a/archive-specjbb2015-product-tarball.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-- job:
-    name: archive-specjbb2015-product-tarball
-    project-type: freestyle
-    defaults: global
-    description: |
-        * This job creates an archive of the SPECjbb2015 product.<br>
-          It can be copied as a *copy artifact* by other jobs.<br>
-        * <b>Note:</b> SPECjbb2015 should <b>not</b> be shared publically as there are licensing restrictions.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: build
-    display-name: 'OpenJDK - Archive SPECjbb2015 product'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - SPECjbb2015.tgz
-            relative-to: 'somewhereElse'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            rm -rf out
-            mkdir out
-
-            # Use copy-to-slave instead of the file under /work/openjdk-testing/
-            #tar -xf /work/openjdk-testing/SPECjbb2015.tgz
-            tar -xf SPECjbb2015.tgz
-
-            chmod -R ug+rw SPECjbb2015
-            tar -acf out/SPECjbb2015.tgz SPECjbb2015
-            rm -rf SPECjbb2015 SPECjbb2015.tgz
-    publishers:
-        - archive:
-            artifacts: 'out/SPECjbb2015.tgz'
diff --git a/armlt-platforms-release.yaml b/armlt-platforms-release.yaml
index a8b9d792fc..9dab92388b 100644
--- a/armlt-platforms-release.yaml
+++ b/armlt-platforms-release.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -22,7 +22,7 @@
                 - job-cancel
     disabled: false
     node: docker-xenial-amd64
-    display-name: 'ARM LT - Platforms Release Builds for Versatile Express TC2, FVP AEMv8 and Foundation models and Juno ARM Development Platforms'
+    display-name: 'ARM LT - Platforms Release Builds for Versatile Express TC2, FVP AEMv8 and Foundation models and Juno ARM Development Platforms '
     scm:
         - git:
             url: https://git.linaro.org/landing-teams/working/arm/build-scripts.git
@@ -37,26 +37,58 @@
             wipe-workspace: false
     wrappers:
         - timestamps
+    parameters:
+      - bool:
+          name: CURRENT_MONTH
+          default: false
+          description: "Select if the release is for current month"
+      - bool:
+          name: PINNED_ACK
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-ack.xml'"
+      - bool:
+          name: PINNED_LATEST
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-latest.xml'"
+      - bool:
+          name: PINNED_UEFI
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-uefi.xml'"
+      - bool:
+          name: PINNED_JUNO
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-juno.xml'"
+      - bool:
+          name: PINNED_SGI575
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-sgi575.xml'"
+      - bool:
+          name: PINNED_SGM775
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-sgm775.xml'"
+      - bool:
+          name: PINNED_SGM775_ANDROID
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-sgm775-android.xml'"
     builders:
-        - linaro-publish-token
         - shell: |
             #!/bin/bash
 
             sudo apt-get update
-            sudo apt-get install -y --no-install-recommends python-requests
+            export LC_ALL=C
+            sudo apt-get install -y --no-install-recommends python-requests libssl-dev libopts25-dev flex automake pkg-config gettext autopoint
 
             bash build-scripts/platforms-ci.sh release
-
-            mkdir out
-            mv *.zip MD5SUMS out/
-
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
             # Publish to snapshots
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out member-builds/armlt-platforms-release/${BUILD_NUMBER}/
     publishers:
         - email:
-            recipients: 'ryan.harkin@linaro.org'
+            recipients: 'arvind.chauhan@arm.com'
diff --git a/armlt-platforms.yaml b/armlt-platforms.yaml
index a6569d74a4..b42971be7c 100644
--- a/armlt-platforms.yaml
+++ b/armlt-platforms.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -37,26 +37,59 @@
             wipe-workspace: false
     wrappers:
         - timestamps
+    parameters:
+      - bool:
+          name: CURRENT_MONTH
+          default: false
+          description: "Select if the release is for current month"
+      - bool:
+          name: PINNED_ACK
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-ack.xml'"
+      - bool:
+          name: PINNED_LATEST
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-latest.xml'"
+      - bool:
+          name: PINNED_UEFI
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-uefi.xml'"
+      - bool:
+          name: PINNED_JUNO
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-juno.xml'"
+      - bool:
+          name: PINNED_SGI575
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-sgi575.xml'"
+      - bool:
+          name: PINNED_SGM775
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-sgm775.xml'"
+      - bool:
+          name: PINNED_SGM775_ANDROID
+          default: false
+          description: "Select to build and generate bundles for manifest 'pinned-sgm775-android.xml'"
     builders:
         - linaro-publish-token
         - shell: |
             #!/bin/bash
 
             sudo apt-get update
-            sudo apt-get install -y --no-install-recommends python-requests
+            export LC_ALL=C
+            sudo apt-get install -y --no-install-recommends python-requests libssl-dev libopts25-dev flex automake pkg-config gettext autopoint
 
             bash build-scripts/platforms-ci.sh snapshot
-
-            mkdir out
-            mv *.zip MD5SUMS out/
-
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
             # Publish to snapshots
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out member-builds/armlt-platforms/${BUILD_NUMBER}
     publishers:
         - email:
-            recipients: 'ryan.harkin@linaro.org'
+            recipients: 'arvind.chauhan@arm.com'
diff --git a/armnn-ci-benchmarking.yaml b/armnn-ci-benchmarking.yaml
new file mode 100644
index 0000000000..d37d727029
--- /dev/null
+++ b/armnn-ci-benchmarking.yaml
@@ -0,0 +1,99 @@
+- job:
+    name: armnn-ci-benchmarking
+    project-type: freestyle
+    defaults: global
+    description: |
+        Updates source and builds ArmNN frequently to ensure builds are successful.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://git.mlplatform.org/ml/armnn.git
+
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+    disabled: false
+    node: docker-bionic-arm64
+    display-name: 'Arm NN - CI Build: MLPerf Benchmark'
+
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - linaro-publish-token
+
+        - shell: |
+            #!/bin/bash -ex
+
+
+            sudo apt-get -q update
+            sudo apt-get install -y jq
+            sudo apt-get install -y --no-install-recommends python-pip virtualenv python-dev python3-dev
+            wget https://snapshots.linaro.org/components/armnn-master/latest/buildInfo.json
+
+            LAVA_ID=( $(jq -r '.LAVA_ID' buildInfo.json))
+            BUILD_NUM_ORIGIN=( $(jq -r '.BUILD_NUMBER' buildInfo.json))
+
+
+            git clone https://github.com/Linaro/lava-test-plans.git
+
+
+            curl \
+                --header "Auth-Token: $QA_REPORTS_TOKEN" \
+                https://qa-reports.linaro.org/api/createbuild/armnn/armnn-benchmarking/$LAVA_ID
+
+            # submit tests to LAVA
+            rm -rf venv | true
+            virtualenv -p python3 venv
+            source ./venv/bin/activate
+
+            cd ./lava-test-plans
+            pip install -r requirements.txt
+
+            export DEVICE_TYPE=synquacer
+
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=armnn-benchmarking
+            PROJECT=projects/armnn/
+            AUTO_LOGIN_PASSWORD_PROMPT='Password:'
+            AUTO_LOGIN_PASSWORD='Linaro123'
+            ARMNN_TARBALL_URL=https://snapshots.linaro.org/components/armnn-master/latest/armnn.tar.xz
+            KERNEL_URL=http://images.validation.linaro.org/synquacer/hc/vmlinuz
+            RAMDISK_URL=http://images.validation.linaro.org/synquacer/hc/initrd.img
+            RAMDISK_URL_COMP=gz
+            ROOTFS_URL=http://images.validation.linaro.org/synquacer/hc/rootfs.tar.xz
+            ROOTFS_URL_COMP=xz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            BUILD_NUMBER=${BUILD_NUM_ORIGIN}
+            EOF
+
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan armnn-benchmarking \
+              --qa-server-team armnn \
+              --qa-server-project armnn \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
diff --git a/armnn-ci-build.yaml b/armnn-ci-build.yaml
new file mode 100644
index 0000000000..5762f012a1
--- /dev/null
+++ b/armnn-ci-build.yaml
@@ -0,0 +1,218 @@
+- job:
+    name: armnn-ci-build
+    display-name: 'Arm NN - CI Build'
+    concurrent: true
+    project-type: freestyle
+    defaults: global
+    description: |
+        Updates source and builds ArmNN frequently to ensure builds are successful.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://git.mlplatform.org/ml/armnn.git
+
+    triggers:
+        - gerrit:
+            override-votes: true
+            gerrit-build-failed-verified-value: -1
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: true
+                    exclude-trivial-rebase: true
+                    exclude-no-code-change: true
+                - comment-added-contains-event:
+                    comment-contains-value: 'TRIGGER BUILD'
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'ml/armnn'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'master'
+             #silent: true
+            skip-vote:
+                  successful: true
+                  failed: false
+            server-name: review.mlplatform.org
+
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: GIT_COM_ID
+    disabled: false
+    node: docker-bionic-arm64-armnn
+
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            git clone https://github.com/K1504296/armnn-ci.git
+            cd armnn-ci && bash -ex arm-builders.sh
+        - shell: |
+            #!/bin/bash -e
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            sudo apt-get install -y jq
+
+            if [ -z "$GIT_COM_ID" ]
+            then
+                LAVA_ID=${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}
+                ARMNN_TAR_LOCATION=https://snapshots.linaro.org/components/armnn/${BUILD_NUMBER}/armnn.tar.xz
+            else
+                LAVA_ID=$GIT_COM_ID
+                ARMNN_TAR_LOCATION=https://snapshots.linaro.org/components/armnn-master/${BUILD_NUMBER}/armnn.tar.xz
+            fi
+
+
+            jq -n --arg 'LAVA_ID' $LAVA_ID \
+            --arg 'ARMNN_TAR_LOCATION' $ARMNN_TAR_LOCATION \
+            --arg 'BUILD_NUMBER' $BUILD_NUMBER \
+            '{LAVA_ID:$LAVA_ID, ARMNN_TAR_LOCATION:$ARMNN_TAR_LOCATION, BUILD_NUMBER:$BUILD_NUMBER}' > out/buildInfo.json
+
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+
+
+            if [ -z "$GIT_COM_ID" ]
+            then
+                wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+                time python3 ${HOME}/bin/linaro-cp.py \
+                --link-latest \
+                out/ components/armnn/${BUILD_NUMBER}
+            else
+                wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+                time python3 ${HOME}/bin/linaro-cp.py \
+                --link-latest \
+                out/ components/armnn-master/${BUILD_NUMBER}
+            fi
+
+        - shell: |
+            #!/bin/bash -ex
+
+            export DEVICE_TYPE=hi960-hikey
+
+            if [ -z "$GIT_COM_ID" ]
+            then
+                LAVA_ID=${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}
+                ARMNN_TAR_LOCATION=https://snapshots.linaro.org/components/armnn/${BUILD_NUMBER}/armnn.tar.xz
+            else
+                LAVA_ID=$GIT_COM_ID
+                ARMNN_TAR_LOCATION=https://snapshots.linaro.org/components/armnn-master/${BUILD_NUMBER}/armnn.tar.xz
+            fi
+
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=armnn
+            PROJECT=projects/armnn/
+            ARMNN_TARBALL_URL=${ARMNN_TAR_LOCATION}
+            BOOT_URL=http://snapshots.linaro.org/96boards/hikey/linaro/debian/30/boot-linaro-stretch-developer-hikey-20190420-30.img.gz
+            BOOT_URL_COMP=gz
+            ROOTFS_URL=http://snapshots.linaro.org/96boards/hikey/linaro/debian/30/rootfs-linaro-stretch-developer-hikey-20190420-30.img.gz
+            ROOTFS_URL_COMP=gz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            BUILD_NUMBER=${BUILD_NUMBER}
+            EOF
+
+            git clone --depth 1 https://github.com/Linaro/lava-test-plans.git
+
+            curl \
+                --header "Auth-Token: $QA_REPORTS_TOKEN" \
+                --form patch_source=gerrit-ssh-mlplatform \
+                --form patch_id=${GERRIT_CHANGE_NUMBER}:${GERRIT_PATCHSET_NUMBER} \
+                https://qa-reports.linaro.org/api/createbuild/armnn/armnn/$LAVA_ID
+
+            # submit tests to LAVA
+            rm -rf venv | true
+            virtualenv -p python3 venv
+            source ./venv/bin/activate
+
+            # fix for setuptools v50
+            export SETUPTOOLS_USE_DISTUTILS="stdlib"
+            cd lava-test-plans
+            pip3 install -r requirements.txt
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan armnn \
+              --qa-server-team armnn \
+              --qa-server-project armnn \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
+
+            export DEVICE_TYPE=synquacer
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=armnn
+            PROJECT=projects/armnn/
+            AUTO_LOGIN_PASSWORD_PROMPT='Password:'
+            AUTO_LOGIN_PASSWORD='Linaro123'
+            ARMNN_TARBALL_URL=${ARMNN_TAR_LOCATION}
+            KERNEL_URL=http://images.validation.linaro.org/synquacer/hc/vmlinuz
+            RAMDISK_URL=http://images.validation.linaro.org/synquacer/hc/initrd.img
+            RAMDISK_URL_COMP=gz
+            ROOTFS_URL=http://images.validation.linaro.org/synquacer/hc/rootfs.tar.xz
+            ROOTFS_URL_COMP=xz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            BUILD_NUMBER=${BUILD_NUMBER}
+            EOF
+
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan armnn \
+              --qa-server-team armnn \
+              --qa-server-project armnn \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
+
+            export DEVICE_TYPE=dragonboard-845c
+
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=armnn
+            PROJECT=projects/armnn/
+            ARMNN_TARBALL_URL=${ARMNN_TAR_LOCATION}
+            PTABLE_URL=https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/28/dragonboard-845c-bootloader-ufs-linux-28/gpt_both0.bin
+            BOOT_URL=http://images.validation.linaro.org/releases.linaro.org/96boards/dragonboard845c/linaro/debian/19.09/boot-linaro-buster-dragonboard-845c-58.img.gz
+            BOOT_URL_COMP=gz
+            ROOTFS_URL=http://images.validation.linaro.org/releases.linaro.org/96boards/dragonboard845c/linaro/debian/19.09/linaro-buster-alip-dragonboard-845c-58.img.gz
+            ROOTFS_URL_COMP=gz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            BUILD_NUMBER=${BUILD_NUMBER}
+            EOF
+
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan armnn \
+              --qa-server-team armnn \
+              --qa-server-project armnn \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
diff --git a/armnn-ci-build/builders-32bit.sh b/armnn-ci-build/builders-32bit.sh
new file mode 100644
index 0000000000..2528f98fba
--- /dev/null
+++ b/armnn-ci-build/builders-32bit.sh
@@ -0,0 +1,138 @@
+#!/bin/bash
+
+set -ex
+
+sudo apt -q=2 update
+sudo apt-get -q=2  install -y  --no-install-recommends git
+sudo apt-get -q=2  install -y  --no-install-recommends scons
+sudo apt-get -q=2  install -y  --no-install-recommends gcc-arm-linux-gnueabihf
+sudo apt-get -q=2  install -y  --no-install-recommends g++-arm-linux-gnueabihf
+sudo apt-get -q=2  install -y  --no-install-recommends curl
+sudo apt-get -q=2  install -y  --no-install-recommends autoconf
+sudo apt-get -q=2  install -y  --no-install-recommends libtool
+sudo apt-get -q=2  install -y  --no-install-recommends cmake
+sudo apt -q=2 install -y --no-install-recommends build-essential cmake libpthread-stubs0-dev
+sudo apt -q=2 install -y --no-install-recommends python-pip python3-pip virtualenv python-dev python3-dev xxd
+
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+
+git clone --depth 1 "http://review.mlplatform.org/ml/ComputeLibrary"
+git clone https://github.com/Arm-software/armnn
+wget https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2 && tar xf boost_1_64_0.tar.bz2
+git clone --depth 1 -b v3.5.0 https://github.com/google/protobuf.git
+git clone --depth 1 https://github.com/tensorflow/tensorflow.git --branch r2.0 --single-branch
+
+wget -O flatbuffers-1.10.0.tar.gz https://github.com/google/flatbuffers/archive/v1.10.0.tar.gz && tar xf flatbuffers-1.10.0.tar.gz
+
+
+if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; then
+    cd armnn
+    GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}"
+    if git pull ${GERRIT_URL} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then
+	git reset --hard
+        echo "Retrying to apply the patch with: git fetch && git checkout."
+        if ! { git fetch ${GERRIT_URL} ${GERRIT_REFSPEC} | git checkout FETCH_HEAD; }; then
+            git reset --hard
+            echo "Error: *** Error patch merge failed"
+            exit 1
+        fi
+    fi
+fi
+
+
+cd ${WORKSPACE}/ComputeLibrary
+scons extra_cxx_flags="-fPIC" Werror=0 debug=0 asserts=0 neon=1 opencl=0 os=linux arch=armv7a examples=1
+
+
+cd ${WORKSPACE}/boost_1_64_0
+./bootstrap.sh
+rm project-config.jam || true
+wget --no-check-certificate http://people.linaro.org/~theodore.grey/project-config.jam
+./b2  \
+  --build-dir=${WORKSPACE}/boost_1_64_0/build toolset=gcc link=static cxxflags=-fPIC \
+  --with-filesystem \
+  --with-test \
+  --with-log \
+  --with-program_options install --prefix=${WORKSPACE}/boost
+
+
+cd $WORKSPACE/protobuf
+git submodule update --init --recursive
+./autogen.sh
+./configure --prefix=$WORKSPACE/protobuf-host
+make  -j$(nproc)
+make install
+make clean
+
+./autogen.sh
+./configure --prefix=$WORKSPACE/protobuf-arm32 --host=arm-linux CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ --with-protoc=$WORKSPACE/protobuf-host/bin/protoc
+make -j$(nproc)
+make install
+
+
+cd $WORKSPACE/tensorflow
+../armnn/scripts/generate_tensorflow_protobuf.sh ../tensorflow-protobuf ../protobuf-host
+
+cd $WORKSPACE/flatbuffers-1.10.0
+mkdir build && cd build
+cmake .. \
+-DFLATBUFFERS_BUILD_FLATC=1 \
+-DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/flatbuffers
+make all install
+
+cd $WORKSPACE/flatbuffers-1.10.0
+mkdir build-arm32 && cd build-arm32
+cmake .. -DCMAKE_C_COMPILER=arm-linux-gnueabihf-gcc \
+-DCMAKE_CXX_COMPILER=arm-linux-gnueabihf-g++ \
+-DFLATBUFFERS_BUILD_FLATC=1 \
+-DCMAKE_INSTALL_PREFIX:PATH=$WORKSPACE/flatbuffers-arm32 \
+-DFLATBUFFERS_BUILD_TESTS=0
+make all install
+
+cd $WORKSPACE
+mkdir tflite
+cd tflite
+cp $WORKSPACE/tensorflow/tensorflow/lite/schema/schema.fbs .       
+$WORKSPACE/flatbuffers-1.10.0/build/flatc -c --gen-object-api --reflect-types --reflect-names schema.fbs
+
+cd $WORKSPACE/armnn
+mkdir build
+cd build
+
+cmake .. -DCMAKE_LINKER=/usr/bin/arm-linux-gnueabihf-ld \
+-DCMAKE_C_COMPILER=/usr/bin/arm-linux-gnueabihf-gcc \
+-DCMAKE_CXX_COMPILER=/usr/bin/arm-linux-gnueabihf-g++ \
+-DCMAKE_C_COMPILER_FLAGS=-fPIC \
+-DCMAKE_CXX_FLAGS=-mfpu=neon \
+-DARMCOMPUTE_ROOT=$WORKSPACE/ComputeLibrary \
+-DARMCOMPUTE_BUILD_DIR=$WORKSPACE/ComputeLibrary/build \
+-DBOOST_ROOT=$WORKSPACE/boost \
+-DTF_GENERATED_SOURCES=$WORKSPACE/tensorflow-protobuf \
+-DBUILD_TF_PARSER=1 \
+-DBUILD_TF_LITE_PARSER=1 \
+-DTF_LITE_GENERATED_PATH=$WORKSPACE/tflite \
+-DFLATBUFFERS_ROOT=$WORKSPACE/flatbuffers-arm32 \
+-DFLATC_DIR=$WORKSPACE/flatbuffers-1.10.0/build \
+-DPROTOBUF_ROOT=$WORKSPACE/protobuf-arm32 \
+-DARMCOMPUTENEON=1 \
+-DARMNNREF=1
+make -j$(nproc)
+
+export XZ_DEFAULTS="-T 0"
+
+cd ${WORKSPACE}
+rm -rf boost_*.tar.bz2 boost_* protobuf tensorflow
+find ${WORKSPACE} -type f -name *.o -delete
+tar -cJf /tmp/armnn-full-32.tar.xz ${WORKSPACE}
+
+mv armnn/build .
+mv protobuf-arm32/lib/libprotobuf.so.15.0.0 build
+rm -rf boost armnn ComputeLibrary flatbuffers protobuf-host tensorflow-protobuf builders.sh
+tar -cJf /tmp/armnn-32.tar.xz ${WORKSPACE}
+
+mkdir ${WORKSPACE}/out
+mv /tmp/armnn-32.tar.xz ${WORKSPACE}/out
+mv /tmp/armnn-full-32.tar.xz ${WORKSPACE}/out
+cd ${WORKSPACE}/out && sha256sum > SHA256SUMS.txt
diff --git a/armnn-ci-build/builders.sh b/armnn-ci-build/builders.sh
new file mode 100644
index 0000000000..38e982f607
--- /dev/null
+++ b/armnn-ci-build/builders.sh
@@ -0,0 +1,128 @@
+#!/bin/bash
+
+set -ex
+
+sudo apt -q=2 update
+sudo apt -q=2 install -y --no-install-recommends build-essential scons cmake git autoconf automake curl libtool libpthread-stubs0-dev
+sudo apt -q=2 install -y --no-install-recommends python3-pip virtualenv python3-dev python3-setuptools
+pip3 install wheel
+# Set local configuration
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+
+git clone --depth 1 "https://review.mlplatform.org/ml/ComputeLibrary"
+git clone "https://review.mlplatform.org/ml/armnn"
+git clone --depth 1 https://github.com/protocolbuffers/protobuf.git --branch v3.9.2 --single-branch
+git clone --depth 1 https://github.com/tensorflow/tensorflow.git --branch r2.0 --single-branch
+git clone --depth 1 https://github.com/google/flatbuffers.git --branch v1.12.0 --single-branch
+wget -q https://dl.bintray.com/boostorg/release/1.64.0/source/boost_1_64_0.tar.bz2 && tar xf boost_*.tar.bz2
+#swig 4.0
+wget -q http://prdownloads.sourceforge.net/swig/swig-4.0.2.tar.gz
+#export ONNX_ML=1
+#git clone https://github.com/onnx/onnx.git
+#unset ONNX_ML
+
+if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; then
+    cd armnn
+    GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}"
+    if git pull ${GERRIT_URL} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then
+	git reset --hard
+        echo "Retrying to apply the patch with: git fetch && git checkout."
+        if ! { git fetch ${GERRIT_URL} ${GERRIT_REFSPEC} | git checkout FETCH_HEAD; }; then
+            git reset --hard
+            echo "Error: *** Error patch merge failed"
+            exit 1
+        fi
+    fi
+fi
+
+python3 --version
+
+cd ${WORKSPACE}/armnn
+git checkout master
+
+#build swig4.0 for PyArmNN
+cd ${WORKSPACE}
+tar -xf swig-4.0.2.tar.gz && rm -rf swig-4.0.2.tar.gz
+cd ${WORKSPACE}/swig-4.0.2
+./configure --prefix=${WORKSPACE}/swig-host --without-maximum-compile-warnings --without-pcre &&
+make -j(nproc)
+make install
+
+cd ${WORKSPACE}/ComputeLibrary
+#need to add if loops for opencl=1 embed_kernels=1 and neon=1
+scons -u -j$(nproc) arch=arm64-v8a extra_cxx_flags="-fPIC" benchmark_tests=1 validation_tests=1 embed_kernels=1
+
+#build Boost
+cd ${WORKSPACE}/boost_1_64_0
+./bootstrap.sh
+./b2  \
+  --build-dir=${WORKSPACE}/boost_1_64_0/build toolset=gcc link=static cxxflags=-fPIC \
+  --with-filesystem \
+  --with-test \
+  --with-log \
+  --with-program_options install --prefix=${WORKSPACE}/boost
+
+#build Protobuf
+cd ${WORKSPACE}/protobuf
+git submodule update --init --recursive
+./autogen.sh
+./configure --prefix=${WORKSPACE}/protobuf-host
+make -j$(nproc)
+make install
+
+#generate tensorflow protobuf library
+cd ${WORKSPACE}/tensorflow
+${WORKSPACE}/armnn/scripts/generate_tensorflow_protobuf.sh \
+  ${WORKSPACE}/tensorflow-protobuf \
+  ${WORKSPACE}/protobuf-host
+
+#build google flatbuffer libraries
+cd ${WORKSPACE}/flatbuffers
+cmake -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS="-fPIC"
+make -j$(nproc)
+
+#Build Onnx
+#cd ${WORKSPACE}/onnx
+#git checkout f612532843bd8e24efeab2815e45b436479cc9ab
+#export LD_LIBRARY_PATH=${WORKSPACE}/protobuf-host/lib:$LD_LIBRARY_PATH
+#${WORKSPACE}/protobuf-host/bin/protoc onnx/onnx.proto --proto_path=. --proto_path=${WORKSPACE}/protobuf-host/include --cpp_out ${WORKSPACE}/onnx
+
+#Build Arm NN
+cd ${WORKSPACE}/armnn
+mkdir build
+cd build
+cmake .. \
+  -DARMCOMPUTE_ROOT=${WORKSPACE}/ComputeLibrary \
+  -DARMCOMPUTE_BUILD_DIR=${WORKSPACE}/ComputeLibrary/build \
+  -DBOOST_ROOT=${WORKSPACE}/boost \
+  -DTF_GENERATED_SOURCES=${WORKSPACE}/tensorflow-protobuf \
+  -DBUILD_TF_PARSER=1 \
+  -DPROTOBUF_ROOT=${WORKSPACE}/protobuf-host \
+  -DBUILD_TF_LITE_PARSER=1 \
+  -DARMNNREF=1 \
+  -DBUILD_TESTS=1 -DBUILD_UNIT_TESTS=1 \
+  -DTF_LITE_GENERATED_PATH=${WORKSPACE}/tensorflow/tensorflow/lite/schema \
+  -DFLATBUFFERS_ROOT=${WORKSPACE}/flatbuffers \
+  -DFLATBUFFERS_LIBRARY=${WORKSPACE}/flatbuffers/libflatbuffers.a \
+  -DSWIG_EXECUTABLE=${WORKSPACE}/swig-host/bin/swig \
+  -DBUILD_PYTHON_SRC=1 \
+  -DBUILD_PYTHON_WHL=1
+make -j$(nproc)
+
+export XZ_DEFAULTS="-T 0"
+
+cd ${WORKSPACE}
+rm -rf boost_*.tar.bz2 boost_* protobuf tensorflow
+find ${WORKSPACE} -type f -name *.o -delete
+tar -cJf /tmp/armnn-full.tar.xz ${WORKSPACE}
+
+mv armnn/build .
+mv protobuf-host/lib/libprotobuf.so.20.0.2 build
+rm -rf boost armnn ComputeLibrary flatbuffers protobuf-host tensorflow-protobuf builders.sh
+tar -cJf /tmp/armnn.tar.xz ${WORKSPACE}
+
+mkdir ${WORKSPACE}/out
+mv /tmp/armnn.tar.xz ${WORKSPACE}/out
+mv /tmp/armnn-full.tar.xz ${WORKSPACE}/out
+cd ${WORKSPACE}/out && sha256sum > SHA256SUMS.txt
diff --git a/armnn32-ci-build.yaml b/armnn32-ci-build.yaml
new file mode 100644
index 0000000000..b0159d99e8
--- /dev/null
+++ b/armnn32-ci-build.yaml
@@ -0,0 +1,111 @@
+- job:
+    name: armnn32-ci-build
+    display-name: 'Arm NN - 32 bit CI Build'
+    project-type: freestyle
+    concurrent: true
+    defaults: global
+    description: |
+        Updates source and builds ArmNN 32 bit for armv7a frequently to ensure builds are successful.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://git.mlplatform.org/ml/armnn.git
+
+    triggers:
+        - gerrit:
+            override-votes: true
+            gerrit-build-failed-verified-value: -1
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: true
+                    exclude-trivial-rebase: true
+                    exclude-no-code-change: true
+                - comment-added-contains-event:
+                    comment-contains-value: 'TRIGGER BUILD'
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'ml/armnn'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'master'
+            silent: true
+                      #            skip-vote:
+                      #                    successful: true
+                      #                    failed: false
+            server-name: review.mlplatform.org
+
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: GIT_COM_ID
+    disabled: false
+    node: docker-bionic-amd64
+
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: armnn-ci-build/builders-32bit.sh
+        - shell: |
+            #!/bin/bash -e
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            sudo apt-get install -y jq
+
+            if [ -z "$GIT_COM_ID" ]
+            then
+                LAVA_ID=${GERRIT_CHANGE_NUMBER}_${GERRIT_PATCHSET_NUMBER}
+                ARMNN_TAR_LOCATION=https://snapshots.linaro.org/components/armnn-32bit/${BUILD_NUMBER}/armnn-32.tar.xz
+            else
+                LAVA_ID=$GIT_COM_ID
+                ARMNN_TAR_LOCATION=https://snapshots.linaro.org/components/armnn-32bit-master/${BUILD_NUMBER}/armnn-32.tar.xz
+            fi
+
+
+            jq -n --arg 'LAVA_ID' $LAVA_ID \
+            --arg 'ARMNN_TAR_LOCATION' $ARMNN_TAR_LOCATION \
+            --arg 'BUILD_NUMBER' $BUILD_NUMBER \
+            '{LAVA_ID:$LAVA_ID, ARMNN_TAR_LOCATION:$ARMNN_TAR_LOCATION, BUILD_NUMBER:$BUILD_NUMBER}' > out/buildInfo.json
+
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+
+
+            if [ -z "$GIT_COM_ID" ]
+            then
+                wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+                time python3 ${HOME}/bin/linaro-cp.py \
+                --link-latest \
+                out/ components/armnn-32bit/${BUILD_NUMBER}
+            else
+                wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+                time python3 ${HOME}/bin/linaro-cp.py \
+                --link-latest \
+                out/ components/armnn-32bit-master/${BUILD_NUMBER}
+            fi
+
diff --git a/art-stable-aosp-reference.yaml b/art-stable-aosp-reference.yaml
deleted file mode 100644
index c5b92fd208..0000000000
--- a/art-stable-aosp-reference.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-- job:
-    name: art-stable-aosp-reference
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-extended-read
-            linaro-android-builders:
-                - job-build
-                - job-cancel
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-cancel
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    display-name: 'ART - Stable - AOSP Reference'
-    concurrent: true
-    triggers:
-        - timed: 'H H * * *'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aosp-x86_64-09
-                - aosp-x86_64-10
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            java -version
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage
-
-            if [ ! -d "/home/buildslave/srv/linaro-art-stable-aosp-reference" ]; then
-                      sudo mkdir -p /home/buildslave/srv/linaro-art-stable-aosp-reference
-                      sudo chmod 777 /home/buildslave/srv/linaro-art-stable-aosp-reference
-            fi
-
-            cd /home/buildslave/srv/linaro-art-stable-aosp-reference
-
-            curl https://android-git.linaro.org/tools/repo.git/plain/repo > /tmp/repo
-            chmod a+x /tmp/repo
-            sudo mv /tmp/repo /usr/local/bin/repo
-
-            rm -rf .repo/local_manifests
-            repo init -u https://android-git.linaro.org/git/platform/manifest  -b android-7.1.1_r22
-            sed -i "s/clone-depth=\"1\"//g" .repo/manifest.xml
-            repo sync -j16 --force-sync
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
diff --git a/art-tip-aosp-reference.yaml b/art-tip-aosp-reference.yaml
deleted file mode 100644
index e2de45b86a..0000000000
--- a/art-tip-aosp-reference.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-- job:
-    name: art-tip-aosp-reference
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-extended-read
-            linaro-android-builders:
-                - job-build
-                - job-cancel
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-cancel
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    display-name: 'ART - Tip - AOSP Reference'
-    concurrent: true
-    triggers:
-        - timed: 'H H * * *'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aosp-x86_64-09
-                - aosp-x86_64-10
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            java -version
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage
-
-            if [ ! -d "/home/buildslave/srv/linaro-art-tip-aosp-reference" ]; then
-                      sudo mkdir -p /home/buildslave/srv/linaro-art-tip-aosp-reference
-                      sudo chmod 777 /home/buildslave/srv/linaro-art-tip-aosp-reference
-            fi
-
-            cd /home/buildslave/srv/linaro-art-tip-aosp-reference
-
-            curl https://android-git.linaro.org/tools/repo.git/plain/repo > /tmp/repo
-            chmod a+x /tmp/repo
-            sudo mv /tmp/repo /usr/local/bin/repo
-
-            rm -rf .repo/local_manifests
-            repo init -u https://android-git.linaro.org/git/platform/manifest -b master
-            sed -i "s/clone-depth=\"1\"//g" .repo/manifest.xml
-            repo sync -j16 --force-sync
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
diff --git a/autoware-ros-kinetic.yaml b/autoware-ros-kinetic.yaml
new file mode 100644
index 0000000000..851283ba8e
--- /dev/null
+++ b/autoware-ros-kinetic.yaml
@@ -0,0 +1,49 @@
+- view:
+    name: autoware
+    view-type: list
+    regex: 'autoware-.*'
+- job:
+    name: autoware-ros-kinetic
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://github.com/CPFL/Autoware
+    disabled: false
+    node: docker-ros-builder
+    display-name: 'Autoware - ROS (kinetic)'
+    scm:
+        - git:
+            url: https://github.com/CPFL/Autoware.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
+            name: origin
+            branches:
+                - refs/heads/master
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+            submodule:
+                recursive: true
+    triggers:
+        - pollscm:
+            cron: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell:
+            !include-raw: autoware-ros-kinetic/builders.sh
+    publishers:
+        - logparser:
+            use-project-rules: false
+            parse-rules: '/var/jenkins_home/userContent/autoware-log-parser-rules.txt'
+            unstable-on-warning: false
+            fail-on-error: false
diff --git a/autoware-ros-kinetic/builders.sh b/autoware-ros-kinetic/builders.sh
new file mode 100644
index 0000000000..9a0103125b
--- /dev/null
+++ b/autoware-ros-kinetic/builders.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -e
+
+cd ${WORKSPACE}/ros
+
+# We first build the entire workspace normally
+colcon build --cmake-args \
+  -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage" \
+  -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage" \
+  -DCMAKE_BUILD_TYPE=Debug
+
+# And then build the tests target. catkin (ROS1) packages add their tests to the tests target
+# which is not the standard target for CMake projects. We need to trigger the tests target so that
+# tests are built and any fixtures are set up.
+colcon build --cmake-target tests --cmake-args \
+  -DCMAKE_CXX_FLAGS="${CMAKE_CXX_FLAGS} -fprofile-arcs -ftest-coverage" \
+  -DCMAKE_C_FLAGS="${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage" \
+  -DCMAKE_BUILD_TYPE=Debug
+
+lcov --initial --directory build --capture --output-file lcov.base
+colcon test
+colcon test-result
+lcov --directory build --capture --output-file lcov.test
+lcov -a lcov.base -a lcov.test -o lcov.total
+lcov -r lcov.total '*/tests/*' '*/test/*' '*/build/*' '*/devel/*' '*/install/*' '*/log/*' '/usr/*' '/opt/*' '/tmp/*' '*/CMakeCCompilerId.c' '*/CMakeCXXCompilerId.cpp' -o lcov.total.filtered
diff --git a/bhoj-test.yaml b/bhoj-test.yaml
index 8695eec5b2..7ab938d023 100644
--- a/bhoj-test.yaml
+++ b/bhoj-test.yaml
@@ -16,46 +16,52 @@
                 - job-extended-read
                 - job-configure
                 - job-cancel
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.4'
     disabled: false
     node: master
     display-name: 'Trigger for LKFT HiKey builds (4.4 branch)'
-    scm:
-        - git:
-            remotes:
-                - linux-stable-4.4:
-                    url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-                    refspec: +refs/heads/linux-4.4.y:refs/remotes/origin/linux-4.4.y
-                - android-hikey-linaro-4.4:
-                    url: https://android.googlesource.com/kernel/hikey-linaro
-                    refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
     wrappers:
         - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: JJB_USER
+                variable: JJB_USER
+        - credentials-binding:
+            - text:
+                credential-id: JJB_PASSWORD
+                variable: JJB_PASSWORD
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: LT_QCOM_KEY
+                variable: LT_QCOM_KEY
+        - credentials-binding:
+            - text:
+                credential-id: AUTH_TOKEN
+                variable: AUTH_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: SQUAD_AUTH_TOKEN
         - build-name:
             name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
     builders:
         - shell: |
             #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            cat lkft_parameters
+            exit 1
     publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-aosp-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-aosp-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
+       - postbuildscript:
+          builders:
+            - role: SLAVE
+              build-on:
+                - FAILURE 
+              build-steps:
+                - shell: |
+                   #!/bin/bash -e
+                   curl --header "Auth-Token: ${QA_REPORTS_TOKEN}" --form tests='{"build_process/build": "pass"}'  ${qa_server}/api/submit/${qa_server_team}/${qa_server_project}/${QA_BUILD_VERSION}/${TEST_DEVICE_TYPE}
diff --git a/bigdata-bigtop-deb.yaml b/bigdata-bigtop-deb.yaml
new file mode 100644
index 0000000000..588b37d9eb
--- /dev/null
+++ b/bigdata-bigtop-deb.yaml
@@ -0,0 +1,31 @@
+- job:
+    name: bigdata-bigtop-deb
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    disabled: false
+    node: leg-aarch64
+    display-name: 'Bigdata Apache BigTop (deb)'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: bigdata-bigtop-deb/builders.sh
+    publishers:
+        - archive:
+            artifacts: 'bigtop-trunk/output/**'
+        - email-ext:
+            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org, guodong.xu@linaro.org'
diff --git a/bigdata-bigtop-deb/builders.sh b/bigdata-bigtop-deb/builders.sh
new file mode 100755
index 0000000000..438a7eabe5
--- /dev/null
+++ b/bigdata-bigtop-deb/builders.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+set -ex
+
+# number of CPU_CORES to build with
+export CPU_CORES=$(getconf _NPROCESSORS_ONLN)
+
+# get source
+rm -rf bigtop-trunk
+git clone --depth 1 --branch working-tar-gz-packaging https://git.linaro.org/leg/bigdata/bigtop-trunk.git
+
+# Before starting the container, give other users `w` access to `bigtop`
+# home directory. It is required for gradle installation as 'jenkins' users.
+# Otherwise, you will see this error when run 'gradlew tasks'.
+#   FAILED: Could not create service of type CrossBuildFileHashCache
+#    using BuildSessionScopeServices.createCrossBuildFileHashCache().
+chmod a+w bigtop-trunk
+
+# now build bigtop slaves
+cd bigtop-trunk
+
+# optionally, build docker images locally - only needed once
+#./gradlew -POS=debian-9 -Pprefix=erp18.06 bigtop-puppet
+#./gradlew -POS=debian-9 -Pprefix=erp18.06 bigtop-slaves
+
+# build bigdata bigtop components. This will take a while.
+# Artifacts will be stored under individual component folder inside output folder.
+#
+# Example command line:
+#   docker run --rm -u jenkins --workdir /ws -v ${PWD}:/ws \
+#          bigtop/slaves:1.4.0-debian-9-aarch64 bash -l -c '. /etc/profile.d/bigtop.sh; ./gradlew deb repo'
+#
+# Note:
+#   - User 'jenkins' is employed. It exists by default in the root docker image of bigtop/slaves.
+#   - It's not allowed using 'root' to build bigtop. Some component refuses to be built in root.
+#   - Image "bigtop/slaves:*-aarch64" will be retrieved from docker hub on live.
+#   - bigtop.sh sets environment variables such as: JAVA_HOME, MAVEN_HOME, ANT_HOME, GRADLE_HOME, etc.
+
+docker run --rm -u jenkins --workdir /ws -v ${PWD}:/ws \
+  bigtop/slaves:1.4.0-debian-9-aarch64 bash -l -c '. /etc/profile.d/bigtop.sh; ./gradlew deb repo; chmod -R a+w output build .gradle dl;'
+
+# cleanup
+#docker prune -fa
diff --git a/bigdata-elasticsearch.yaml b/bigdata-elasticsearch.yaml
deleted file mode 100644
index 9de2de7f60..0000000000
--- a/bigdata-elasticsearch.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- job:
-    name: bigdata-elasticsearch
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'Bigdata ELK - ElasticSearch'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # setup environments
-            export LANG="en_US.UTF-8"
-
-            # install prerequisites
-            sudo apt-get -q=2 update
-            sudo apt-get -q=2 -y install -t jessie-backports \
-                openjdk-8-jdk git build-essential automake autoconf libtool \
-                curl unzip rpm texinfo locales-all tar wget python-requests
-
-            wget -q https://services.gradle.org/distributions/gradle-3.5.1-bin.zip -O /tmp/gradle-3.5.1-bin.zip
-            unzip /tmp/gradle-3.5.1-bin.zip
-            ln -s gradle-3.5.1 gradle
-
-            # setup environments
-            export PATH=${WORKSPACE}/gradle/bin:$PATH
-            export JAVA_TOOL_OPTIONS="-Dfile.encoding=UTF8"
-
-            # setup JAVA_HOME
-            cd /usr/lib/jvm/java-8-openjdk-*
-            export JAVA_HOME=${PWD}
-
-            # clone the ElasticSearch definitions
-            git clone --depth 1 https://git.linaro.org/leg/bigdata/elasticsearch.git -b v5.4.1 ${WORKSPACE}/elasticsearch
-            cd ${WORKSPACE}/elasticsearch
-
-            # okay everything is in place
-            gradle assemble -Dbuild.snapshot=false
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --link-latest \
-              ${WORKSPACE}/elasticsearch/distribution/deb/build/distributions \
-              components/bigdata/elk/elasticsearch/${BUILD_NUMBER}
-    publishers:
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/bigdata-kibana.yaml b/bigdata-kibana.yaml
deleted file mode 100644
index f74b796dac..0000000000
--- a/bigdata-kibana.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- job:
-    name: bigdata-kibana
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'Bigdata ELK - Kibana'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # setup environments
-            export LANG="en_US.UTF-8"
-
-            # install prerequisites
-            sudo apt-get -q=2 update
-            sudo apt-get -q=2 -y install \
-                git build-essential automake autoconf libtool libffi-dev \
-                ruby-dev rubygems python curl zip rpm python-requests
-            sudo gem install fpm -v 1.5.0
-            sudo gem install pleaserun -v 0.0.24
-
-            # clone the Kibana definitions
-            git clone --depth 1 https://git.linaro.org/leg/bigdata/kibana.git -b v5.4.1 ${WORKSPACE}/kibana
-
-            curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.33.2/install.sh | bash
-            source ${HOME}/.profile
-
-            # Install the version of node.js listed in the .node-version file (this can be easily automated with tools such as nvm and avn)
-            nvm install $(cat ${WORKSPACE}/kibana/.node-version)
-
-            cd ${WORKSPACE}/kibana
-
-            # Install npm dependencies
-            npm install
-            npm rebuild node-sass
-            npm run build -- --deb --release
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir -p out
-            cp -a ${WORKSPACE}/kibana/target/kibana-*-arm64.deb* out/
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --link-latest \
-              out components/bigdata/elk/kibana/${BUILD_NUMBER}
-    publishers:
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/bigdata-logstash.yaml b/bigdata-logstash.yaml
deleted file mode 100644
index 9608ad6ddc..0000000000
--- a/bigdata-logstash.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: bigdata-logstash
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'Bigdata ELK - Logstash'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # setup environments
-            export LANG="en_US.UTF-8"
-
-            # install prerequisites
-            sudo apt-get -q=2 update
-            sudo apt-get -q=2 -y install -t jessie-backports \
-                openjdk-8-jdk build-essential maven ant texinfo locales-all \
-                automake autoconf libtool rubygems tar wget unzip curl \
-                python-requests
-            sudo gem install rake
-            sudo gem install bundler
-
-            # setup environments
-            export RELEASE=1
-
-            # setup JAVA_HOME
-            cd /usr/lib/jvm/java-8-openjdk-*
-            export JAVA_HOME=${PWD}
-
-            # clone the Logstash definitions
-            git clone --depth 1 https://git.linaro.org/leg/bigdata/logstash.git -b v5.4.1 ${WORKSPACE}/logstash
-            cd ${WORKSPACE}/logstash
-
-            # okay everything is in place
-            rake bootstrap
-            rake plugin:install-default
-
-            rake artifact:deb
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            rm -rf ${WORKSPACE}/logstash/build/bootstrap
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --link-latest \
-              ${WORKSPACE}/logstash/build \
-              components/bigdata/elk/logstash/${BUILD_NUMBER}
-    publishers:
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/bridge-nfsroot.yaml b/bridge-nfsroot.yaml
deleted file mode 100644
index 9c05474eeb..0000000000
--- a/bridge-nfsroot.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-- job:
-    name: bridge-nfsroot
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Create a minimal initramfs with bridge-nfsroot functionality
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            num-to-keep: 30
-            days-to-keep: 30
-    parameters:
-        - string:
-            name: DEB_ARCH
-            default: 'armhf arm64 amd64'
-    disabled: false
-    node: docker-jessie-arm64
-    retry-count: 3
-    display-name: 'Create a minimal initramfs with bridge-nfsroot functionality'
-    scm:
-        - git:
-            url: https://github.com/suihkulokki/bridge-nfsroot.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            sudo apt-get -q=2 update
-            sudo apt-get install -y python-requests cpio wget
-
-            rm -rf out && mkdir out
-
-            set -ex
-
-            for arch in ${DEB_ARCH}; do
-              ./mkinitrd.sh ${arch}
-              mv initramfs.${arch}.cpio.gz out/
-            done
-
-            # Publish to snapshots
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out components/bridge-nfsroot/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'anders.roxell@linaro.org fathi.boudra@linaro.org'
diff --git a/build-all-packages.yaml b/build-all-packages.yaml
deleted file mode 100644
index 32777b91f7..0000000000
--- a/build-all-packages.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- job:
-    name: build-all-packages
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: source
-            description: 'dsc source url or filename'
-        - string:
-            name: repo
-            description: 'repository to upload to'
-            default: 'linaro-staging'
-    disabled: true
-    display-name: 'Build all Debian/Ubuntu packages'
-    wrappers:
-        - timestamps
-    publishers:
-        - trigger-parameterized-builds:
-            - project: build-package
-              current-parameters: true
-              predefined-parameters: "codename=xenial"
-            - project: build-package
-              current-parameters: true
-              predefined-parameters: "codename=jessie"
-            - project: build-package
-              current-parameters: true
-              predefined-parameters: "codename=stretch"
-        - email:
-            recipients: 'packages@lists.linaro.org'
diff --git a/build-docker-rpm.yaml b/build-docker-rpm.yaml
deleted file mode 100644
index bf6bfc5294..0000000000
--- a/build-docker-rpm.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: build-docker-rpm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'RPM package for Docker'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo yum install -y \
-              btrfs-progs-devel \
-              device-mapper-devel \
-              git \
-              glibc-static \
-              go-md2man \
-              golang \
-              make \
-              rpm-build \
-              selinux-policy \
-              selinux-policy-devel \
-              sqlite-devel \
-              wget \
-              yum-utils
-
-            sudo wget http://repo.linaro.org/rpm/linaro-overlay/centos-7/linaro-overlay.repo -O /etc/yum.repos.d/linaro-overlay.repo
-            yumdownloader --source docker
-            rpm -i docker-*.src.rpm
-            sudo yum-builddep --nogpg -y ~/rpmbuild/SPECS/docker.spec || true
-            rpmbuild -ba ~/rpmbuild/SPECS/docker.spec
-            ln -s ~/rpmbuild
-    publishers:
-        - archive:
-            artifacts: 'rpmbuild/*RPMS/**'
diff --git a/build-kernel-rpm.yaml b/build-kernel-rpm.yaml
deleted file mode 100644
index 0641b8ffa3..0000000000
--- a/build-kernel-rpm.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-- job:
-    name: build-kernel-rpm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'Build Kernel RPM package (from SRPM)'
-    parameters:
-        - string:
-            name: source
-            description: 'source url for the SRPM'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo yum install -y wget git rpm-build yum-utils make openssl-devel
-            sudo wget http://repo.linaro.org/rpm/linaro-overlay/centos-7/linaro-overlay.repo -O /etc/yum.repos.d/linaro-overlay.repo
-
-            wget --progress=dot -e dotbytes=2M $source
-            rpm -i *.src.rpm
-
-            sudo yum-builddep --nogpg -y ~/rpmbuild/SPECS/kernel*.spec || true
-            rpmbuild -vv --without debug --without doc --without debuginfo -ba ~/rpmbuild/SPECS/kernel*.spec
-            ln -s ~/rpmbuild
-    publishers:
-        - archive:
-            artifacts: 'rpmbuild/*RPMS/**'
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/build-kvmtool.yaml b/build-kvmtool.yaml
index fb5d2434e0..0b9c5b9655 100644
--- a/build-kvmtool.yaml
+++ b/build-kvmtool.yaml
@@ -11,12 +11,12 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
                 - job-cancel
-    disabled: false
+    disabled: true
     node: docker-xenial
     display-name: 'KVMtool CI loop'
     scm:
diff --git a/build-package-clo/builder.sh b/build-package-clo/builder.sh
new file mode 100644
index 0000000000..4dc3f13989
--- /dev/null
+++ b/build-package-clo/builder.sh
@@ -0,0 +1,110 @@
+#!/bin/bash
+
+set -ex
+
+echo "source: $source"
+echo "repo: $repo"
+echo "appendversion: $appendversion"
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get update -qq
+then
+    echo apt-get update error try again in a moment
+    sleep 15
+    sudo DEBIAN_FRONTEND=noninteractive apt-get update -q||true
+fi
+
+sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -q osc
+
+# install jflog client tool, v1, used for publishing artifacts
+(mkdir -p $HOME/bin && cd $HOME/bin && curl -fL https://getcli.jfrog.io | sh)
+
+dget -q -d -u $source
+sourcename=`basename $source|sed -e 's,_.*,,'`
+echo "will send to OBS: $repo $sourcename"
+
+if [ "$backport" = "true" ]; then
+   appendversion=true
+   deltatype=backport
+fi
+
+if [ "$appendversion" = "true" ]; then
+    dpkg-source -x *.dsc work/
+    rm *.dsc
+    cd work
+    dpkg-parsechangelog
+    maint=`dpkg-parsechangelog -SMaintainer`
+    if [[ $maint != *linaro* ]]; then
+       echo "Warning not a linaro maintainer: $maint"
+       export maint="packages@lists.linaro.org"
+    fi
+
+    # Changelog update
+    change=`dpkg-parsechangelog -SChanges`
+    case $change in
+        *Initial*release*)
+            deltatype="new package"
+            ;;
+        *Backport*from*|*Rebuild*for*)
+            deltatype="backport"
+            ;;
+        *Added*patch*)
+            deltatype="patched"
+            ;;
+        *Upstream*snapshot*)
+            deltatype="snapshot"
+            ;;
+        *HACK*)
+            deltatype="hack"
+            ;;
+        *)
+            deltatype="other"
+            ;;
+    esac
+    dch --force-distribution -m -llinaro "Linaro CI build: $deltatype"
+    dpkg-buildpackage -S -d
+    cd ..
+fi
+
+dsc=`ls -tr *dsc`
+
+cat > $HOME/.oscrc <<EOF
+[general]
+apiurl = https://obs.linaro.org
+
+[https://obs.linaro.org]
+user=$OSCRC_USER
+pass=$OSCRC_PASS
+EOF
+
+# update existing package
+if osc co $repo $sourcename; then
+    rm -v $repo/$sourcename/${sourcename}_*||true
+else
+    osc co $repo
+    mkdir -p $repo/$sourcename
+    osc add $repo/$sourcename
+fi
+for file in `dcmd $dsc`;
+do
+    cp $file $repo/$sourcename
+done
+
+osc addremove $repo/$sourcename
+osc ci $repo/$sourcename -m "$BUILD_URL"
+
+# TODO: 1. take into account repo variable into PUBLISH_SERVER
+#       2. for --deb parameter, distribution/component/architecture,
+#          set correct distribution
+#       3. uploaded artifacts also include several files with leading _
+#          are these needed? see https://binaryartifacts.jfrog.io/ui/native/linaro-57-linaro-overlay-sid/pool/linux-5.15.0-qcomlt-arm/
+#       4. change _apiurl from https://obs.linaro.org to https://binaryartifacts.jfrog.io/ui/native/linaro-57-linaro-overlay-sid/pool/ ?
+dist=all
+component=$sourcename
+arch=`echo $source | sed -n 's@.*ARCH=\(.*\)\(,.*\)@\1@p'`
+
+${HOME}/bin/jfrog rt u \
+      --detailed-summary \
+      --deb=$dist/$component/$arch \
+      --apikey ${LT_QCOM_CLO_API_KEY} \
+      --url ${PUBLISH_SERVER} \
+      "${repo}/${component}/" "${component}/"
diff --git a/build-package-obs.yaml b/build-package-obs.yaml
index 0f8b09594a..f049199ac2 100644
--- a/build-package-obs.yaml
+++ b/build-package-obs.yaml
@@ -8,7 +8,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -33,7 +33,7 @@
             description: 'mark as backport'
             default: 'false'
     disabled: false
-    node: docker-jessie-amd64
+    node: docker-buster
     display-name: 'Build package on OBS'
     wrappers:
         - timestamps
diff --git a/build-package-test.yaml b/build-package-test.yaml
deleted file mode 100644
index 1b6e4a6304..0000000000
--- a/build-package-test.yaml
+++ /dev/null
@@ -1,190 +0,0 @@
-- job:
-    name: build-package-test
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-configure
-                - job-delete
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - least-load:
-            disabled: False
-    parameters:
-        - string:
-            name: codename
-            default: 'jessie'
-            description: 'distribution codename targeted: vivid, utopic or jessie'
-        - string:
-            name: source
-            description: 'dsc source url or filename'
-        - string:
-            name: repo
-            description: 'repository to upload to'
-            default: 'linaro-staging'
-        - bool:
-            name: appendversion
-            description: 'append version with linaro$dist'
-            default: 'true'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-amd64
-                - docker-jessie-arm64
-                - docker-jessie-armhf
-    execution-strategy:
-        sequential: false
-    disabled: false
-    display-name: 'Build package'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="codename"}: ${ENV,var="source"}'
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-            cat > repo.parameters << EOF
-            build_success=false
-            pkg_job_url=${JOB_URL}
-            EOF
-
-            arch=`dpkg-architecture -qDEB_HOST_ARCH`
-            dist=`lsb_release -sc`
-            if [ "$dist" != "$codename" ]
-            then
-                echo "$codename requested while we are $dist, skip"
-                exit 0
-            fi
-            # arm64 is the must build target with source uploads for all dists
-            if [ $arch = arm64 ]
-            then
-                buildpackage_params="-sa"
-            else
-                buildpackage_params="-B"
-            fi
-            [ $arch = armhf ] && personality=linux32
-
-            echo "arch: $arch"
-            echo "dist: $dist"
-            echo "source: $source"
-            echo "repo: $repo"
-            echo "appendversion: $appendversion"
-
-            sudo rm -f *.changes repo work /etc/apt/sources.list.d/local.list
-            # build a source repo for apt-get build-dep
-            mkdir repo && cd repo
-            dget -q -d -u $source
-            dpkg-scansources . /dev/null > Sources.gz
-            echo "deb-src file:$(pwd) /" > local.list
-            echo "deb http://repo.linaro.org/ubuntu/linaro-overlay ${dist} main" >> local.list
-            if [ "${repo}" != "linaro-overlay" ]; then
-                echo "deb http://repo.linaro.org/ubuntu/${repo} ${dist} main" >> local.list
-            fi
-            sudo cp local.list /etc/apt/sources.list.d/
-            if [ "$dist == jessie" ]
-            then
-               cat > backports.pref <<EOF
-            Package: *
-            Pin: release a=jessie-backports
-            Pin-Priority: 500
-            EOF
-               sudo cp backports.pref /etc/apt/preferences.d/
-            fi
-            cd ..
-            localdsc=`echo $source|sed -e "s,.*/,$(pwd)/repo/,"`
-            sourcename=`basename ${localdsc}|sed -e 's,_.*,,'`
-
-            dpkg-source -x ${localdsc} work/
-            # Verify entries
-            cd work
-            dpkg-parsechangelog
-            maint=`dpkg-parsechangelog -SMaintainer`
-            if [[ $maint != *linaro* ]]; then
-               echo "Error, not a linaro maintainer: $maint"
-               exit 1
-            fi
-            echo email=$maint >> repo.parameters
-            change=`dpkg-parsechangelog -SChanges`
-            case $change in
-                *Initial*release*)
-                    deltatype="new package"
-                    ;;
-                *Backport*from*)
-                    deltatype="backport"
-                    ;;
-                *Added*patch*)
-                    deltatype="patched"
-                    ;;
-                *Upstream*snapshot*)
-                    deltatype="snapshot"
-                    ;;
-                *HACK*)
-                    deltatype="hack"
-                    ;;
-                *)
-                    deltatype="other"
-                    ;;
-            esac
-            # Changelog update
-            if [ "$appendversion" = "true" ]; then
-               dch --force-distribution -m -D $dist -llinaro$dist "Linaro CI build: $deltatype"
-            elif [ `dpkg-parsechangelog -SDistribution` != $dist ]
-               echo "wrong distribution in changelog, setting to: $dist"
-               dch --force-distribution -m -D $dist -a "Linaro CI: set distribution to $dist"
-            fi
-            
-            export DEBIAN_FRONTEND=noninteractive
-            sudo apt-get update -q||true
-            sudo apt-get install -q --no-install-recommends -y build-essential fakeroot
-            sudo apt-get build-dep -q --no-install-recommends -y ${sourcename}
-
-            $personality dpkg-buildpackage -rfakeroot -j`getconf _NPROCESSORS_ONLN` $buildpackage_params
-            cd ..
-
-            ls -l .
-            change=`echo *changes`
-            if [ ! -r $change ]
-            then
-                echo "no changes file"
-                exit 1
-            else
-                cat $change
-            fi
-            exit 0 # avoid uploads during testing
-            cat > repo.parameters << EOF
-            build_success=true
-            pkg_job_name=${JOB_NAME}
-            key_id=B86C70FE
-            pkg_changes=${change}
-            host_ppa=${repo}
-            pkg_job_url=${JOB_URL}
-            email=$maint
-            EOF
-    publishers:
-        - copy-to-master:
-            includes:
-                - '*.changes, *.dsc, *.gz, *.bz2, *.xz, *.deb, *.udeb, repo.parameters'
-        - trigger-parameterized-builds:
-            - project: post-build-repo
-              property-file: "label/docker-${codename}-arm64/repo.parameters"
-            - project: post-build-repo
-              property-file: "label/docker-${codename}-armhf/repo.parameters"
-            - project: post-build-repo
-              property-file: "label/docker-${codename}-amd64/repo.parameters"
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/build-package.yaml b/build-package.yaml
deleted file mode 100644
index 8f355d01a7..0000000000
--- a/build-package.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-- job:
-    name: build-package
-    description: See https://wiki.linaro.org/Platform/Systems/Repository
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: codename
-            default: 'jessie'
-            description: 'distribution codename targeted: jessie or xenial'
-        - string:
-            name: source
-            description: 'dsc source url or filename'
-        - string:
-            name: repo
-            description: 'repository to upload to'
-            default: 'linaro-staging'
-        - bool:
-            name: appendversion
-            description: 'append version with linaro$dist'
-            default: 'true'
-        - bool:
-            name: backport
-            description: 'mark as backport'
-            default: 'false'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-amd64
-                - docker-jessie-arm64
-    disabled: true
-    node: master
-    display-name: 'Build package'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="codename"}: ${ENV,var="source"}'
-    builders:
-        - shell:
-            !include-raw: build-package/builders.sh
-    publishers:
-        - copy-to-master:
-            includes:
-                - '*.changes, *.dsc, *.gz, *.bz2, *.xz, *.deb, *.udeb, *.buildinfo, repo.parameters'
-        - trigger-parameterized-builds:
-            - project: post-build-repo
-              property-file: "label/docker-${codename}-arm64/repo.parameters"
-            - project: post-build-repo
-              property-file: "label/docker-${codename}-armhf/repo.parameters"
-            - project: post-build-repo
-              property-file: "label/docker-${codename}-amd64/repo.parameters"
-        - email-ext:
-            recipients: '$DEFAULT_RECIPIENTS, packages@lists.linaro.org'
-            attach-build-log: true
-            failure: true
-            still-failing: true
-            subject: 'build-package: ${ENV,var="source"} failed'
-            matrix-trigger: only-configurations
-            body: |
-                Build ${BUILD_NUMBER} for ${ENV,var="source"} failed on ${ENV,var="codename"}
-                Build Log: ${BUILD_URL}/consoleText
-                Build URL: ${BUILD_URL}
-            send-to:
-                - requester
-        - email-ext:
-            recipients: packages@lists.linaro.org
-            attach-build-log: true
-            success: true
-            subject: 'build-package: ${ENV,var="source"} ${BUILD_STATUS}'
-            matrix-trigger: only-parent
-            body: |
-                Build ${BUILD_NUMBER} for ${ENV,var="source"} ${BUILD_STATUS} on ${ENV,var="codename"}
-                Build Log: ${BUILD_URL}/consoleText
-                Build URL: ${BUILD_URL}
diff --git a/build-package/upload-deb.sh b/build-package/upload-deb.sh
new file mode 100644
index 0000000000..28b9a782b8
--- /dev/null
+++ b/build-package/upload-deb.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -ex
+echo "source: $source"
+echo "zip: $zip"
+echo "repo: $repo"
+incoming=/var/lib/machines/obs/srv/repos/${repo}/mini-dinstall/incoming/
+
+rm -rf tmp/
+mkdir -p tmp
+cd tmp
+if [ "$zip" == "false" ]
+then
+    dget -q -d -u $source
+    sourcename=`basename $source|sed -e 's,_.*,,'`
+    echo "will upload to repo: $repo $sourcename"
+    cp * $incoming
+else
+    wget -O artifact.zip $source
+    unzip artifact.zip
+    cp debian/output/* $incoming
+fi
+
+/usr/bin/mini-dinstall -v --batch --config=/home/buildslave/.mini-dinstall-${repo}.conf
+
diff --git a/build-rpm-obs.yaml b/build-rpm-obs.yaml
index 1befb226da..5a983c25d9 100644
--- a/build-rpm-obs.yaml
+++ b/build-rpm-obs.yaml
@@ -10,13 +10,13 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
                 - job-cancel
-    node: docker-jessie-amd64
-    disabled: false
+    node: docker-buster
+    disabled: true
     display-name: 'Build RPM packages in OBS'
     parameters:
         - string:
diff --git a/build-rpm.yaml b/build-rpm.yaml
deleted file mode 100644
index a282f98030..0000000000
--- a/build-rpm.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- job:
-    name: build-rpm
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    node: master
-    disabled: true
-    display-name: 'Build RPM packages'
-    parameters:
-        - string:
-            name: codename
-            default: centos-7
-            description: 'distribution codename targeted: fedora-23 or centos-7'
-        - string:
-            name: source
-            description: 'url to src.rpm'
-        - string:
-            name: repo
-            description: 'repository to upload to'
-            default: 'linaro-staging'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-centos7-aarch64
-                - docker-fedora23-aarch64
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-            cat > repo.parameters << EOF
-            build_success=false
-            EOF
-
-            . /etc/os-release
-            dist=${ID}-${VERSION_ID}
-            [ ${codename} = ${dist} ]||exit 0
-
-            sudo yum install -y wget yum-utils
-            sudo wget http://repo.linaro.org/rpm/linaro-overlay/${dist}/linaro-overlay.repo -O /etc/yum.repos.d/linaro-overlay.repo
-            if [ "${repo}" != "linaro-overlay" ]; then
-                sudo wget http://repo.linaro.org/rpm/${repo}/${dist}/${repo}.repo -O /etc/yum.repos.d/${repo}.repo
-            fi
-
-            sudo yum groupinstall -y "Development tools"
-            wget --progress=dot -e dotbytes=2M $source
-            sourcefile="*.src.rpm"
-            sudo yum-builddep -y $sourcefile
-            rpmbuild --rebuild $sourcefile
-            cp ~/rpmbuild/RPMS/*/*.rpm .
-
-            cat > repo.parameters << EOF
-            build_success=true
-            pkg_job_name=${JOB_NAME}
-            repo=${repo}
-            dist=${dist}
-            EOF
-    publishers:
-        - copy-to-master:
-            includes:
-                - '*.rpm, repo.parameters'
-        - trigger-parameterized-builds:
-            - project: post-build-rpm
-              property-file: "label/docker-centos7-aarch64/repo.parameters"
-            - project: post-build-rpm
-              property-file: "label/docker-fedora23-aarch64/repo.parameters"
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/check-lava-status.yaml b/check-lava-status.yaml
deleted file mode 100644
index e2e7d5aa36..0000000000
--- a/check-lava-status.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-- job:
-    name: check-lava-status
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 90
-        numToKeep: 90
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: LAVA_JOB_ID_POOL
-            default: ''
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: master
-    display-name: 'Check LAVA job status'
-    triggers:
-        - timed: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-    publishers:
-        - groovy-postbuild: |
-            import groovy.net.xmlrpc.*
-
-            void log(msg) {
-                manager.listener.logger.println(msg)
-            }
-
-            def job = hudson.model.Hudson.instance.getItem("check-lava-status")
-            def property = job.getProperty(hudson.model.ParametersDefinitionProperty.class)
-            def parameter = property.getParameterDefinition("LAVA_JOB_ID_POOL")
-            def lavaJobIdPool = parameter.getDefaultValue().tokenize()
-            def lavaJobIdPoolClone = lavaJobIdPool.clone()
-            def lavaUser = property.getParameterDefinition("LAVA_USER").getDefaultValue()
-            def lavaToken = property.getParameterDefinition("LAVA_TOKEN").getDefaultValue()
-
-            lavaJobIdPool.each {
-                def pblJob = hudson.model.Hudson.instance.getItem("post-build-lava")
-                def variables = pblJob.getBuildByNumber(it.toInteger()).getBuildVariables()
-                def lavaServer = variables.LAVA_SERVER
-                def lavaJobId = variables.LAVA_JOB_ID
-                def buildUrl = variables.BUILD_JOB.tokenize("/")
-                def buildName = buildUrl[4]
-                if (buildUrl.size() == 7) {
-                    buildName +=  "/" + buildUrl[5]
-                }
-                def buildNumber = buildUrl.last().toInteger()
-                def build = hudson.model.Hudson.instance.getItemByFullName(buildName).getBuildByNumber(buildNumber)
-
-                def lavaLab = new XMLRPCServerProxy("https://${lavaServer}")
-                lavaLab.setBasicAuth(lavaUser, lavaToken)
-                def response = lavaLab.invokeMethod("scheduler.job_status", [lavaJobId])
-                log response
-                switch (response.job_status) {
-                    case ["Complete", "Incomplete", "Canceled"]:
-                        lavaJobIdPoolClone.remove(it)
-                        log "LAVA job removed: " + lavaJobId
-                        // update build job information (badge, shortText, description)
-                        description = build.getDescription()
-                        description = description.replaceAll(">${lavaJobId}<", ">${lavaJobId} - ${response.job_status}<")
-                        build.setDescription(description)
-                        break
-                }
-            }
-
-            lavaJobIdPool = lavaJobIdPoolClone.join(" ")
-            parameter.setDefaultValue(lavaJobIdPool)
-            job.save()
-#            classpath:
-#                - "/usr/share/groovy/lib/groovy-xmlrpc-0.8.jar"
diff --git a/ci-docker-manifests.yaml b/ci-docker-manifests.yaml
deleted file mode 100644
index 709491a5a5..0000000000
--- a/ci-docker-manifests.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- job:
-    name: ci-dockerfiles-manifests
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 90
-            num-to-keep: 200
-    disabled: false
-    node: docker-stretch-amd64
-    display-name: 'CI Dockerfiles manifests update'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - shell:
-            !include-raw: ci-dockerfiles-manifests/builders.sh
-    publishers:
-        - email:
-            recipients: riku.voipio@linaro.org, fathi.boudra@linaro.org
diff --git a/ci-dockerfile-build-test.yaml b/ci-dockerfile-build-test.yaml
new file mode 100644
index 0000000000..962acd7efc
--- /dev/null
+++ b/ci-dockerfile-build-test.yaml
@@ -0,0 +1,47 @@
+- job:
+    name: ci-dockerfile-build-test
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 200
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+              - "ci-docker.*"
+            block-level: 'NODE'
+    disabled: false
+    display-name: 'Build docker image'
+    parameters:
+        - string:
+            name: image
+            description: 'docker image to build'
+        - label:
+            name: nodelabel
+            description: 'build machine'
+        - file:
+            name: uploadimage
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: DOCKER_AUTH
+                variable: DOCKER_AUTH
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            curl -L -o ${WORKSPACE}/config.json https://ci.linaro.org/userContent/config.json --fail
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/build-image-test.sh
+    publishers:
+        - email:
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/ci-dockerfile-build.yaml b/ci-dockerfile-build.yaml
new file mode 100644
index 0000000000..0a0b6c975d
--- /dev/null
+++ b/ci-dockerfile-build.yaml
@@ -0,0 +1,45 @@
+- job:
+    name: ci-dockerfile-build
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 200
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+              - "ci-docker.*"
+            block-level: 'NODE'
+    disabled: false
+    display-name: 'Build docker image'
+    parameters:
+        - string:
+            name: image
+            description: 'docker image to build'
+        - label:
+            name: nodelabel
+            description: 'build machine'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: DOCKER_AUTH
+                variable: DOCKER_AUTH
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            curl -L -o ${WORKSPACE}/config.json https://ci.linaro.org/userContent/config.json --fail
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/build-image.sh
+    publishers:
+        - email:
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/ci-dockerfiles-base.yaml b/ci-dockerfiles-base.yaml
deleted file mode 100644
index ab481e76f1..0000000000
--- a/ci-dockerfiles-base.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- job:
-    name: ci-dockerfiles-base
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 90
-            num-to-keep: 200
-    disabled: false
-    node: build-arm64
-    display-name: 'CI Dockerfiles build/publish base images'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/dockerfiles.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-                rm -rf ${HOME}/.docker
-            }
-
-            mkdir -p ${HOME}/.docker
-            sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-            chmod 0600 ${HOME}/.docker/config.json
-
-            # FIXME: include all the variants (centos, fedora, etc...)
-            for arch in arm64 armhf; do
-              for distro in debian ubuntu; do
-                if [ "${distro}" == "debian" ]; then
-                  suite=stretch
-                  mirror=http://deb.debian.org/debian
-                fi
-                if [ "${distro}" == "ubuntu" ]; then
-                  suite=xenial
-                  mirror=http://ports.ubuntu.com
-                fi
-                sudo debootstrap --arch=${arch} --variant=minbase ${suite} base-${arch}-${distro}-${suite} ${mirror}
-                sudo rm -rf base-arm*/var/lib/apt/lists/* base-arm*/tmp/* base-arm*/var/tmp/*
-                sudo tar -C base-${arch}-${distro}-${suite} -c . | docker import - linaro/base-${arch}-${distro}:${suite}
-                sudo rm -rf base-${arch}-${distro}-${suite}
-                docker push linaro/base-${arch}-${distro}:${suite}
-              done
-            done
diff --git a/ci-dockerfiles-deployment.yaml b/ci-dockerfiles-deployment.yaml
index 8192546112..aa9a5a768b 100644
--- a/ci-dockerfiles-deployment.yaml
+++ b/ci-dockerfiles-deployment.yaml
@@ -6,16 +6,32 @@
         - authorization:
             anonymous:
                 - job-discover
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
         - build-discarder:
             days-to-keep: 90
             num-to-keep: 200
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+              - "ci-docker.*"
+            block-level: 'NODE'
     disabled: false
     node: master
     concurrent: false
     display-name: 'CI Dockerfiles build/publish deployment'
+    scm:
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: dockerfiles
     triggers:
         - gerrit:
             server-name: 'review.linaro.org'
@@ -41,27 +57,26 @@
         sequential: false
     wrappers:
         - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
         - credentials-binding:
             - text:
                 credential-id: DOCKER_AUTH
                 variable: DOCKER_AUTH
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id to clone dev-private-git.l.o/tcwg/llvm-config repo for *-tcwg-llvmbot-* images.
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
     builders:
         - shell: |
             #!/bin/bash -e
+            curl -L -o ${WORKSPACE}/config.json https://ci.linaro.org/userContent/config.json --fail
+        - shell: |
+            #!/bin/bash -e
             echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
         - build-name-setter:
             name: 'version.txt'
             file: true
         - shell:
             !include-raw: ci-dockerfiles-deployment/builders.sh
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/publish.sh
     publishers:
+        - trigger:
+            project: 'ci-dockerslaves-cleanup'
         - email:
-            recipients: riku.voipio@linaro.org, fathi.boudra@linaro.org
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/ci-dockerfiles-deployment/build-image-test.sh b/ci-dockerfiles-deployment/build-image-test.sh
new file mode 100644
index 0000000000..71a77bef88
--- /dev/null
+++ b/ci-dockerfiles-deployment/build-image-test.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+env|sort
+ls -lart
diff --git a/ci-dockerfiles-deployment/build-image.sh b/ci-dockerfiles-deployment/build-image.sh
new file mode 100644
index 0000000000..36816ccc6c
--- /dev/null
+++ b/ci-dockerfiles-deployment/build-image.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+set -ex
+
+# setup file descriptor for flock to use
+exec 4<>/var/lock/ci-docker.lck
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    flock -u 4
+    rm -rf ${HOME}/.docker dockerfiles
+}
+
+mkdir -p ${HOME}/.docker
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+chmod 0600 ${HOME}/.docker/config.json
+
+rm -rf dockerfiles/
+git clone --depth 1 https://git.linaro.org/ci/dockerfiles.git
+
+cd dockerfiles/${image}/
+# set a lock to prevent simultaneous runs from clobbering
+# our docker buildspace
+flock -x 4
+if ! ./build.sh; then
+    echo "=== FAIL: ${image} ==="
+    exit 1
+fi
+
+# now we have image name in .docker-tag
+if [ -r .docker-tag ]; then
+    docker_tag=$(cat .docker-tag)
+    docker push ${docker_tag}
+fi
diff --git a/ci-dockerfiles-deployment/builders.sh b/ci-dockerfiles-deployment/builders.sh
index 7f7d1e6aeb..958910dcdd 100644
--- a/ci-dockerfiles-deployment/builders.sh
+++ b/ci-dockerfiles-deployment/builders.sh
@@ -2,33 +2,20 @@
 
 set -ex
 
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
 echo ""
 echo "########################################################################"
 echo "    Gerrit Environment"
 env |grep '^GERRIT'
 echo "########################################################################"
 
-rm -rf ${WORKSPACE}/*
-
-git clone -b ${GERRIT_BRANCH} --depth 2 https://review.linaro.org/${GERRIT_PROJECT}
-cd *
+rm -f ${WORKSPACE}/log
+cd dockerfiles/
 
 git_previous_commit=$(git rev-parse HEAD~1)
 git_commit=$(git rev-parse HEAD)
 files=$(git diff --name-only ${git_previous_commit} ${git_commit})
 echo Changes in: ${files}
-changed_dirs=$(dirname ${files})
+changed_dirs=$(dirname ${files}|sort -u)
 
 update_images=""
 for dir in ${changed_dirs}; do
@@ -45,6 +32,9 @@ for dir in ${changed_dirs}; do
       # images to the list.
       update_images="${update_images} $(dirname $(find . -path "*-${dir_basename}*/build.sh" | sed -e "s#^\./##g"))"
       ;;
+  ".")
+      continue
+      ;;
     *)
       update_images="${update_images} $(dirname $(find ${dir} -name build.sh))"
       ;;
@@ -72,7 +62,7 @@ for image in ${update_images}; do
     "skip:"*)
       echo "Skipping: don't need to build ${image} on branch ${GERRIT_BRANCH}"
       ;;
-    "no:amd64:amd64"|"no:amd64:i386"|"no:arm64:arm64"|"no:arm64:armhf")
+    "no:amd64:amd64"|"no:amd64:i386"|"no:arm64:arm64"|"no:armhf:armhf"|"no:arm64:armhf")
       echo "=== Start build: ${image} ==="
       ./build.sh || echo "=== FAIL: ${image} ===" >> ${WORKSPACE}/log
       ;;
@@ -80,21 +70,6 @@ for image in ${update_images}; do
       echo "Skipping: can't build for ${image_arch} on ${host_arch}"
       ;;
   esac
-  if [ -r .docker-tag ]; then
-    docker_tag=$(cat .docker-tag)
-    if [ x"${GERRIT_BRANCH}" != x"master" ]; then
-      new_tag=${docker_tag}-${GERRIT_BRANCH}
-      docker tag ${docker_tag} ${new_tag}
-      docker_tag=${new_tag}
-    fi
-    docker push ${docker_tag}
-  fi
   )||echo $image failed >> ${WORKSPACE}/log
 done
 
-if [ -e ${WORKSPACE}/log ]
-then
-    echo "some images failed:"
-    cat ${WORKSPACE}/log
-    exit 1
-fi
diff --git a/ci-dockerfiles-deployment/cleanup-update.sh b/ci-dockerfiles-deployment/cleanup-update.sh
new file mode 100644
index 0000000000..844f4afc51
--- /dev/null
+++ b/ci-dockerfiles-deployment/cleanup-update.sh
@@ -0,0 +1,51 @@
+#!/bin/bash -e
+
+# implement locking by using a file descriptor so we
+# can run the rest of the script instead of trying flock
+# for each docker command
+exec 4<>/var/lock/ci-docker.lck
+
+RETRIES=3
+SLEEP=300
+LOCKED=1
+
+# Here we want an exclusive lock and for flock to exit immediately
+# if it can't secure the lock so we can proceed to next attempt.
+while [ $RETRIES -gt 0 ]; do
+    flock -n -x 4
+    LOCKED=$?
+    if [ $LOCKED -ne 0 ]; then
+        RETRIES=$((RETRIES-1))
+        echo "Couldn't lock /var/lock/ci-docker.lck.  Retries left: $RETRIES"
+        sleep $SLEEP
+    else
+        echo "Lock on /var/lock/ci-docker.lck acquired."
+        RETRIES=0
+    fi
+done
+
+if [ $LOCKED -ne 0 ]; then
+    echo "Failed to acquire lock on /var/lock/ci-docker.lck"
+    exit $LOCKED
+fi
+
+for image in $(docker images|grep tcwg|grep -v none|grep -v hours|awk '{ print $1":"$2}');
+do
+    echo delete: $image;
+    docker rmi $image;
+done
+
+for image in $(docker images|grep linaro|grep -v none|awk '{ print $1":"$2}');
+do
+    echo update: $image:
+    if ! docker pull $image
+    then
+        echo could not fetch image from dockerhub, delete
+        docker rmi $image||true
+    fi
+done
+
+echo cleaning up
+docker system prune -f
+
+flock -u 4
diff --git a/ci-dockerfiles-deployment/publish.sh b/ci-dockerfiles-deployment/publish.sh
new file mode 100644
index 0000000000..9d71f3e28b
--- /dev/null
+++ b/ci-dockerfiles-deployment/publish.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -rf ${HOME}/.docker
+    rm -f ${WORKSPACE}/{log,config.json,version.txt}
+}
+
+docker_log_in()
+{
+    mkdir -p ${HOME}/.docker
+    sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+    chmod 0600 ${HOME}/.docker/config.json
+}
+
+update_images=$(find -type f -name .docker-tag)
+docker_log_in
+for imagename in ${update_images}; do
+  (
+    docker_tag=$(cat $imagename)
+    if [ x"${GERRIT_BRANCH}" != x"master" ]; then
+      new_tag=${docker_tag}-${GERRIT_BRANCH}
+      docker tag ${docker_tag} ${new_tag}
+      docker_tag=${new_tag}
+    fi
+    for i in 30 60 120;
+    do
+        docker push ${docker_tag} && exit 0 || true
+        sleep $i
+        docker_log_in
+    done
+    exit 1
+  )||echo $imagename push failed >> ${WORKSPACE}/log
+done
+
+if [ -e ${WORKSPACE}/log ]
+then
+    echo "some images failed:"
+    cat ${WORKSPACE}/log
+    exit 1
+fi
diff --git a/ci-dockerfiles-deployment/report.sh b/ci-dockerfiles-deployment/report.sh
new file mode 100644
index 0000000000..fe0ac53d99
--- /dev/null
+++ b/ci-dockerfiles-deployment/report.sh
@@ -0,0 +1,32 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -rf ${HOME}/.docker
+    rm -f ${WORKSPACE}/{log,config.json,version.txt}
+}
+
+update_images=$(find -type f -name .docker-tag)
+
+for imagename in ${update_images}; do
+  (
+    docker_tag=$(cat $imagename)
+    if [ x"${GERRIT_BRANCH}" != x"master" ]; then
+      new_tag=${docker_tag}-${GERRIT_BRANCH}
+      docker tag ${docker_tag} ${new_tag}
+      docker_tag=${new_tag}
+    fi
+    echo successful build ${docker_tag}
+  )
+done
+
+if [ -e ${WORKSPACE}/log ]
+then
+    echo "some images failed:"
+    cat ${WORKSPACE}/log
+    exit 1
+fi
diff --git a/ci-dockerfiles-deployment/update-images.sh b/ci-dockerfiles-deployment/update-images.sh
new file mode 100755
index 0000000000..5fd3a3dfdc
--- /dev/null
+++ b/ci-dockerfiles-deployment/update-images.sh
@@ -0,0 +1,43 @@
+#!/bin/bash -e
+
+rm -f docker_*_build.txt
+cd dockerfiles/
+
+images_to_update=""
+
+# find out which images haven't had any commits in the last 30 days
+
+for dir in ./*/; do
+    shortdir=$(basename $dir)
+    # Skip toolchain images
+    echo $shortdir|grep -q tcwg && continue
+    # not an image dir
+    [ -x $shortdir/build.sh ]||continue
+    changed=$(git log -1 --oneline --since "1 month" ${shortdir}|wc -l)
+    if [ $changed -eq 1 ]; then
+        echo "new: $shortdir"
+    else
+        echo "nothing new: $shortdir"
+        images_to_update="$images_to_update $shortdir"
+    fi
+done
+
+echo $images_to_update
+
+# trigger builds for every non-updated image over the http api
+for image in $images_to_update
+do
+    arch=$(echo ${image} | cut -f2 -d '-')
+    if [ "$arch" = "aarch64" ]; then
+        arch=arm64
+    fi
+    if [ "$arch" = "amd64" -o "$arch" = "arm64" -o "$arch" = "armhf" ]; then
+        cat > ../docker_${image}_build.txt << EOF
+nodelabel=build-${arch}
+image=${image}
+EOF
+    else
+        echo "unknown arch: $arch in $image"
+    fi
+done
+
diff --git a/ci-dockerfiles-manifests/builders.sh b/ci-dockerfiles-manifests/builders.sh
deleted file mode 100644
index f32f9367d3..0000000000
--- a/ci-dockerfiles-manifests/builders.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-if ! sudo apt-get -q=2 update; then
-  echo "INFO: apt update error - try again in a moment"
-  sleep 15
-  sudo apt-get -q=2 update || true
-fi
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y manifest-tool; then
-  echo "INFO: apt install error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y manifest-tool
-fi
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-rm -rf ${WORKSPACE}/*
-
-git clone --depth 1 https://git.linaro.org/ci/docker-manifests.git
-cd docker-manifests
-for manifest in *.yaml; do
-  manifest-tool push from-spec ${manifest}
-done
diff --git a/ci-dockerfiles-monthly.yaml b/ci-dockerfiles-monthly.yaml
new file mode 100644
index 0000000000..d0e8b7b7a4
--- /dev/null
+++ b/ci-dockerfiles-monthly.yaml
@@ -0,0 +1,39 @@
+- job:
+    name: ci-dockerfiles-monthly
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 200
+    disabled: false
+    display-name: 'CI docker image monthly rebuild'
+    triggers:
+        - timed: '@monthly'
+    scm:
+        - git:
+            url: https://git.linaro.org/ci/dockerfiles.git
+            basedir: dockerfiles
+            skip-tag: true
+            clean:
+                before: true
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/update-images.sh
+        - trigger-builds:
+            - project: ci-dockerfile-build
+              parameter-factories:
+                - factory: filebuild
+                  file-pattern: docker_*_build.txt
+    publishers:
+        - email:
+            recipients: systems@linaro.org
diff --git a/ci-dockerfiles-sanity-check.yaml b/ci-dockerfiles-sanity-check.yaml
new file mode 100644
index 0000000000..10b49aeea6
--- /dev/null
+++ b/ci-dockerfiles-sanity-check.yaml
@@ -0,0 +1,76 @@
+- job:
+    name: ci-dockerfiles-sanity-check
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 200
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+              - "ci-docker.*"
+            block-level: 'NODE'
+    disabled: false
+    node: master
+    concurrent: false
+    display-name: 'CI Dockerfiles sanity check'
+    scm:
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: dockerfiles
+    triggers:
+        - gerrit:
+            server-name: 'review.linaro.org'
+            trigger-on:
+                - patchset-created-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'ci/dockerfiles'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'master'
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: 'tcwg**'
+            silent-start: true
+    axes:
+        - axis:
+            type: slave
+            name: label
+            values:
+                - build-amd64
+                - build-arm64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+        - shell: |
+            #!/bin/bash -e
+            curl -L -o ${WORKSPACE}/config.json https://ci.linaro.org/userContent/config.json --fail
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/builders.sh
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/report.sh
+    publishers:
+        - email:
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/ci-dockerslaves-cleanup.yaml b/ci-dockerslaves-cleanup.yaml
new file mode 100644
index 0000000000..563ba26141
--- /dev/null
+++ b/ci-dockerslaves-cleanup.yaml
@@ -0,0 +1,50 @@
+- job:
+    name: ci-dockerslaves-cleanup
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 20
+            num-to-keep: 50
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+              - "ci-docker.*"
+            block-level: 'NODE'
+            queue-scanning: 'ALL'
+    disabled: false
+    node: master
+    concurrent: false
+    display-name: 'CI docker cleanup and image update'
+    triggers:
+        - timed : '20 20 * * *'
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - aarch64-09
+                - aosp-x86_64-09
+                - aosp-x86_64-10
+                - x86_64-11
+                - x86_64-12
+                - x86_64-13
+                - x86_64-14
+                - x86_64-15
+                - x86_64-16
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: ci-dockerfiles-deployment/cleanup-update.sh
+    publishers:
+        - email:
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/ci-job-configs-sanity-check.yaml b/ci-job-configs-sanity-check.yaml
index 76e79c73eb..ef2ddaa90d 100644
--- a/ci-job-configs-sanity-check.yaml
+++ b/ci-job-configs-sanity-check.yaml
@@ -11,8 +11,20 @@
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: master
+    node: triggers
     display-name: 'CI job configs sanity check'
+    concurrent: false
+    scm:
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: configs
     triggers:
         - gerrit:
             server-name: 'review.linaro.org'
@@ -44,12 +56,7 @@
             env |grep '^GERRIT'
             echo "########################################################################"
 
-            rm -rf ${WORKSPACE}/*
-
-            git clone -b ${GERRIT_BRANCH} --depth 2 https://review.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
+            cd configs/
 
             # FIXME run-jjb.py was meant to be used for deployment only
             # use JJB 'test' command instead of 'update' command
@@ -58,7 +65,7 @@
             export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
             export GIT_COMMIT=${GERRIT_PATCHSET_REVISION}
             jenkins-jobs --version
-            python run-jjb.py
+            python3 run-jjb.py
     publishers:
         - email:
-            recipients: 'fathi.boudra@linaro.org ben.copeland@linaro.org'
+            recipients: 'linaro-infrastructure-errors@lists.linaro.org'
diff --git a/ci-ssh-cleanup.yaml b/ci-ssh-cleanup.yaml
new file mode 100644
index 0000000000..0d3b1678cb
--- /dev/null
+++ b/ci-ssh-cleanup.yaml
@@ -0,0 +1,23 @@
+- job:
+    name: ci-ssh-cleanup
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+    node: master
+    display-name: 'CI clean stray ssh-agents on master'
+    triggers:
+        - timed : '@daily'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            pids=$(ps -eo pid,etime,comm,user,tty|grep ssh-agent |awk '$2~/-/ {if ($2>4) print $1}')
+            [ -z "$pids" ] || kill $pids
+    publishers:
+        - email:
+            recipients: 'linaro-infrastructure-errors@lists.linaro.org'
diff --git a/ci-terraform-sanity-check.yaml b/ci-terraform-sanity-check.yaml
new file mode 100644
index 0000000000..6f41f578a1
--- /dev/null
+++ b/ci-terraform-sanity-check.yaml
@@ -0,0 +1,60 @@
+- job:
+    name: ci-terraform-sanity-check
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: build-amd64
+    display-name: 'CI terraform sanity check'
+    scm:
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: terraform
+    triggers:
+        - gerrit:
+            server-name: 'review.linaro.org'
+            trigger-on:
+                - patchset-created-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'infrastructure/terraform'
+                  branches:
+                    - branch-pattern: 'master'
+            silent-start: true
+    wrappers:
+        - timestamps
+        - ansicolor
+        - credentials-binding:
+            - amazon-web-services:
+                credential-id: TERRAFORM_BOT
+                access-key: AWS_ACCESS_KEY_ID
+                secret-key: AWS_SECRET_ACCESS_KEY
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - shell:
+            !include-raw: ci-terraform-sanity-check/builders.sh
+
+    publishers:
+        - email:
+            recipients: 'infrastructure-errors@lists.linaro.org'
diff --git a/ci-terraform-sanity-check/builders.sh b/ci-terraform-sanity-check/builders.sh
new file mode 100644
index 0000000000..7fc818f91c
--- /dev/null
+++ b/ci-terraform-sanity-check/builders.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+update_terraform()
+{
+    export TFVERS=0.11.15
+    mkdir -p ̃~/.local/bin
+    if [ ! -x ~/.local/bin/terraform_${TFVERS} ]
+    then
+        (
+        cd /tmp
+        wget -q https://releases.hashicorp.com/terraform/${TFVERS}/terraform_${TFVERS}_linux_amd64.zip
+        unzip -o terraform_${TFVERS}_linux_amd64.zip
+        cp terraform ~/.local/bin/terraform_${TFVERS}
+        chmod a+x ~/.local/bin/terraform_${TFVERS}
+        ln -sf terraform_${TFVERS}  ~/.local/bin/terraform
+        )
+    fi
+}
+
+set -e
+
+cd terraform/
+topdir=$(pwd)
+export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
+export GIT_COMMIT=${GERRIT_PATCHSET_REVISION}
+files=$(git diff --name-only ${GIT_PREVIOUS_COMMIT} ${GIT_COMMIT})
+echo Changes in: ${files}
+changed_dirs=$(dirname ${files}|uniq)
+export AWS_ACCESS_KEY_ID
+export AWS_SECRET_ACCESS_KEY
+export PATH=${PATH}:${HOME}/.local/bin
+
+update_terraform
+
+for dir in ${changed_dirs}; do
+    [ "${dir}" = "." ] && continue
+    if [[ ${dir} == modules* ]]; then
+        echo "skipping module dir ${dir}"
+        continue
+    fi
+    cd $topdir/$dir
+    echo "================= $dir =========================="
+    if ! compgen -G "*.tf" > /dev/null; then
+        echo "no terraform files in this directory, skipping"
+        continue
+    fi
+    if grep -q scaleway *.tf; then
+        echo "skipping scaleway validation for now"
+        continue
+    fi
+    if compgen -G "*.tfvars" > /dev/null; then
+        echo "adding vars files to commandline"
+        vars="--var-file *.tfvars"
+    else
+        vars=""
+    fi
+    terraform init > /dev/null
+    terraform plan $vars -out demo.plan
+    terraform 0.12checklist
+done
+
diff --git a/ci-yadp-builder-sanity-check.yaml b/ci-yadp-builder-sanity-check.yaml
deleted file mode 100644
index fc49d3f7ab..0000000000
--- a/ci-yadp-builder-sanity-check.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- job:
-    name: ci-yadp-builder-sanity
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'CI YADP config builder sanity check'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'infrastructure/ci-yadp-builder'
-                  branches:
-                    - branch-pattern: 'master'
-            silent-start: true
-    wrappers:
-        - timestamps
-        - credentials-binding:
-            - text:
-                credential-id: JJB_USER
-                variable: JJB_USER
-            - text:
-                credential-id: JJB_PASSWORD
-                variable: JJB_PASSWORD
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            echo ""
-            echo "########################################################################"
-            echo "    Gerrit Environment"
-            env |grep '^GERRIT'
-            echo "########################################################################"
-
-            rm -rf ${WORKSPACE}/*
-
-            git clone -b ${GERRIT_BRANCH} --depth 2 https://review.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
-
-            python yadp_builder_v2.py --dryrun
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org ben.copeland@linaro.org'
diff --git a/ci-yadp-builder-sanity.yaml b/ci-yadp-builder-sanity.yaml
new file mode 100644
index 0000000000..2133a9c63b
--- /dev/null
+++ b/ci-yadp-builder-sanity.yaml
@@ -0,0 +1,63 @@
+- job:
+    name: ci-yadp-builder-sanity
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'CI YADP config builder sanity check'
+    triggers:
+        - gerrit:
+            server-name: 'review.linaro.org'
+            trigger-on:
+                - patchset-created-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'infrastructure/ci-yadp-builder'
+                  branches:
+                    - branch-pattern: 'master'
+            silent-start: true
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: JJB_USER
+                variable: JJB_USER
+            - text:
+                credential-id: JJB_PASSWORD
+                variable: JJB_PASSWORD
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - shell: |
+            #!/bin/bash
+
+            set -e
+
+            echo ""
+            echo "########################################################################"
+            echo "    Gerrit Environment"
+            env |grep '^GERRIT'
+            echo "########################################################################"
+
+            rm -rf ${WORKSPACE}/*
+            git clone -b ${GERRIT_BRANCH} --depth 2 https://review.linaro.org/${GERRIT_PROJECT}
+            cd *
+            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+            git checkout -q FETCH_HEAD
+
+            python3 yadp_builder.py --dryrun --server https://ci.linaro.org
+    publishers:
+        - email:
+            recipients: 'linaro-infrastructure-errors@lists.linaro.org'
diff --git a/ci-yadp-builder.yaml b/ci-yadp-builder.yaml
index 69659a36b9..23484b0ed6 100644
--- a/ci-yadp-builder.yaml
+++ b/ci-yadp-builder.yaml
@@ -10,8 +10,7 @@
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 30
-    disabled: true
-    node: master
+    node: triggers
     display-name: 'CI YADP config builder'
     triggers:
         - gerrit:
@@ -52,13 +51,12 @@
             echo "########################################################################"
 
             rm -rf ${WORKSPACE}/*
-
             git clone -b ${GERRIT_BRANCH} --depth 2 https://review.linaro.org/${GERRIT_PROJECT}
             cd *
             git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
             git checkout -q FETCH_HEAD
 
-            python yadp_builder_v2.py
+            python3 yadp_builder.py --server https://ci.linaro.org
     publishers:
         - email:
-            recipients: 'fathi.boudra@linaro.org ben.copeland@linaro.org'
+            recipients: 'linaro-infrastructure-errors@lists.linaro.org'
diff --git a/compass-cobbler.yaml b/compass-cobbler.yaml
deleted file mode 100644
index 5d8e1b41a3..0000000000
--- a/compass-cobbler.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: compass-cobbler
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Compass4NFV OS installer image build/publish'
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/compass-cobbler.git
-            branches:
-                - origin/arm64
-            basedir: compass-cobbler
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    triggers:
-        - pollscm: 'H/30 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: compass/compass-cobbler.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org di.xu@arm.com'
diff --git a/compass-db.yaml b/compass-db.yaml
deleted file mode 100644
index 943ea02c58..0000000000
--- a/compass-db.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: compass-db
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Compass4NFV database image build/publish'
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/compass-db.git
-            branches:
-                - origin/arm64
-            basedir: compass-db
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/30 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: compass/compass-db.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org di.xu@arm.com'
diff --git a/compass-deck.yaml b/compass-deck.yaml
deleted file mode 100644
index 7b096c301b..0000000000
--- a/compass-deck.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: compass-deck
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Compass4NFV API image build/publish'
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/compass-deck.git
-            branches:
-                - origin/arm64
-            basedir: compass-deck
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    triggers:
-        - pollscm: 'H/30 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: compass/compass-deck.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org di.xu@arm.com'
diff --git a/compass-flannel-cni.yaml b/compass-flannel-cni.yaml
deleted file mode 100644
index bcf7f9f17d..0000000000
--- a/compass-flannel-cni.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: compass-flannel-cni
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Compass4NFV flannel-cni image build/publish'
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/flannel-cni.git
-            branches:
-                - origin/arm64
-            basedir: flannel-cni
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/30 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: compass/compass-flannel-cni.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org di.xu@arm.com'
diff --git a/compass-mq.yaml b/compass-mq.yaml
deleted file mode 100644
index dce8db7b23..0000000000
--- a/compass-mq.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: compass-mq
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Compass4NFV amqp image build/publish'
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/compass-mq.git
-            branches:
-                - origin/arm64
-            basedir: compass-mq
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/30 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: compass/compass-mq.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org di.xu@arm.com'
diff --git a/compass-tasks.yaml b/compass-tasks.yaml
deleted file mode 100644
index 219c13e615..0000000000
--- a/compass-tasks.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- scm:
-    name: compass-tasks
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/compass-tasks.git
-            branches:
-                - origin/arm64
-            basedir: compass-tasks
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-
-- scm:
-    name: compass-tasks-k8s
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/compass-tasks-k8s.git
-            branches:
-                - origin/arm64
-            basedir: compass-tasks-k8s
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-
-- job:
-    name: compass-tasks
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Compass4NFV deployment task image build/publish'
-    scm:
-        - compass-tasks
-        - compass-tasks-k8s
-    triggers:
-        - pollscm: 'H/30 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: compass/compass-tasks.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org di.xu@arm.com'
diff --git a/compass/compass-cobbler.sh b/compass/compass-cobbler.sh
deleted file mode 100755
index c3fd6543bd..0000000000
--- a/compass/compass-cobbler.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-docker build -t linaro/compass-cobbler:latest compass-cobbler
-docker push linaro/compass-cobbler:latest
diff --git a/compass/compass-db.sh b/compass/compass-db.sh
deleted file mode 100755
index 297b909f55..0000000000
--- a/compass/compass-db.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-docker build -t linaro/compass-db:latest compass-db
-docker push linaro/compass-db:latest
diff --git a/compass/compass-deck.sh b/compass/compass-deck.sh
deleted file mode 100755
index 88f7f3848b..0000000000
--- a/compass/compass-deck.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-docker build -t linaro/compass-deck:latest compass-deck
-docker push linaro/compass-deck:latest
diff --git a/compass/compass-flannel-cni.sh b/compass/compass-flannel-cni.sh
deleted file mode 100755
index 3c4683abb3..0000000000
--- a/compass/compass-flannel-cni.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-# push linaro/flannel-cni-arm64:v0.2.0
-cd flannel-cni && make
diff --git a/compass/compass-mq.sh b/compass/compass-mq.sh
deleted file mode 100755
index 6a15225738..0000000000
--- a/compass/compass-mq.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-docker build -t linaro/compass-mq:latest compass-mq
-docker push linaro/compass-mq:latest
diff --git a/compass/compass-tasks.sh b/compass/compass-tasks.sh
deleted file mode 100755
index 0d93aaab32..0000000000
--- a/compass/compass-tasks.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -e
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-docker build -t linaro/compass-tasks:latest compass-tasks
-docker push linaro/compass-tasks:latest
-
-docker build -t linaro/compass-tasks-k8s:latest compass-tasks-k8s
-docker push linaro/compass-tasks-k8s:latest
diff --git a/coresight.yaml b/coresight.yaml
deleted file mode 100644
index aa858152ef..0000000000
--- a/coresight.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-- job:
-    name: coresight
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/coresight/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: ROOTFS_BUILD_URL
-            default: 'http://releases.linaro.org/15.03/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20150323-328.rootfs.tar.gz'
-        - string:
-            name: ROOTFS_BUILD_NUMBER
-            default: '328'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Coresight'
-    scm:
-        - git:
-            url: http://git.linaro.org/kernel/coresight.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -f *deb
-              git reset --hard
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export use_config_fragment=1
-            export conf_filenames="arch/arm/configs/${defconfig}_defconfig linaro/configs/coresight.conf"
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${defconfig}" in
-              hisi)
-                export DEVICE_TYPE=d01
-                ;;
-              vexpress)
-                export hwpack_type=vexpress
-                export DEVICE_TYPE=vexpress-tc2
-                ;;
-            esac
-
-            # Create coresight config fragment
-            mkdir -p linaro/configs
-            cat << EOF > linaro/configs/coresight.conf
-            CONFIG_CORESIGHT=y
-            CONFIG_CORESIGHT_LINKS_AND_SINKS=y
-            CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y
-            CONFIG_CORESIGHT_SINK_TPIU=y
-            CONFIG_CORESIGHT_SINK_ETBV10=y
-            CONFIG_CORESIGHT_SOURCE_ETM3X=y
-            CONFIG_LBDAF=y
-            EOF
-
-            test -d lci-build-tools || git clone https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # Publish to snapshots
-            [ "${defconfig}" = "vexpress" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/coresight/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 50G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/coresight/${defconfig}/${BUILD_NUMBER}
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${defconfig}" = "vexpress" ] && HWPACK_BUILD_URL=${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}_*_armhf_supported.tar.gz |xargs basename`
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            ./lci-build-tools/yaml-to-json.py configs/coresight/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'mathieu.poirier@linaro.org fathi.boudra@linaro.org'
diff --git a/davidb-mcuboot.yaml b/davidb-mcuboot.yaml
deleted file mode 100644
index 6d543414a5..0000000000
--- a/davidb-mcuboot.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- job:
-    name: davidb-mcuboot
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    child-workspace: .
-    display-name: 'Zephyr mcuboot'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64-13
-        - axis:
-            type: user-defined
-            name: ZEPHYR_GCC_VARIANT
-            values:
-#                - gccarmemb
-                - zephyr
-        - axis:
-            type: user-defined
-            name: PLATFORM
-            values:
-                - frdm_k64f
-        - axis:
-            type: user-defined
-            name: PROJECT
-            values:
-                - mcuboot
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw: davidb-mcuboot/builders.sh
-        - inject:
-            properties-file: env_var_parameters
-        - build-name-setter:
-            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
-            macro: true
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/${PLATFORM} components/kernel/mcuboot/${ZEPHYR_GCC_VARIANT}/${PROJECT}/${PLATFORM}/${BUILD_NUMBER}
-
-            rm -rf out
-    publishers:
-        - email:
-            recipients: 'david.brown@linaro.org'
diff --git a/davidb-mcuboot/builders.sh b/davidb-mcuboot/builders.sh
deleted file mode 100755
index 7324daa332..0000000000
--- a/davidb-mcuboot/builders.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-sudo apt-get -q=2 update
-sudo apt-get -q=2 -y install ccache cmake g++-multilib gcc-arm-none-eabi git \
-    python-requests python-serial python3-serial python3-ply \
-    python3-yaml socat rsync device-tree-compiler \
-    python3-crypto python3-pyasn1 python3-ecdsa python3-pip
-
-pip3 install --user pyelftools
-
-set -ex
-
-echo "Current directory: "
-pwd
-echo "Environment"
-env
-
-# Build starts out in ${WORKSPACE}
-# Clean any previous runs.
-rm -rf ${WORKSPACE}/zephyr
-rm -rf ${WORKSPACE}/mcuboot
-
-git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools ${HOME}/depot_tools
-PATH=${HOME}/depot_tools:${PATH}
-git clone --depth 1 https://github.com/zephyrproject-rtos/zephyr ${WORKSPACE}/zephyr
-git clone --depth 1 https://github.com/runtimeco/mcuboot ${WORKSPACE}/mcuboot
-# (cd ${WORKSPACE}/mcuboot; git fetch origin pull/85/head; git checkout -b pull85 FETCH_HEAD)
-echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters
-
-# Toolchains are pre-installed and come from:
-# https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-# https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.1/zephyr-sdk-0.9.1-setup.run
-# To install Zephyr SDK: ./zephyr-sdk-0.9.1-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.1"
-
-case "${ZEPHYR_GCC_VARIANT}" in
-  gccarmemb)
-    export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-6-2017-q2-update"
-  ;;
-  zephyr)
-    mkdir -p ${HOME}/opt
-    ln -sf ${HOME}/srv/toolchain/zephyr-sdk-0.9.1 ${HOME}/opt/zephyr-sdk-0.9.1
-    export ZEPHYR_SDK_INSTALL_DIR="${HOME}/opt/zephyr-sdk-0.9.1"
-  ;;
-esac
-
-# Set build environment variables
-LANG=C
-ZEPHYR_BASE=${WORKSPACE}/zephyr
-export ZEPHYR_GCC_VARIANT=zephyr
-PATH=${ZEPHYR_BASE}/scripts:${PATH}
-export LANG ZEPHYR_BASE PATH
-#CCACHE_DIR="${HOME}/srv/ccache"
-#CCACHE_UNIFY=1
-#CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-#USE_CCACHE=1
-#export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS USE_CCACHE
-env |grep '^ZEPHYR'
-
-echo ""
-echo "########################################################################"
-echo "    Build"
-echo "########################################################################"
-
-# make_wrapper=zmake
-# [ "${PROJECT}" = "zephyr.js" ] && make_wrapper=zmake-z.js
-# bash -x ${make_wrapper} ${PROJECT} BOARD=${PLATFORM}
-
-cd ${WORKSPACE}
-source zephyr/zephyr-env.sh
-cd ${WORKSPACE}/mcuboot/samples/zephyr
-make full.bin BOARD=${PLATFORM}
-
-cd ${WORKSPACE}
-mkdir -p out/${PLATFORM}
-# TODO: Get a timestamp or something in this artifact.
-mv mcuboot/samples/zephyr/full.bin ${WORKSPACE}/out/${PLATFORM}
-
-#CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-#CCACHE_DIR=${CCACHE_DIR} ccache -s
diff --git a/ddiaz-aosp.yaml b/ddiaz-aosp.yaml
deleted file mode 100644
index bc12fa205a..0000000000
--- a/ddiaz-aosp.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    name: ddiaz-aosp
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            daniel.diaz@linaro.org:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-configure
-                - job-cancel
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'AOSP build playground for Daniel Diaz'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            env
-            echo "Hello, world!"
-    publishers:
-        - email:
-            recipients: 'daniel.diaz@linaro.org'
diff --git a/ddiaz-test.yaml b/ddiaz-test.yaml
deleted file mode 100644
index 4ba9972145..0000000000
--- a/ddiaz-test.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- job:
-    name: ddiaz-test
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-            daniel.diaz@linaro.org:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-configure
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    node: master
-    display-name: 'Test job for Daniel Diaz'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            env
-            echo "Hello, world!"
-    publishers:
-        - email:
-            recipients: 'daniel.diaz@linaro.org'
diff --git a/debian-arm64-rootfs.yaml b/debian-arm64-rootfs.yaml
deleted file mode 100644
index 411f0bf352..0000000000
--- a/debian-arm64-rootfs.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: debian-arm64-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian arm64 rootfs'
-    scm:
-        - git:
-            url: git://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-arm64
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=6G tmpfs builddir
-            cp -a jessie-arm64-${rootfs} builddir/
-            cd builddir/jessie-arm64-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/jessie-arm64-${rootfs}/linaro-jessie-* out
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${rootfs}-arm64/${BUILD_NUMBER}
-    publishers:
-        - trigger:
-            project: '96boards-reference-platform-debian'
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/debian-armhf-rootfs.yaml b/debian-armhf-rootfs.yaml
deleted file mode 100644
index bf126e9eca..0000000000
--- a/debian-armhf-rootfs.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-- job:
-    name: debian-armhf-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian armhf rootfs'
-    scm:
-        - git:
-            url: git://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-armhf
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=6G tmpfs builddir
-            cp -a jessie-armhf-${rootfs} builddir/
-            cd builddir/jessie-armhf-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/jessie-armhf-${rootfs}/linaro-jessie-* out
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${rootfs}-armhf/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/debian-x86-rootfs.yaml b/debian-x86-rootfs.yaml
deleted file mode 100644
index afde550ffe..0000000000
--- a/debian-x86-rootfs.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- job:
-    name: debian-x86-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian x86_64 rootfs'
-    scm:
-        - git:
-            url: git://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - nano
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=6G tmpfs builddir
-            cp -a jessie-x86-${rootfs} builddir/
-            cd builddir/jessie-x86-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/jessie-x86-${rootfs}/linaro-jessie-* out
-            time python ${HOME}/bin/linaro-cp --api_version 3 --link-latest out debian/images/${rootfs}-x86/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/django-restricted-resource.yaml b/django-restricted-resource.yaml
deleted file mode 100644
index 4055c3755e..0000000000
--- a/django-restricted-resource.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- job:
-    name: django-restricted-resource
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: lavabot
-    display-name: 'PEP8 and Unit Test CI Job for django-restricted-resource'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            trigger-for-unreviewed-patches: true
-            readable-message: false
-            successful-message: 'PEP8 and Units Tests Successful'
-            start-message: 'PEP8 and Units Tests Started'
-            failure-message: 'PEP8 and Units Tests Failed'
-            custom-url: '${BUILD_URL}/console'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'lava/django-restricted-resource'
-                  branches:
-                    - branch-compare-type: 'PLAIN'
-                      branch-pattern: 'master'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            rm -rf ${WORKSPACE}/*
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-
-            git clone -b ${GERRIT_BRANCH} --depth 1 https://git.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git log -n3
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
-
-            ./ci-run
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
diff --git a/drue-test-1.yaml b/drue-test-1.yaml
new file mode 100644
index 0000000000..570889cd5f
--- /dev/null
+++ b/drue-test-1.yaml
@@ -0,0 +1,32 @@
+- job:
+    name: drue-test-1
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+            dan.rue@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: master
+    display-name: 'Test job for Dan Rue'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            env
+            echo "Hello, world!"
+    publishers:
+        - email:
+            recipients: 'dan.rue@linaro.org'
diff --git a/drue-test-2.yaml b/drue-test-2.yaml
new file mode 100644
index 0000000000..ee5e4968dc
--- /dev/null
+++ b/drue-test-2.yaml
@@ -0,0 +1,32 @@
+- job:
+    name: drue-test-2
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+            dan.rue@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: master
+    display-name: 'Test job for Dan Rue'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            env
+            echo "Hello, world!"
+    publishers:
+        - email:
+            recipients: 'dan.rue@linaro.org'
diff --git a/erp-firmware.yaml b/erp-firmware.yaml
deleted file mode 100644
index 5c857df933..0000000000
--- a/erp-firmware.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- job:
-    name: erp-firmware
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 7
-            num-to-keep: 7
-    parameters:
-        - string:
-            name: FIRMWARE_VER
-            default: '17.10-rc1'
-            description: 'target firmware version'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Reference Platform - Entreprise firmware'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/leif.lindholm/rpf.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            sudo apt-get -q=2 update
-            sudo apt-get -q=2 install -y --no-install-recommends acpica-tools gcc-arm-linux-gnueabihf libssl-dev
-
-            ./build.sh -D FIRMWARE_VER=${FIRMWARE_VER} -D FIRMWARE_VENDOR=Linaro
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out reference-platform/enterprise/firmware/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'leif.lindholm@linaro.org marcin.juszkiewicz@linaro.org'
diff --git a/erp-test-automation-matrix.yaml b/erp-test-automation-matrix.yaml
new file mode 100644
index 0000000000..15b4516488
--- /dev/null
+++ b/erp-test-automation-matrix.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: 'erp-test-automation-matrix'
+    display-name: 'ERP test automation matrix'
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: master
+    child-workspace: $HOST
+    axes:
+        - axis:
+            type: user-defined
+            name: HOST
+            values:
+                - j12-d03-04
+                - j12-d05-01
+                - j12-m1-c33n1
+                - j13-r120-t32-19
+                - j13-qrep-03
+                - j12-d06-01
+    parameters:
+        - string:
+            name: BUILD_ENV
+            default: 'staging'
+        - string:
+            name: BUILD_NUM
+            default: 'latest'
+        - string:
+            name: BUILD_DISTRO
+            default: 'debian'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: ANSIBLE_VAULT
+                variable: ANSIBLE_VAULT
+    builders:
+        - shell:
+            !include-raw: erp-test-automation/builders-matrix.sh
+    publishers:
+        - email:
+            recipients: 'baptiste.gerondeau@linaro.org'
diff --git a/erp-test-automation.yaml b/erp-test-automation.yaml
deleted file mode 100644
index 09517c0094..0000000000
--- a/erp-test-automation.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-- job:
-    name: 'erp-test-automation'
-    display-name: 'ERP test automation'
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    parameters:
-        - string:
-            name: HOSTS
-            default: 'cb-g0'
-        - string:
-            name: BUILD_ENV
-            default: 'staging'
-        - string:
-            name: BUILD_NUM
-            default: 'latest'
-    wrappers:
-        - timestamps
-        - credentials-binding:
-            - text:
-                credential-id: ANSIBLE_VAULT
-                variable: ANSIBLE_VAULT
-    builders:
-        - shell:
-            !include-raw: erp-test-automation/builders.sh
-    publishers:
-        - email:
-            recipients: 'chase.qi@linaro.org'
diff --git a/erp-test-automation/builders-matrix.sh b/erp-test-automation/builders-matrix.sh
new file mode 100755
index 0000000000..6aac516bd9
--- /dev/null
+++ b/erp-test-automation/builders-matrix.sh
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -f ${HOME}/.erp/${HOST}/vault_pass.txt
+}
+
+
+rm -rf ${WORKSPACE}/*
+
+## Setup environment
+# The following build dependencies are pre-installed on the build host
+# dirmngr virtualenv git sshpass
+virtualenv --python=/usr/bin/python2 venv
+. venv/bin/activate
+
+git clone --depth 1 https://github.com/Linaro/erp-test-automation
+cd erp-test-automation/erp-playbook
+pip install -r requirements.txt
+
+# In this matrix build, there is a potential issue to share the same vault password file across hosts. When build fails
+# on one host, clearup_exit() will delete the file for safety, but the file may still required by another host. So
+# create pass file by host and specify the file with --vault-password-file option by host instead.
+sed -i 's|^vault_password_file = ~/.vault_pass_erp.txt|# vault_password_file = ~/.vault_pass_erp.txt|' ansible.cfg
+mkdir -p ${HOME}/.erp/${HOST}/
+passwd="${HOME}/.erp/${HOST}/vault_pass.txt"
+echo ${ANSIBLE_VAULT} > ${passwd}
+
+# Image upload is enabled by default in ansible role. It only upload image when it is not exist yet in mr-provisioner's
+# database. However, matrix build erp-test-automation-matrix run the same ansible playbook on multiple platforms in
+# parallel almost in the same time, means image existence query responds for all of these threads will be 'not exist
+# yet', which causes that the same image will be uploaded up to the number of platforms times. To break the race
+# condition, the following line postpone test run on all platforms except d05 10 minutes which should be more then
+# enough for the d05 to finish image upload.
+[ "${HOST}" = "j12-d05-01" ] || sleep 600
+
+# Provision image and run test
+ansible-galaxy install -p roles -r requirements.yml
+if [ "${BUILD_NUM}" = "latest" ]; then
+    ansible-playbook --vault-password-file ${passwd} -l ${HOST} -e erp_installer_environment=${BUILD_ENV} -e erp_installer_distro=${BUILD_DISTRO} main.yml
+else
+    ansible-playbook --vault-password-file ${passwd} -l ${HOST} -e erp_installer_environment=${BUILD_ENV} -e erp_build_number=${BUILD_NUM} -e erp_installer_distro=${BUILD_DISTRO} main.yml
+fi
+
+# Wait for tests to finish
+ansible-playbook --vault-password-file ${passwd} -l ${HOST} wait-for-poweroff.yml
diff --git a/erp-test-automation/builders.sh b/erp-test-automation/builders.sh
deleted file mode 100755
index 34d0f1528f..0000000000
--- a/erp-test-automation/builders.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -f ${HOME}/.vault_pass_erp.txt
-}
-
-## Some build dependencies are pre-installed on the build host
-# dirmngr virtualenv git sshpass
-
-echo ${ANSIBLE_VAULT} > ${HOME}/.vault_pass_erp.txt
-
-rm -rf ${WORKSPACE}/*
-
-git clone --depth 1 https://github.com/Linaro/erp-test-automation
-
-## Setup environment
-virtualenv --python=/usr/bin/python2 erp-test-env
-. erp-test-env/bin/activate
-pip install ansible future requests
-
-cd erp-test-automation/erp-playbook
-
-# Provision image and run test
-ansible-galaxy install -p roles -r requirements.yml
-if [ "${BUILD_NUM}" = "latest" ]; then
-    ansible-playbook -l ${HOSTS} -e erp_debian_installer_environment=${BUILD_ENV} main.yml
-else
-    ansible-playbook -l ${HOSTS} -e erp_debian_installer_environment=${BUILD_ENV} -e erp_build_number=${BUILD_NUM} main.yml
-fi
-
-# Wait for tests to finish
-ansible-playbook -l ${HOSTS} wait-for-poweroff.yml
diff --git a/fai/builders.sh b/fai/builders.sh
new file mode 100644
index 0000000000..276be2f534
--- /dev/null
+++ b/fai/builders.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -e
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    echo "INFO: umount ${WORKSPACE}/builddir"
+    sudo umount ${WORKSPACE}/builddir
+}
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="python-pip fai-server fai-setup-storage qemu-utils procps"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+set -ex
+
+# speed up FAI
+test -d builddir || mkdir builddir
+sudo mount -t tmpfs -o size=6G tmpfs builddir
+
+# Get FAI config
+git clone --depth 1 ${REPO_URL} -b ${BRANCH} fai
+
+cd fai
+
+git log -1
+
+if [ -n "${GERRIT_CHANGE}" ]; then
+    git pull https://review.linaro.org/ci/fai ${GERRIT_CHANGE}
+fi
+
+sudo fai-diskimage -v --cspace $(pwd) \
+     --hostname linaro \
+     -S ${ROOTFS_SIZE} \
+     --class $(echo SAVECACHE,${FAI_CLASS} | tr '[:lower:]' '[:upper:]') \
+     ${WORKSPACE}/builddir/linaro-test-fai-${BUILD_NUMBER}.img.raw
+
+if sudo grep -E '^(ERROR:|WARNING: These unknown packages are removed from the installation list|Exit code task_)' /var/log/fai/linaro/last/fai.log
+then
+    echo "Errors during build"
+    exit 1
+fi
diff --git a/fedora-iot/cloud-builders.sh b/fedora-iot/cloud-builders.sh
new file mode 100755
index 0000000000..e376a3bf67
--- /dev/null
+++ b/fedora-iot/cloud-builders.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+export image_name=$(mktemp -u -p'cloud-image' | sed -e 's+/+-+g')
+export mountpoint=$(mktemp -d /tmp/${image_name}.XXXXXX)
+
+sudo apt-get update
+sudo apt-get install -y git cpio qemu-utils virtinst libvirt-clients iproute2 \
+             libglib2.0-bin intltool libvirt-glib-1.0-dev libgtk-3-dev python-ipaddr \
+             gobject-introspection  python-libguestfs gir1.2-gspell-1 \
+			 qemu-efi libgtksourceview2.0-dev libosinfo-1.0-0 pigz
+sudo apt-get install -y python3-gi python3-libvirt python3-libxml2 python3-requests
+
+git clone https://github.com/virt-manager/virt-manager.git virt-manager.git
+cd virt-manager.git
+git checkout v2.2.1
+sudo ./setup.py install
+cd -
+sudo virt-install --version
+
+default_gw=$(ip route show default 0.0.0.0/0 | cut -d' ' -f3)
+sudo sed -i "/^uri_default/d" /etc/libvirt/libvirt.conf
+echo "uri_default = \"qemu+tcp://${default_gw}/system\"" | sudo tee -a /etc/libvirt/libvirt.conf
+
+# create loop device for kpartx
+if ! [ -b /dev/loop0 ]; then
+	mkdir /dev/loop0 b 7 0
+fi
+
+virt-host-validate
+
+sudo virsh pool-list --all
+sudo virsh net-list --all
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  cd ${WORKSPACE}
+  sudo virsh vol-delete --pool default ${image_name}.img || true
+  sudo virsh destroy ${image_name} || true
+  sudo virsh undefine --nvram ${image_name} || true
+  sudo umount ${mountpoint} || true
+  sudo kpartx -dv ${image_name}.img || true
+  sudo rm -rf ${mountpoint} || true
+  sudo rm -f ${image_name}.img
+}
+
+wget -q http://git-us.linaro.org/ci/job/configs.git/plain/fedora-iot/f30-iot-aarch64.ks -O f30-iot.ks
+
+sudo virt-install \
+  --name ${image_name} \
+  --disk pool=default,size=8,format=raw \
+  --network network=default, \
+  --os-variant fedora22 \
+  --ram 4096 --arch aarch64 \
+  --location https://dl.fedoraproject.org/pub/alt/iot/30/IoT/aarch64/os/,kernel=images/pxeboot/vmlinuz,initrd=images/pxeboot/initrd.img \
+  --initrd-inject="f30-iot.ks" --extra-args "ks=http://git-us.linaro.org/ci/job/configs.git/plain/fedora-iot/f30-iot.ks earlycon=pl011,0x3f201000 console=ttyAMA0" \
+  --boot loader=/usr/share/AAVMF/AAVMF_CODE.fd,loader_ro=yes,loader_type=pflash,nvram_template=/usr/share/AAVMF/AAVMF_VARS.fd,loader_secure=no \
+  --noreboot
+
+set +ex
+# Fedora IoT has a bug when unmounting swap during the reboot
+# rely on a timeout to break the job until this is fixes
+# while [ true ]; do
+timeout=1800
+while [ $timeout -gt 0 ]; do
+  sleep 1
+  vm_running=$(sudo virsh list --name --state-running | grep "^${image_name}" | wc -l)
+  [ "${vm_running}" -eq "0" ] && break
+  timeout=$((timeout-1))
+done
+set -ex
+
+sudo virsh list --all
+
+mkdir -p out
+cp f30-iot.ks out/
+
+sudo cp -a /var/lib/libvirt/images/${image_name}.img .
+
+sudo virsh vol-download --pool default --vol ${image_name}.img --file ${image_name}.img
+
+sudo qemu-img convert -c -O qcow2 ${image_name}.img out/fedora-iot-rp-cloud-image_aarch64.qcow2
+pigz -9 out/fedora-iot-rp-cloud-image_aarch64.qcow2
+
+sudo chown -R buildslave:buildslave out
diff --git a/fedora-iot/f30-iot-aarch64.ks b/fedora-iot/f30-iot-aarch64.ks
new file mode 100644
index 0000000000..ddcaa649d9
--- /dev/null
+++ b/fedora-iot/f30-iot-aarch64.ks
@@ -0,0 +1,47 @@
+#version=DEVEL
+ignoredisk --only-use=vda
+autopart --type=lvm
+
+# Partition clearing information
+clearpart --all --initlabel --drives=vda
+# OSTree setup
+ostreesetup --osname="fedora-iot" --remote="fedora-iot" --url="file:///ostree/repo" --ref="fedora/stable/aarch64/iot" --nogpg
+# Use network installation
+url --url="https://kojipkgs.fedoraproject.org/compose/iot/Fedora-IoT-30-20190730.0/compose/IoT/aarch64/os/"
+# Use graphical install
+text
+# Keyboard layouts
+keyboard --vckeymap=us --xlayouts='us'
+# System language
+lang en_CA.UTF-8
+
+# Root password
+rootpw fedora
+
+# Run the Setup Agent on first boot
+# firstboot --enable
+# Do not configure the X Window System
+skipx
+# System services
+services --enabled="chronyd"
+# System timezone
+timezone America/Rainy_River --isUtc
+user --groups=wheel --name=tester --password=fedora --plaintext
+
+%post --erroronfail
+
+%wheel        ALL=(ALL)       ALL" >> /etc/sudoers
+rm -f /etc/ostree/remotes.d/fedora-iot.conf
+ostree remote add --set=gpg-verify=true --set=gpgkeypath=/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-iot-2019 fedora-iot 'https://dl.fedoraproject.org/iot/repo/'
+cp /etc/skel/.bash* /root
+%end
+
+%addon com_redhat_kdump --disable --reserve-mb='128'
+
+%end
+
+%anaconda
+pwpolicy root --minlen=6 --minquality=1 --notstrict --nochanges --notempty
+pwpolicy user --minlen=6 --minquality=1 --notstrict --nochanges --emptyok
+pwpolicy luks --minlen=6 --minquality=1 --notstrict --nochanges --notempty
+%end
diff --git a/fedora-iot/lava-job-definitions/qemuarm64/template-boot.yaml b/fedora-iot/lava-job-definitions/qemuarm64/template-boot.yaml
new file mode 100644
index 0000000000..a29bf9064c
--- /dev/null
+++ b/fedora-iot/lava-job-definitions/qemuarm64/template-boot.yaml
@@ -0,0 +1,61 @@
+device_type: qemu
+job_name: Fedora-IoT-30 ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 45
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+context:
+  arch: arm64
+  netdevice: tap
+  machine: virt
+  cpu: cortex-a57
+  guestfs_interface: virtio
+  extra_kernel_args: \"selinux=0\"
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      bios:
+        image_arg: -bios {bios}
+        url: https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-AARCH64-RELEASE-111bbcf87621
+      rootfs:
+        image_arg: -drive id=disk0,file={rootfs},if=none,format=qcow2 -device virtio-blk-device,drive=disk0 -m 4096 -smp 4 -nographic
+        url: ${IMAGE_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+    os: fedora
+- boot:
+    namespace: target
+    timeout:
+      minutes: 10
+    method: qemu
+    media: tmpfs
+    expect_shell: false
+    auto_login:
+      login_prompt: 'login:'
+      username: tester
+      password_prompt: 'Password:'
+      password: fedora
+      login_commands:
+          - sudo su
+    prompts:
+    - 'tester@(.*) ~]'
+    - 'root@(.*) ~]'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
+
diff --git a/giftwrap-openstack-deb.yaml b/giftwrap-openstack-deb.yaml
deleted file mode 100644
index 033c7eaf7b..0000000000
--- a/giftwrap-openstack-deb.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- job:
-    name: giftwrap-openstack-deb
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: PROJECTS
-            default: 'cinder glance horizon keystone neutron nova swift'
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'GiftWrap for OpenStack (deb)'
-    scm:
-        - git:
-            url: https://github.com/fboudra/giftwrap.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends build-essential ruby ruby-dev python-dev git python-pip libxml2-dev libxslt-dev libffi-dev libmysqlclient-dev libpq-dev libjpeg-dev libldap2-dev libsasl2-dev
-            sudo gem install --no-ri --no-rdoc fpm
-            sudo pip install -r requirements.txt .
-            sudo python setup.py install
-
-            for project in ${PROJECTS}; do
-              cat << EOF > manifest-${project}.yml
-            ---
-            settings:
-              package_name_format: 'openstack-{{ project.name }}'
-              build_type: package
-              version: '12.0.build${BUILD_NUMBER}'
-              base_path: '/opt/openstack'
-              force_overwrite: true
-
-            projects:
-              - name: ${project}
-                gitref: stable/liberty
-            EOF
-
-              sudo giftwrap -d build -t package -m ${WORKSPACE}/manifest-${project}.yml
-
-              dpkg -c openstack-${project}_*.deb
-              dpkg -I openstack-${project}_*.deb
-              sudo dpkg -i --force-all openstack-${project}_*.deb
-            done
-    publishers:
-        - archive:
-            artifacts: 'openstack-*.deb'
diff --git a/giftwrap-openstack-rpm.yaml b/giftwrap-openstack-rpm.yaml
deleted file mode 100644
index 3905545809..0000000000
--- a/giftwrap-openstack-rpm.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-- job:
-    name: giftwrap-openstack-rpm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: PROJECTS
-            default: 'cinder glance horizon keystone neutron nova swift'
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'GiftWrap for OpenStack (rpm)'
-    scm:
-        - git:
-            url: https://github.com/fboudra/giftwrap.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo yum update
-            sudo yum groupinstall "Development Tools" -y
-            sudo yum install -y ruby ruby-devel python-devel git python-setuptools libxml2-devel libxslt-devel libffi-devel libjpeg-devel openldap-devel wget postgresql-devel openssl-devel cyrus-sasl-devel mariadb-devel
-
-            wget https://bootstrap.pypa.io/get-pip.py
-            sudo python get-pip.py
-
-            sudo gem install --no-ri --no-rdoc fpm
-            sudo ln -s /usr/local/bin/fpm /usr/bin/fpm
-            sudo pip install -r requirements.txt .
-            sudo python setup.py install
-
-            for project in ${PROJECTS}; do
-              cat << EOF > manifest-${project}.yml
-            ---
-            settings:
-              package_name_format: 'openstack-{{ project.name }}'
-              build_type: package
-              version: '12.0.build${BUILD_NUMBER}'
-              base_path: '/opt/openstack'
-              force_overwrite: true
-
-            projects:
-              - name: ${project}
-                gitref: stable/liberty
-            EOF
-
-              sudo giftwrap -d build -t package -m ${WORKSPACE}/manifest-${project}.yml
-
-              rpm -i -p openstack-${project}_*.rpm
-              rpm -c -p openstack-${project}_*.rpm
-              sudo rpm -i --force openstack-${project}_*.rpm
-            done
-    publishers:
-        - archive:
-            artifacts: 'openstack-*.rpm'
diff --git a/infrastructure-ansible-playbook.yaml b/infrastructure-ansible-playbook.yaml
index 7d53a7cf67..167c463501 100644
--- a/infrastructure-ansible-playbook.yaml
+++ b/infrastructure-ansible-playbook.yaml
@@ -10,11 +10,11 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     disabled: false
-    node: docker-xenial-amd64
+    node: triggers
     display-name: 'Infrastructure - Unit Test for the ansible-playbook repository'
     concurrent: true
     triggers:
@@ -38,11 +38,9 @@
     builders:
         - shell: |
             #!/bin/bash
+            set -e
 
-            sudo apt-get -q=2 update
-            sudo apt-get -q=2 install -y python-pip libssl-dev libffi-dev
-            sudo pip install ansible ansible-lint
-
+            rm -rf ansible-playbooks
             git clone https://git.linaro.org/$GERRIT_PROJECT -b $GERRIT_BRANCH
             cd *
             git log -n1
diff --git a/infrastructure-linaro-license-protection.yaml b/infrastructure-linaro-license-protection.yaml
index e015c0f99f..51c1e6a0ae 100644
--- a/infrastructure-linaro-license-protection.yaml
+++ b/infrastructure-linaro-license-protection.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     disabled: false
diff --git a/infrastructure-patchwork-tools.yaml b/infrastructure-patchwork-tools.yaml
index c901f12678..1cf5310985 100644
--- a/infrastructure-patchwork-tools.yaml
+++ b/infrastructure-patchwork-tools.yaml
@@ -10,11 +10,11 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     disabled: false
-    node: docker-xenial-amd64
+    node: docker-bionic
     display-name: 'Infrastructure - Unit Test CI for the patchwork-tools repository'
     concurrent: true
     triggers:
@@ -42,10 +42,11 @@
             rm -rf ${WORKSPACE}/*
             echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
             sudo apt-get update
-            sudo apt-get install -y python-dev python-virtualenv git python-flake8 flake8
+            sudo apt-get install -y python-dev python-virtualenv git python-flake8 flake8 libldap2-dev libsasl2-dev libssl-dev
+
 
             git clone -b ${GERRIT_BRANCH} --depth 1 https://git.linaro.org/${GERRIT_PROJECT}
-            cd *
+            cd patchwork-tools
             git log -n1
             git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
             git checkout -q FETCH_HEAD
diff --git a/jcstress-build.yaml b/jcstress-build.yaml
index 0b173efceb..085200202f 100644
--- a/jcstress-build.yaml
+++ b/jcstress-build.yaml
@@ -17,12 +17,9 @@
             artifact-num-to-keep: 1
     parameters:
         - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
-        - string:
             name: MAVEN_URL
             default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK - Build jcstress jar'
     scm:
@@ -41,19 +38,14 @@
             #!/bin/bash
 
             set -exu
+            CACHE_FILES=$HOME/srv/jdk-cache
 
-            rm -rf jdk* apache-maven-*
+            rm -rf apache-maven-*
 
-            wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL}
-            tar -Jxf jdk*.tar.xz
+            wget --progress=dot -e dotbytes=2M ${MAVEN_URL}
             tar -zxf apache-maven-*.tar.gz
 
-            cd jdk*/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
+            export JAVA_HOME=$CACHE_FILES/jdk11
 
             cd ${WORKSPACE}/apache-maven-*
             export M3_HOME=${PWD}
diff --git a/jdk-build-specjbb2015-jdk11.yaml b/jdk-build-specjbb2015-jdk11.yaml
index 4d56cd290b..7fc81454d9 100644
--- a/jdk-build-specjbb2015-jdk11.yaml
+++ b/jdk-build-specjbb2015-jdk11.yaml
@@ -10,7 +10,7 @@
           adds some dependencies to the maven job building SPECjbb2015.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-build
@@ -24,7 +24,7 @@
         - string:
             name: MAVEN_URL
             default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK 11- Build SPECjbb2015 '
     wrappers:
diff --git a/jdk-cache-files2.yaml b/jdk-cache-files2.yaml
new file mode 100644
index 0000000000..72fbb66f8d
--- /dev/null
+++ b/jdk-cache-files2.yaml
@@ -0,0 +1,97 @@
+- job:
+    name: jdk-cache-files2
+    project-type: matrix
+    defaults: global
+    description: |
+        Download and unpack boot jdks.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: master
+    concurrent: false
+    display-name: 'OpenJDK - Cache files - the revenge'
+    wrappers:
+        - timestamps
+    axes:
+        - axis:
+            type: slave
+            name: node
+            values:
+                - aarch64-06
+                - j12-qrep-01
+    execution-strategy:
+        sequential: false
+    builders:
+        - copyartifact:
+            project: openjdk8-hadoop-LCA14
+            filter: 'out/openjdk8-hadoop-LCA14.tar.gz'
+            flatten: true
+        - copyartifact:
+            project: archive-specjbb2015-product-tarball
+            filter: 'out/SPECjbb2015.tgz'
+            flatten: true
+        - copyartifact:
+            project: jdk-build-specjbb2015-jdk11
+            filter: 'out/SPECjbb2015-jdk11.tar.gz'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+            set -eu
+            PERSIST=$HOME/srv/jdk-cache
+            NEW_PERSIST=$PERSIST-new
+            OLD_PERSIST=$PERSIST-old
+
+            # Creating all maintains idempotency.
+            mkdir -v -p $NEW_PERSIST $OLD_PERSIST $PERSIST
+
+            JDK8u=jdk8u-server-release-1804
+            JDK10=jdk10-server-release-1804
+            JDK11=jdk11-server-release-1811
+            JDK12=jdk12-release-1903
+            JDK13=OpenJDK13U-jdk_aarch64_linux_hotspot_13_33.tar.gz
+            JDK14=jdk14.tar.gz
+
+            rm -vrf jdk*
+            wget -N \
+                 http://openjdk.linaro.org/releases/${JDK8u}.tar.xz \
+                 http://openjdk.linaro.org/releases/${JDK10}.tar.xz \
+                 http://openjdk.linaro.org/releases/${JDK11}.tar.xz \
+                 http://openjdk.linaro.org/releases/${JDK12}.tar.xz \
+                 http://openjdk.linaro.org/releases/${JDK13} \
+                 http://openjdk.linaro.org/releases/${JDK14}
+
+            tar -vJxf ${JDK8u}.tar.xz
+            tar -vJxf ${JDK10}.tar.xz
+            tar -vJxf ${JDK11}.tar.xz
+            tar -vJxf ${JDK12}.tar.xz
+            tar -vxzf ${JDK13}
+            tar -vxzf ${JDK14}
+
+            mv -v ${JDK8u} $NEW_PERSIST/jdk8u
+            mv -v ${JDK10} $NEW_PERSIST/jdk10
+            mv -v ${JDK11} $NEW_PERSIST/jdk11
+            mv -v ${JDK12} $NEW_PERSIST/jdk12
+            mv -v jdk-13+33 $NEW_PERSIST/jdk13
+            mv -v jdk14 $NEW_PERSIST/jdk14
+
+            mv openjdk8-hadoop-LCA14.tar.gz $NEW_PERSIST
+            mv SPECjbb2015.tgz $NEW_PERSIST
+            mv SPECjbb2015-jdk11.tar.gz $NEW_PERSIST
+
+            # Remove the old persist, make the current one the old, and the
+            # new one the current one.
+            rm -vrf $OLD_PERSIST
+            mv -v $PERSIST $OLD_PERSIST
+            mv -v $NEW_PERSIST $PERSIST
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk-clean-job.yaml b/jdk-clean-job.yaml
new file mode 100644
index 0000000000..c11dcebaf2
--- /dev/null
+++ b/jdk-clean-job.yaml
@@ -0,0 +1,43 @@
+- job:
+    name: jdk-clean-job
+    project-type: freestyle
+    defaults: global
+    description: |
+        Clean up the machine after or before other jobs.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK - Clean job'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+            #set -exu
+
+            # Kill all orphaned java processes
+            ps --no-headers --ppid 1 --format "pid cmd"  | tr -s " " | grep java | cut -d " " -f 1 | xargs kill -9
+
+            # Kill all jstatd processes. These can accumulate.
+            killall --verbose -9 jstatd
+
+            # Javac jobs can accumulate.
+            killall --verbose -9 javac
+
+            # These can accumulate too.
+            killall --verbose -9 Xvfb
+
+            ps --forest -aux
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk-jmh-build.yaml b/jdk-jmh-build.yaml
deleted file mode 100644
index 55a6ad7bf9..0000000000
--- a/jdk-jmh-build.yaml
+++ /dev/null
@@ -1,132 +0,0 @@
-- scm:
-    name: jmh
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/code-tools/jmh
-            clean: true
-            browser: hgweb
-            browser-url: http://hg.openjdk.java.net/code-tools/jmh/
-            subdir: jmh
-- scm:
-    name: jmh-linaro-org
-    scm:
-        - git:
-            url: https://git.linaro.org/leg/openjdk/jmh-linaro-org
-            refspec: +refs/heads/master:refs/remotes/origin/master
-#            refspec: ${GERRIT_REFSPEC}
-            name: origin
-            branches:
-                 - refs/heads/master
-#                - ${GERRIT_BRANCH}
-            skip-tag: true
-            wipe-workspace: false
-            basedir: jmh/jmh-linaro-org
-            choosing-strategy: gerrit
-- job:
-    name: jmh-build
-    project-type: freestyle
-    defaults: global
-    description: |
-        Build jmh with jmh-linaro-org benchmarks. Builds all of jmh and runs unit
-        tests before building jmh-linaro-org.
-        benchmarks.jar is published with jmh-linaro-org benchmarks.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            num-to-keep: 10
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK - Build jmh-linaro-org'
-    triggers:
-        # We poll the JMH Mercurial repository, and get triggered by review.linaro.org
-        - pollscm:
-# Poll once an hour. Build if JMH changes, and not just jmh-linaro-org.
-            cron: 'H * * * *'
-        - gerrit:
-            trigger-on:
-                - patchset-created-event:
-                    exclude-drafts: true
-                    exclude-trivial-rebase: true
-                    exclude-no-code-change: true
-                - change-merged-event
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            readable-message: true
-            successful-message: 'Build Successful'
-            failure-message: 'Build FAILED'
-            trigger-for-unreviewed-patches: true
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'leg/openjdk/jmh-linaro-org'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: '**'
-    wrappers:
-        - timestamps
-    scm:
-        - jmh
-        - jmh-linaro-org
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            rm -rf jdk* apache-maven-*
-
-            wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL}
-            tar -Jxf jdk*.tar.xz
-            tar -zxf apache-maven-*.tar.gz
-
-            cd jdk*/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            cd ${WORKSPACE}/apache-maven-*
-            export M3_HOME=${PWD}
-
-            export PATH=${JAVA_HOME}/bin:${M3_HOME}/bin:${PATH}
-            which java
-            java -version
-            mvn -version
-
-            # Only go through complete jmh build and test on periodic builds.
-            # There is a possibility of jmh being updated when patches are pushed
-            # to gerrit, but this should be triggered by the polling soon enough
-            if [ "${GERRIT_EVENT_TYPE:-}" = ""  ]; then
-                cd ${WORKSPACE}/jmh
-                mvn -B clean install
-            else
-                cd ${WORKSPACE}/jmh/jmh-linaro-org
-                git fetch https://review.linaro.org/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD
-            fi
-
-            # Builds the samples and jmh, without running unit tests.
-            cd ${WORKSPACE}/jmh/jmh-linaro-org
-            mvn -B clean install
-    publishers:
-        - archive:
-            artifacts: 'jmh/jmh-linaro-org/target/benchmarks.jar'
-        - email:
-            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk10-build-and-test.yaml b/jdk10-build-and-test.yaml
deleted file mode 100644
index d013e11786..0000000000
--- a/jdk10-build-and-test.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-- job:
-    name: jdk10-build-and-test
-    project-type: multijob
-    defaults: global
-    description: |
-        * This jobs builds the jdk images and runs tests and benchmarks against the built images.<br>
-        * <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk10-update-src-tree" job).<br>
-        If it is run manually it will use the source tarball from the last successful build of that job.<br>
-        * If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 10 - Build jdk images and run tests/benchmarks'
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-    builders:
-        - multijob:
-            name: 'Build jdk images'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-build-image
-                current-parameters: true
-                kill-phase-on: FAILURE
-# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
-# Exception in thread "main" java.util.ServiceConfigurationError:
-# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
-# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
-# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
-        - multijob:
-            name: 'SPECjbb2015 benchmark'
-            condition: ALWAYS
-            projects:
-              - name: jdk10-specjbb2015-benchmark
-                current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
-                kill-phase-on: FAILURE
-        - multijob:
-            name: '1GB Terasort benchmark'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-terasort-benchmark
-                current-parameters: true
-                kill-phase-on: NEVER
-        - multijob:
-            name: 'JTREG tests'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-jtreg-test
-                current-parameters: true
-                predefined-parameters: 'XJTREG_SUBCATEGORIES=tools/javap/typeAnnotations'
-                kill-phase-on: NEVER
-        - multijob:
-            name: 'jcstress'
-            condition: COMPLETED
-            projects:
-              - name: jdk10-jcstress-test
-                current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'Publish results to openjdk.linaro.org'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-publish-and-report
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - copyartifact:
-            project: jdk10-update-src-tree
-            filter: 'out/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk10-build-image
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk10-specjbb2015-benchmark
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk10-terasort-benchmark
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk10-jtreg-test
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-            stable: true
-        - copyartifact:
-            project: jdk10-jcstress-test
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-    publishers:
-        - archive:
-            artifacts: 'out/**/*'
diff --git a/jdk10-build-image.yaml b/jdk10-build-image.yaml
deleted file mode 100644
index 7761b886f7..0000000000
--- a/jdk10-build-image.yaml
+++ /dev/null
@@ -1,137 +0,0 @@
-- job:
-    name: jdk10-build-image
-    project-type: matrix
-    defaults: global
-    description: |
-        * Configures and builds jdk10 (ie, bin/java, bin/javac, et al) for various configurations.<br>
-        * The source tarball is copied from the jdk10-update-src-tree job.<br>
-        * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Configure and build OpenJDK 10'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - zero
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk10-update-src-tree
-            filter: 'out/jdk10.tar.gz'
-            target: incoming
-            flatten: true
-#        - copyartifact:
-#            project: archive-primordial-jdk10
-#            filter: 'out/primordial-jdk10.tar.gz'
-#            target: incoming
-#            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-
-            ccache_build_opts=--disable-ccache
-
-            rm -rf jdk* primordial-jdk* build*
-
-            wget --progress=dot -e dotbytes=2M ${JDK_URL}
-            tar -Jxf jdk*.tar.xz
-
-            cd jdk*/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            export PATH=${JAVA_HOME}/bin:${PATH}
-
-            cd ${WORKSPACE}
-
-            # Extract sources from upstream job
-            tar xf incoming/jdk10.tar.gz
-
-            shopt -s nullglob
-
-            # Extract boot jdk
-            # Not used. tar xf incoming/primordial-jdk10.tar.gz
-
-            # Configure and build
-            mkdir -p build-stage1 build-stage2
-
-            two_stage_build=0
-
-            which java
-            java -version
-
-            if [ $two_stage_build = 1 ]; then
-              pushd build-stage1
-              sh ../jdk10/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk10 ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
-              popd
-
-              pushd build-stage2
-              sh ../jdk10/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
-              popd
-            else
-              pushd build-stage2
-              sh ../jdk10/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
-              popd
-            fi
-
-            # Archive the result
-            rm -rf out
-            mkdir out
-            artifact_name=jdk10-${JVM_VARIANT}-${BUILD_TYPE}
-            tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
-
-            # Archive test support files.
-            tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.gz'
-        - email:
-            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk10-build-release.yaml b/jdk10-build-release.yaml
deleted file mode 100644
index 0dbaa39769..0000000000
--- a/jdk10-build-release.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-- job:
-    name: jdk10-build-release
-    project-type: matrix
-    defaults: global
-    description: |
-        * Configures and builds jdk10 for release. Run after the source has passed tests.
-        * Tags build with Linaro-YYMM as per normal release procedure.
-        * The source tarball is copied from the jdk10-update-src-tree job.<br>
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Configure and build OpenJDK 10 Release'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk10-update-src-tree
-            filter: 'out/jdk10.tar.gz'
-            target: incoming
-            flatten: true
-#        - copyartifact:
-#            project: archive-primordial-jdk10
-#            filter: 'out/primordial-jdk10.tar.gz'
-#            target: incoming
-#            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-            export JVM_VARIANT=server
-
-            # Generate files names dependent on year/month.
-            RELEASE=$(date +%y%m)
-            JDKDIR=jdk10-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
-            JDK_SRCDIR=jdk10-src-${RELEASE}
-
-            ccache_build_opts=--disable-ccache
-
-            rm -rf jdk* primordial-jdk* build*
-
-            # Download, setup JDK9 for building.
-            wget --progress=dot -e dotbytes=2M ${JDK_URL}
-            tar -Jxf jdk*.tar.xz
-
-            cd jdk*/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            export PATH=${JAVA_HOME}/bin:${PATH}
-
-            cd ${WORKSPACE}
-
-            # Setup archive directory
-            mkdir out
-
-            # Extract sources from upstream job
-            tar xaf incoming/jdk10.tar.gz
-
-            mv jdk10 $JDK_SRCDIR
-            # Tar up the source before sullying it with a build.
-            tar --exclude=.hg\* -acf out/jdk10-src-${RELEASE}.tar.xz $JDK_SRCDIR
-
-            mv $JDK_SRCDIR $JDKDIR
-            shopt -s nullglob
-
-            # Configure and build
-            mkdir -p build-stage1 build-stage2
-
-            two_stage_build=0
-
-            which java
-            java -version
-
-            if [ $two_stage_build = 1 ]; then
-              pushd build-stage1
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk10 ${ccache_build_opts}
-              make images
-              popd
-
-              pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
-                                        --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
-                                        ${ccache_build_opts} \
-                                        --with-version-opt="Linaro-$RELEASE" \
-                                        --with-version-pre="release"
-              make images
-              popd
-            else
-              pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
-                                        ${ccache_build_opts} \
-                                        --with-version-opt="Linaro-$RELEASE" \
-                                        --with-version-pre="release"
-              make images
-              popd
-            fi
-
-            # Archive the result
-            artifact_name=jdk10-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
-
-            # This is different from ordinary builds.
-            tar -C build-stage2/images --exclude=\*.diz --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.xz'
-        - email:
-            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk10-email-results.yaml b/jdk10-email-results.yaml
deleted file mode 100644
index c5e0d600a4..0000000000
--- a/jdk10-email-results.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- job:
-    name: jdk10-email-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Sends the report.txt file to the aarch64-port-dev mailing list.<br>
-        * The text report is copied from the jdk10-generate-text-report job.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 10 - Send e-mail report'
-    wrappers:
-        - timestamps
-    builders:
-        - copyartifact:
-            project: jdk10-generate-email-report
-            filter: 'report.txt'
-    publishers:
-        - email-ext:
-            recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net'
-            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 10 on AArch64'
-            content-type: text
-            body: |
-                ${FILE,path="report.txt"}
-            success: true
diff --git a/jdk10-generate-email-report.yaml b/jdk10-generate-email-report.yaml
deleted file mode 100644
index 69189685e5..0000000000
--- a/jdk10-generate-email-report.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- job:
-    name: jdk10-generate-email-report
-    project-type: freestyle
-    defaults: global
-    description: |
-        This job aggregates the results from various jobs:<br>
-        <br>
-            * jcstress<br>
-            * jtreg<br>
-            * terasort<br>
-            * specjbb<br>
-        <br>
-        in text form suitable for the aarch64-port-dev mailing list.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '4090'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '1015'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Generate e-mail report'
-    wrappers:
-        - timestamps
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            PATH=${WORKSPACE}/jtreg/bin:${PATH}
-            PERSIST=$HOME/srv/openjdk10
-            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-            export JDK_VERSION=10
-            which jtdiff
-
-            TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
-            echo "" >> ${WORKSPACE}/report.txt
-
-            TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
-            echo "" >> ${WORKSPACE}/report.txt
-
-            BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
-            echo "" >> ${WORKSPACE}/report.txt
-
-            TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/jdk${JDK_VERSION}/ >> ${WORKSPACE}/report.txt
-    publishers:
-        - archive:
-            artifacts: 'report.txt'
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk10-jcstress-test-persist-results.yaml b/jdk10-jcstress-test-persist-results.yaml
deleted file mode 100644
index d7de1b836d..0000000000
--- a/jdk10-jcstress-test-persist-results.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-- job:
-    name: jdk10-jcstress-test-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes results to:<br>
-          * /work/openjdk-testing/jcstress-nightly-runs<br>
-          * /work/openjdk-testing/jcstress-results
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Write jcstress tests results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk10-update-src-tree
-            filter: 'out/build-date.sh'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: jdk10-jcstress-test
-            filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            PERSIST=$HOME/srv/openjdk10
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-
-            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
-            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
-            RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
-
-            mkdir -p $JCSTRESS_RESULTS_DIR
-
-            # Tolerate missing results.csv file.
-            if [ ! -f $RESULTS_CSV ]; then
-                touch $RESULTS_CSV
-            fi
-
-            mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
-            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
-            echo "Previous Results"
-            cat ${RESULTS_CSV}
-            echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
-            sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
-
diff --git a/jdk10-jcstress-test-publish-results.yaml b/jdk10-jcstress-test-publish-results.yaml
deleted file mode 100644
index 919603a6d6..0000000000
--- a/jdk10-jcstress-test-publish-results.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- job:
-    name: jdk10-jcstress-test-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Publish jcstress report'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-            users:
-                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-
-            PERSIST=$HOME/srv/openjdk10
-            SCRIPT_DIR=$PERSIST/jcstress-test-scripts
-            export JDK_VERSION=10
-
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
-            fi
-            export TOP_DIR=$PERSIST
-
-            $SCRIPT_DIR/jcstress-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk10-jcstress-test.yaml b/jdk10-jcstress-test.yaml
deleted file mode 100644
index 7ef224b9a7..0000000000
--- a/jdk10-jcstress-test.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-- job:
-    name: jdk10-jcstress-test
-    project-type: matrix
-    defaults: global
-    description: |
-        This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
-        <b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
-        This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Run jcstress tests'
-    parameters:
-        - string:
-            name: JCSTRESS_MODE
-            default: 'quick'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-        - timeout:
-            timeout: 900
-    builders:
-        - copyartifact:
-            project: jcstress-build
-            filter: 'tests-custom/target/jcstress.jar, tests-all/target/jcstress.jar'
-            target: incoming
-            flatten: false
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk10-build-image
-#            filter: 'out/jdk10-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -eu
-
-            TEST_TYPE=all
-
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
-            rm -rf jdk10*
-            tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=${JAVA_HOME}/bin:${PATH}
-            which java
-            java -version
-
-            # XXX Don't fail the job if jcstress itself fails.
-            set +e
-            java -jar ${JCSTRESS_JAR} -m ${JCSTRESS_MODE}
-
-            test_result=$?
-            set -e
-
-            rm -rf out
-            mkdir out
-
-            out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}
-
-            rm -rf ${out_dirname}
-            mkdir -p ${out_dirname}
-            cp jcstress-results*.bin.gz ${out_dirname}
-            cp -a results ${out_dirname}
-
-            tar czvf out/${out_dirname}.tar.gz ${out_dirname}
-    publishers:
-        - archive:
-            artifacts: 'out/jcstress-results-*.tar.gz'
-        - html-publisher:
-            name: 'HTML Report'
-            dir: 'results'
-            files: 'index.html'
-            keep-all: true
diff --git a/jdk10-jtreg-test-persist-results.yaml b/jdk10-jtreg-test-persist-results.yaml
deleted file mode 100644
index f3cfb0967d..0000000000
--- a/jdk10-jtreg-test-persist-results.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-- job:
-    name: jdk10-jtreg-test-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes the results to $HOME/srv/openjdk10/openjdk-jtreg-nightly-tests.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Write jtreg tests results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: user-defined
-            name: JTREG_CATEGORY
-            values:
-                - jdk
-                - hotspot
-                - langtools
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk10-jtreg-test
-            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: jdk10-build-image
-            filter: 'out/jdk10-server-${BUILD_TYPE}.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            tree -f .
-
-            PERSIST=$HOME/srv/openjdk10
-            export JDK_VERSION=10
-
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-
-            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk10-server-${BUILD_TYPE}.tar.gz
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-
-            basedir=$PERSIST/openjdk-jtreg-nightly-tests
-            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
-            image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
-
-            rm -rf  ${image_dir}
-            mkdir -p ${image_dir}
-
-            tar -C ${basedir} \
-              --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
-              --show-transformed-names \
-              --overwrite \
-              -xvf ${result_tarball}
-
-            tar -C ${image_dir} \
-              --strip-components=1 \
-              --show-transformed-names \
-              --overwrite \
-              -xvf ${image_tarball}
-
-            # Change location.
-            # Match the exact output of the cron-based scripts.
-            sed_expr1=$(echo s!XXX__YEAR__XXX!$YEAR!g)
-            sed_expr2=$(echo s!YYY__DAY_OF_YEAR__YYY!$DAY_OF_YEAR!g)
-
-            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
-            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
-
-            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
-            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
diff --git a/jdk10-jtreg-test-publish-results.yaml b/jdk10-jtreg-test-publish-results.yaml
deleted file mode 100644
index fd4d50144e..0000000000
--- a/jdk10-jtreg-test-publish-results.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- job:
-    name: jdk10-jtreg-test-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Results are published to http://openjdk.linaro.org/jdk10/openjdk-jtreg-nightly-tests/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Publish jtreg results'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-    builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            PERSIST=$HOME/srv/openjdk10
-            SCRIPT_DIR=$PERSIST/openjdk-test-scripts
-            export JDK_VERSION=10
-
-            (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
-            tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
-
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
-            fi
-
-            tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            export PATH=${WORKSPACE}/jtreg/bin:$PATH
-            which jtdiff
-            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
-    publishers:
-        - archive:
-            artifacts: 'tree.out.xz, env.out'
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk10-jtreg-test.yaml b/jdk10-jtreg-test.yaml
deleted file mode 100644
index 73a8c67a4b..0000000000
--- a/jdk10-jtreg-test.yaml
+++ /dev/null
@@ -1,247 +0,0 @@
-- job:
-    name: jdk10-jtreg-test
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the jtreg tests.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Run jtreg tests'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: user-defined
-            name: JTREG_CATEGORY
-            values:
-                - hotspot
-                - langtools
-                - jdk
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - xvfb:
-            auto-display-name: true
-            additional-options: '-p unix'
-            debug: true
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            target: incoming
-            flatten: true
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk10-build-image
-#            filter: 'out/jdk10-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: jdk10-update-src-tree
-            filter: 'out/jdk10.tar.gz, out/build-date.sh'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: jcstress-build
-            filter: 'tests-all/target/jcstress.jar'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            echo "DISPLAY=${DISPLAY}"
-
-            set -exu
-
-            source incoming/build-date.sh
-
-            export JDK_VERSION=10
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-            IMAGE_DIR=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}
-            PERSIST=$HOME/srv/openjdk10
-
-            JCSTRESS=$PWD/incoming/jcstress.jar
-
-            # Only set =1 for debugging.
-            use_subcategories=0
-
-            if [ ${use_subcategories} -eq 1 ]; then
-              case ${JTREG_CATEGORY} in
-                langtools)
-                    JTREG_SUBCATEGORIES=tools/javap/typeAnnotations
-                    ;;
-                jdk)
-                    JTREG_SUBCATEGORIES=jdk/net/Sockets
-                    ;;
-                hotspot)
-                    JTREG_SUBCATEGORIES=runtime/CommandLine
-                    ;;
-              esac
-            fi
-
-            : ${JTREG_SUBCATEGORIES:=.}
-
-            tar xf incoming/jdk10.tar.gz
-            tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz
-
-            # All the output directories and general frobbing
-            # output is to match the existing layout as expected
-            # by the cron-based publish and reporting scripts.
-            # XXX There's probably a better way.
-
-            YEAR=XXX__YEAR__XXX
-            DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY
-
-            basedir=cron_output
-            mkdir -p ${basedir}/{src,builds,reports}
-
-            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
-
-            mkdir -p out ${src_dir} ${work_dir} ${report_dir}
-
-            mv jdk10/* ${src_dir}
-
-            blacklist=${WORKSPACE}/excludes.txt
-            jdk_problem_list=${src_dir}/${JTREG_CATEGORY}/test/ProblemList.txt
-
-            if [ -e $jdk_problem_list ]; then
-                cat $jdk_problem_list > ${blacklist}
-            fi
-
-            aarch64_exclude_file=${src_dir}/test/exclude_aarch64.txt
-
-            if [ -e ${aarch64_exclude_file} ]; then
-                cat ${aarch64_exclude_file} >> ${blacklist}
-            fi
-
-            touch ${blacklist}
-
-            echo "Blacklist"
-            echo "========="
-            cat ${blacklist}
-            echo "---------"
-
-            export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=$JAVA_HOME/bin:${PATH}
-
-            # For hotspot and jdk we pass a -nativepath: option to jtreg.
-            # This enables the tests needing native libraries to run.
-            NATIVEPATH=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
-
-            if [ $JTREG_CATEGORY = "langtools" ]; then
-                # The nativepath option we pass must be a valid directory, or
-                # not at all.`
-                NATIVE_OPT=
-            else
-                # Test executables are expected to be in same directory as libraries
-                mv $NATIVEPATH/../bin/* $NATIVEPATH
-                NATIVE_OPT=-nativepath:$NATIVEPATH
-            fi
-
-            PATH=${WORKSPACE}/jtreg/bin:${PATH}
-            which java
-            java -version
-
-            # Ignore error in jtreg final result.
-            set +e
-
-            # hotspot splits its tests into gtest jtreg tests. We just do jtreg.
-            if [ $JTREG_CATEGORY == "hotspot" ]; then
-                TEST_SUBDIR=${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps
-            else
-                TEST_SUBDIR=${JTREG_CATEGORY}
-            fi
-
-            if [ $JVM_VARIANT = "server" ]; then
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir}/test/${TEST_SUBDIR} \
-                  -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
-                  -vmoption:-XX:-TieredCompilation \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  $NATIVE_OPT \
-                  -timeout:8 \
-                  -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
-            else
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir}/test/${TEST_SUBDIR} \
-                  -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
-                  -vmoption:-XX:+TieredCompilation \
-                  -vmoption:-XX:TieredStopAtLevel=1 \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  $NATIVE_OPT \
-                  -timeout:8 \
-                  -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
-            fi
-
-            # Kill leftover jstatd processes.
-            killall -9 jstatd
-            set -e
-
-            # We don't care for the .class files.
-            find ${work_dir} -name \*.class -exec rm {} \;
-
-            # Match the exact output of the cron-based scripts.
-            dest=$PERSIST/openjdk-jtreg-nightly-tests
-            sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
-            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
-            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
-
-            mkdir -p out
-            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports
-    publishers:
-        - archive:
-            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk10-persist-all-results.yaml b/jdk10-persist-all-results.yaml
deleted file mode 100644
index 64444e7ca0..0000000000
--- a/jdk10-persist-all-results.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: jdk10-persist-all-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * This job persist all results.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 10 - Persist all results'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: jdk10-jtreg-test-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-specjbb2015-benchmark-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-terasort-benchmark-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-jcstress-test-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-update-src-tree-persist
-              block: true
-              current-parameters: true
diff --git a/jdk10-publish-all-results.yaml b/jdk10-publish-all-results.yaml
deleted file mode 100644
index 47cf06bdd2..0000000000
--- a/jdk10-publish-all-results.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- job:
-    name: jdk10-publish-all-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 10 - Invoke all the scripts to sync results to openjdk.linaro.org'
-    parameters:
-        - string:
-            name: PUBLISH_DEST
-            default: '/home/openjdk-testing/jdk10'
-        - string:
-            name: PUBLISH_HOST
-            default: 'stuart.monteith@people.linaro.org'
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: jdk10-jtreg-test-publish-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-specjbb2015-benchmark-publish-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-terasort-benchmark-publish-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk10-jcstress-test-publish-results
-              block: true
-              current-parameters: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk10-publish-and-report.yaml b/jdk10-publish-and-report.yaml
deleted file mode 100644
index cc428e260a..0000000000
--- a/jdk10-publish-and-report.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- job:
-    name: jdk10-publish-and-report
-    project-type: multijob
-    defaults: global
-    description: |
-        * This job publishes results and send e-mail reports.
-    logrotate:
-        numToKeep: 10
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: DAYS
-            default: '15'
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 10 - Publish results and send reports'
-    wrappers:
-        - timestamps
-# Replaced by parameters
-#        - inject:
-#            properties-content: 'DAYS=15'
-    builders:
-        - multijob:
-            name: 'Persist results'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-persist-all-results
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'Publish results to openjdk.linaro.org'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-publish-all-results
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'Generate e-mail report'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-generate-email-report
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'E-mail results'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk10-email-results
-                current-parameters: true
-                kill-phase-on: FAILURE
diff --git a/jdk10-specjbb2015-benchmark-persist-results.yaml b/jdk10-specjbb2015-benchmark-persist-results.yaml
deleted file mode 100644
index dd7ccdd21b..0000000000
--- a/jdk10-specjbb2015-benchmark-persist-results.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-- job:
-    name: jdk10-specjbb2015-benchmark-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes the results to $HOME/srv/openjdk10/SPECjbb2015-nightly-runs.<br>
-        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
-          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Write SPECjbb2015 results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk10-specjbb2015-benchmark
-            filter: 'out/specjbb*.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            tree -f .
-
-            PERSIST=$HOME/srv/openjdk10
-            TOP_DIR=$PERSIST
-            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-            mkdir -p $TOP_DIR
-
-            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
-            fi
-
-            source $SCRIPT_DIR/common.sh
-
-            # Ensure nightly results dir exists.
-            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
-
-            echo "Previous Results"
-            cat ${RESULTS_CSV}
-            set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            [ -e $result_tarball ] || exit 1
-            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
-            cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
-            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
-            echo "Updating ${RESULTS_CSV}"
-            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk10-specjbb2015-benchmark-publish-results.yaml b/jdk10-specjbb2015-benchmark-publish-results.yaml
deleted file mode 100644
index a78785745e..0000000000
--- a/jdk10-specjbb2015-benchmark-publish-results.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: jdk10-specjbb2015-benchmark-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Reports are published to http://openjdk.linaro.org/jdk10/SPECjbb2015-results/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '4090'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '1015'
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Publish SPECjbb2015 benchmark results'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-                users:
-                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-            PERSIST=$HOME/srv/openjdk10
-            export TOP_DIR=$PERSIST
-            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-
-            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk10-specjbb2015-benchmark.yaml b/jdk10-specjbb2015-benchmark.yaml
deleted file mode 100644
index 1be838fbd6..0000000000
--- a/jdk10-specjbb2015-benchmark.yaml
+++ /dev/null
@@ -1,127 +0,0 @@
-- job:
-    name: jdk10-specjbb2015-benchmark
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Run SPECjbb2015 benchmark'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk10-build-image
-#            filter: 'out/jdk10-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: archive-specjbb2015-product-tarball
-            filter: 'out/SPECjbb2015.tgz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-            #
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            ## Extract jdk
-            tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=$JAVA_HOME/bin:$PATH
-            which java
-            java -version
-
-            ## Extract specjbb2015 product
-            tar xf incoming/SPECjbb2015.tgz
-
-            ## Run test
-
-            SPECJBB_PRODUCT_HOME=SPECjbb2015
-
-            # This commented-out invocation is a quick test that
-            # takes about 10 minutes to complete - which can be
-            # useful when debugging.
-
-            #(cd $SPECJBB_PRODUCT_HOME; \
-            # time java \
-            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
-            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
-            #   -Dspecjbb.controller.type=PRESET \
-            #   -Dspecjbb.controller.preset.ir=4000 \
-            #   -Dspecjbb.controller.preset.duration=100 \
-            #   -jar specjbb2015.jar -m composite)
-
-            if [ $JVM_VARIANT = "server" ]; then
-                (cd $SPECJBB_PRODUCT_HOME; java --add-modules java.se.ee -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
-            else
-                (cd $SPECJBB_PRODUCT_HOME; java --add-modules java.se.ee  -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
-            fi
-
-            mkdir -p out
-
-            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/")
-
-            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
-
-            java -jar $SPECJBB_PRODUCT_HOME/specjbb2015.jar \
-              -m REPORTER \
-              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
-              -p $SPECJBB_PRODUCT_HOME/config/specjbb2015.props \
-              -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
-              -l 1
-
-            tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result
-
-            rm -rf html
-            mkdir html
-            cp -a result/**/report-00001/* html
-            cp html/*0001.html html/index.html
-    publishers:
-        - archive:
-            artifacts: 'out/*.gz'
-        - html-publisher:
-            name: 'HTML Report'
-            dir: 'html'
-            files: 'index.html'
-            keep-all: true
diff --git a/jdk10-terasort-benchmark-persist-results.yaml b/jdk10-terasort-benchmark-persist-results.yaml
deleted file mode 100644
index 628c4ba93f..0000000000
--- a/jdk10-terasort-benchmark-persist-results.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- job:
-    name: jdk10-terasort-benchmark-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Write terasort results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk10-terasort-benchmark
-            filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            PERSIST=$HOME/srv/openjdk10
-            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
-            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv
-            prev_results=$BENCHMARK_RESULTS_DIR/results.csv
-
-            # Ensure persistent directory exists.
-            mkdir -p $BENCHMARK_RESULTS_DIR
-
-            # Tolerate missing results.csv file.
-            if [ ! -f $prev_results ]; then
-                touch $prev_results
-            fi
-
-            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
-            fi
-
-            echo "Previous Results"
-            echo "----------------"
-            cat ${prev_results}
-            echo
-
-            cat ${new_results} >> ${prev_results}
-
-            $SCRIPT_DIR/update-results-db
diff --git a/jdk10-terasort-benchmark-publish-results.yaml b/jdk10-terasort-benchmark-publish-results.yaml
deleted file mode 100644
index 683e320e75..0000000000
--- a/jdk10-terasort-benchmark-publish-results.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-- job:
-    name: jdk10-terasort-benchmark-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '3275'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '854'
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Publish terasort benchmark results'
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-            users:
-                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-        - timestamps
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - shell: |
-            #!/bin/bash
-            PERSIST=$HOME/srv/openjdk10
-            export JDK_VERSION=10
-
-            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
-            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
-
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
-            fi
-
-            $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk10-terasort-benchmark.yaml b/jdk10-terasort-benchmark.yaml
deleted file mode 100644
index 92a0594dca..0000000000
--- a/jdk10-terasort-benchmark.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-- job:
-    name: jdk10-terasort-benchmark
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the terasort benchmark.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Run terasort benchmark'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk10-build-image
-#            filter: 'out/jdk10-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: openjdk8-hadoop-LCA14
-            filter: 'out/openjdk8-hadoop-LCA14.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            NGIGABYTES=1
-
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            ## Extract jdk
-            rm -rf jdk10*
-            tar xf ~/workspace/jdk10-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk10-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-
-            export JAVA_HOME=${WORKSPACE}/jdk10-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=${JAVA_HOME}/bin:$PATH
-
-            ## Extract Hadoop pre-builts
-            rm -rf openjdk8-hadooop-LCA14
-            tar xf incoming/openjdk8-hadoop-LCA14.tar.gz
-
-            ## Benchmark
-            # FIXME
-            #(cd incoming; wget --progress=dot -e dotbytes=10M http://openjdk-apm1/openjdk8-build-artefacts/${NGIGABYTES}GB.tar.gz; tar xf ${NGIGABYTES}GB.tar.gz)
-            (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
-
-            TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
-            HADOOP_DIR=${WORKSPACE}/openjdk8-hadoop-LCA14
-
-            rm -rf out
-            mkdir out
-
-            sed -i '/^export JAVA_HOME=/d' ${HADOOP_DIR}/conf/hadoop-env.sh
-            echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_DIR}/conf/hadoop-env.sh
-            sed -i 's|/work/${user.name}/hadoop-tmp|${user.home}/hadoop/tmp|' ${HADOOP_DIR}/conf/core-site.xml
-
-            source ${HADOOP_DIR}/env.sh
-
-            which hadoop
-            which java
-            which hdfs
-            java -version
-
-            stop-dfs.sh
-            stop-yarn.sh
-
-            rm -rf ${HOME}/hadoop
-            mkdir -p ${HOME}/hadoop/tmp
-            hdfs namenode -format -force
-            start-dfs.sh
-            start-yarn.sh
-
-            # Need time for the datanodes to materialise.
-            sleep 30
-            jps
-
-            hadoop fs -mkdir -p /user/$USER
-            hadoop fs -copyFromLocal $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB /user/$USER
-
-            trap "stop-dfs.sh; stop-yarn.sh" EXIT
-
-            # Use only C1 compiler for client runs.
-            if [ $JVM_VARIANT = "client" ]; then
-                VARIANT_OPT=-XX:TieredStopAtLevel=1
-            else
-                VARIANT_OPT=-Dharmless.property
-            fi
-
-            elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
-            HADOOP_OPTS=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
-
-            hadoop fs -rm -R ${NGIGABYTES}GB-sorted
-            sed -i 's/\..*//' $elapsed_time_file
-            elapsed_time=$(cat $elapsed_time_file)
-            date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
-            echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv
-            rm -rf incoming/${NGIGABYTES}*
-    publishers:
-        - archive:
-            artifacts: 'out/terasort-results-*.csv'
diff --git a/jdk10-update-src-tree-persist.yaml b/jdk10-update-src-tree-persist.yaml
deleted file mode 100644
index e59b8cdd1a..0000000000
--- a/jdk10-update-src-tree-persist.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- job:
-    name: jdk10-update-src-tree-persist
-    project-type: freestyle
-    defaults: global
-    description: |
-        This jobs writes the current jdk10 src tree to /work/openjdk-testing/jdk10/openjdk-jtreg-nightly-tests/...<br>
-        It is used to report failure/errors against the jtreg results.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Write jdk10 source tree'
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-    builders:
-        - copyartifact:
-            project: jdk10-update-src-tree
-            filter: 'out/*'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-            PERSIST=$HOME/srv/openjdk10
-
-            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
-            src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
-            mkdir -p $src_dir
-            echo "Extracting tarball to $src_dir"
-            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk10.tar.gz
-
-            # Copy bill-of-materials to persistent area for email report.
-            cp incoming/BOM $TOP_DIR
diff --git a/jdk10-update-src-tree.yaml b/jdk10-update-src-tree.yaml
deleted file mode 100644
index 54a724798e..0000000000
--- a/jdk10-update-src-tree.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-- scm:
-    name: jdk10
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk/jdk10
-            clean: true
-            subdir: jdk10
-- job:
-    name: jdk10-update-src-tree
-    project-type: freestyle
-    defaults: global
-    description: |
-        This job polls upstream Mercurial servers for changes and,<br>
-        if there are any, triggers "jdk10-build-and-test".<br>
-        Note: this job archives the src which is later required by the jtreg<br>
-        report and publish job. The build-date.sh artefact contains shell<br>
-        variables for the day and day-of-year the source was archived.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 10 - Update jdk10 source tree'
-    scm:
-        - jdk10
-    triggers:
-        - pollscm: 'H 2 1-6/2 * *'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -eu
-
-            rm -rf out
-            mkdir out
-
-            pushd jdk10
-            #find . -name BOM -exec rm {} \;
-            #commit_id=$(hg identify | awk '{print $1}')
-            #echo "jdk10-${commit_id}" | tee -a BOM
-
-            #for i in corba jaxp jaxws langtools jdk hotspot nashorn; do
-            #  pushd $i
-            #  commit_id=$(hg identify | awk '{print $1}')
-            #  dir=$(basename $PWD)
-            #  echo "${dir}-${commit_id}" | tee -a ../BOM
-            #  popd
-            #done
-
-            ## Pull out subdirectory HG versions
-            echo BOM for $(hg paths default) > BOM
-            echo -e Subdir\\tHash\\t\\tTag\\tTag hash >> BOM
-            echo -e .\\t$(hg head --template '{node|short}\t' tip; hg tags --template="{tag}\t{node|short}\n" | grep -ve '^tip' | head -n1) >>BOM
-
-            cp BOM $WORKSPACE/out
-
-            popd
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-
-            : ${YEAR_YESTERDAY:=$YEAR}
-            : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
-
-            echo "YEAR=${YEAR}" >dates.prop
-            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
-
-            echo "export YEAR=${YEAR}" > out/build-date.sh
-            echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
-
-            tar --exclude=.hg -acf out/jdk10.tar.gz jdk10
-    publishers:
-        - archive:
-            artifacts: 'out/jdk10.tar.gz, out/build-date.sh, out/BOM'
-        - fingerprint:
-            files: 'out/*'
-            record-artifacts: true
-        - trigger-parameterized-builds:
-            - project: jdk10-build-and-test
-              condition: SUCCESS
-              property-file: dates.prop
diff --git a/jdk11-build-and-test.yaml b/jdk11-build-and-test.yaml
new file mode 100644
index 0000000000..211432883c
--- /dev/null
+++ b/jdk11-build-and-test.yaml
@@ -0,0 +1,133 @@
+- job:
+    name: jdk11-build-and-test
+    project-type: multijob
+    defaults: global
+    description: |
+        * This jobs builds the jdk images and runs tests and benchmarks against the built images.<br>
+        * <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk11-update-src-tree" job).<br>
+        If it is run manually it will use the source tarball from the last successful build of that job.<br>
+        * If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 11u - Build jdk images and run tests/benchmarks'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - multijob:
+            name: 'OpenJDK Clean job'
+            condition: SUCCESSFUL
+            projects:
+                - name: jdk-clean-job
+                  current-parameters: true
+                  kill-phase-on: NEVER
+        - multijob:
+            name: 'Build jdk images'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-build-image
+                current-parameters: true
+                kill-phase-on: FAILURE
+        # Get depenencies for subsequent jobs.
+        - multijob:
+            name: 'Get Deps'
+            condition: ALWAYS
+            projects:
+              - name: jdk11-get-deps
+                current-parameters: true
+                kill-phase-on: FAILURE
+# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
+# Exception in thread "main" java.util.ServiceConfigurationError:
+# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
+# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
+# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
+        - multijob:
+            name: 'SPECjbb2015 benchmark'
+            condition: ALWAYS
+            projects:
+              - name: jdk11-specjbb2015-benchmark
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: '1GB Terasort benchmark'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-terasort-benchmark
+                current-parameters: true
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'JTREG tests'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-jtreg-test
+                current-parameters: true
+                predefined-parameters: 'XJTREG_SUBCATEGORIES=tools/javap/typeAnnotations'
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'jcstress'
+            condition: COMPLETED
+            projects:
+              - name: jdk11-jcstress-test
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-publish-and-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - copyartifact:
+            project: jdk11-update-src-tree
+            filter: 'out/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk11-build-image
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk11-specjbb2015-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk11-terasort-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk11-jtreg-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+            stable: true
+        - copyartifact:
+            project: jdk11-jcstress-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+    publishers:
+        - archive:
+            artifacts: 'out/**/*'
diff --git a/jdk11-build-image.yaml b/jdk11-build-image.yaml
new file mode 100644
index 0000000000..fd28fdad48
--- /dev/null
+++ b/jdk11-build-image.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk11-build-image
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk11 (ie, bin/java, bin/javac, et al) for various configurations.<br>
+        * The source tarball is copied from the jdk11-update-src-tree job.<br>
+        * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Configure and build OpenJDK 11u'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk11-update-src-tree
+            filter: 'out/jdk11u.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+
+            cd $HOME/srv/jdk-cache/jdk10
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xf incoming/jdk11u.tar.gz
+
+            shopt -s nullglob
+
+
+
+            # Configure and build.
+            mkdir -p build-stage1 build-stage2 out
+
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../jdk11u/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk11 ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
+              popd
+
+              pushd build-stage2
+              sh ../jdk11u/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            else
+              pushd build-stage2
+              sh ../jdk11u/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk11u-${BUILD_TYPE}
+            tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
+
+            # Copy gtest materials to the correct place.
+            ( cd build-stage2
+              mkdir support/test/hotspot/jtreg/native/lib/server
+              cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/jtreg/native/lib/server
+            )
+
+            # Archive test support files.
+            tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.gz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk11-build-release.yaml b/jdk11-build-release.yaml
new file mode 100644
index 0000000000..98d8726027
--- /dev/null
+++ b/jdk11-build-release.yaml
@@ -0,0 +1,123 @@
+- job:
+    name: jdk11-build-release
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk11 for release. Run after the source has passed tests.
+        * Tags build with Linaro-YYMM as per normal release procedure.
+        * The source tarball is copied from the jdk11-update-src-tree job.<br>
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Configure and build OpenJDK 11u Release'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk11-update-src-tree
+            filter: 'out/jdk11u.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            # Generate files names dependent on year/month.
+            RELEASE=$(date +%y%m)
+            JDKDIR=jdk11u-${BUILD_TYPE}-${RELEASE}
+            JDK_SRCDIR=jdk11u-src-${RELEASE}
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+            mkdir -p build-stage1 build-stage2 out
+
+            cd $HOME/srv/jdk-cache/jdk10
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xaf incoming/jdk11u.tar.gz
+
+            mv jdk11u $JDK_SRCDIR
+            # Tar up the source before sullying it with a build.
+            tar --exclude=.hg\* -acf out/jdk11u-src-${RELEASE}.tar.xz $JDK_SRCDIR
+
+            mv $JDK_SRCDIR $JDKDIR
+            shopt -s nullglob
+
+            # Configure and build.
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk11 ${ccache_build_opts}
+              make images
+              popd
+
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            else
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk11u-${BUILD_TYPE}-${RELEASE}
+
+            # This is different from ordinary builds.
+            tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.xz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk11-email-results.yaml b/jdk11-email-results.yaml
new file mode 100644
index 0000000000..a61113322b
--- /dev/null
+++ b/jdk11-email-results.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: jdk11-email-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Sends the report.txt file to the aarch64-port-dev mailing list.<br>
+        * The text report is copied from the jdk11-generate-text-report job.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 11u - Send e-mail report'
+
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk11-generate-email-report
+            filter: 'report.txt'
+    publishers:
+        - email-ext:
+            recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net'
+            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 11u on AArch64'
+            content-type: text
+            body: |
+                ${FILE,path="report.txt"}
+            success: true
diff --git a/jdk11-generate-email-report.yaml b/jdk11-generate-email-report.yaml
new file mode 100644
index 0000000000..9c705c8919
--- /dev/null
+++ b/jdk11-generate-email-report.yaml
@@ -0,0 +1,74 @@
+- job:
+    name: jdk11-generate-email-report
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job aggregates the results from various jobs:<br>
+        <br>
+            * jcstress<br>
+            * jtreg<br>
+            * terasort<br>
+            * specjbb<br>
+        <br>
+        in text form suitable for the aarch64-port-dev mailing list.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Generate e-mail report'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            PERSIST=$HOME/srv/openjdk11u
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            export JDK_VERSION=11u
+            which jtdiff
+
+            TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/jdk${JDK_VERSION}/ >> ${WORKSPACE}/report.txt
+    publishers:
+        - archive:
+            artifacts: 'report.txt'
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk11-get-deps.yaml b/jdk11-get-deps.yaml
new file mode 100644
index 0000000000..5a87195413
--- /dev/null
+++ b/jdk11-get-deps.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: jdk11-get-deps
+    project-type: freestyle
+    defaults: global
+    description: |
+        Download dependencies for builds. This includes build source code, jtreg, jcstress.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Get Dependencies'
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jcstress-build
+            filter: 'tests-all/target/jcstress.jar'
+            flatten: true
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - copyartifact:
+            project: jdk11-update-src-tree
+            filter: 'out/jdk11u.tar.gz, out/build-date.sh'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            find $PWD -maxdepth 1
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk11-jcstress-test-persist-results.yaml b/jdk11-jcstress-test-persist-results.yaml
new file mode 100644
index 0000000000..989a88ccf0
--- /dev/null
+++ b/jdk11-jcstress-test-persist-results.yaml
@@ -0,0 +1,89 @@
+- job:
+    name: jdk11-jcstress-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to:<br>
+          * /work/openjdk-testing/jcstress-nightly-runs<br>
+          * /work/openjdk-testing/jcstress-results
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Write jcstress tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk11-update-src-tree
+            filter: 'out/build-date.sh'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk11-jcstress-test
+            filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk11u
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
+            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
+            RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
+
+            mkdir -p $JCSTRESS_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $RESULTS_CSV ]; then
+                touch $RESULTS_CSV
+            fi
+
+            mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz
+            numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
+            sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
+
diff --git a/jdk11-jcstress-test-publish-results.yaml b/jdk11-jcstress-test-publish-results.yaml
new file mode 100644
index 0000000000..2829117a95
--- /dev/null
+++ b/jdk11-jcstress-test-publish-results.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: jdk11-jcstress-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Publish jcstress report'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+
+            PERSIST=$HOME/srv/openjdk11u
+            SCRIPT_DIR=$PERSIST/jcstress-test-scripts
+            export JDK_VERSION=11u
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
+            fi
+            export TOP_DIR=$PERSIST
+
+            $SCRIPT_DIR/jcstress-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk11-jcstress-test.yaml b/jdk11-jcstress-test.yaml
new file mode 100644
index 0000000000..17d8ed9287
--- /dev/null
+++ b/jdk11-jcstress-test.yaml
@@ -0,0 +1,92 @@
+- job:
+    name: jdk11-jcstress-test
+    project-type: matrix
+    defaults: global
+    description: |
+        This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
+        <b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
+        This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Run jcstress tests'
+    parameters:
+        - string:
+            name: JCSTRESS_MODE
+            default: 'sanity'
+    axes:
+        - axis:
+            type: user-defined
+
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+        - timeout:
+            timeout: 900
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            TEST_TYPE=all
+            DEPS=$HOME/workspace/jdk11-get-deps
+
+            JCSTRESS_JAR=$DEPS/jcstress.jar
+            rm -rf jdk11*
+            tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11u-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk11u-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:${PATH}
+            which java
+            java -version
+
+            # XXX Don't fail the job if jcstress itself fails.
+            set +e
+            java -jar ${JCSTRESS_JAR} -m ${JCSTRESS_MODE}
+
+            test_result=$?
+            set -e
+
+            rm -rf out
+            mkdir out
+
+            out_dirname=jcstress-results-${BUILD_TYPE}
+
+            rm -rf ${out_dirname}
+            mkdir -p ${out_dirname}
+            cp jcstress-results*.bin.gz ${out_dirname}
+            cp -a results ${out_dirname}
+
+            tar czvf out/${out_dirname}.tar.gz ${out_dirname}
+    publishers:
+        - archive:
+            artifacts: 'out/jcstress-results-*.tar.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'results'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk11-jtreg-test-persist-results.yaml b/jdk11-jtreg-test-persist-results.yaml
new file mode 100644
index 0000000000..2a531f7fdd
--- /dev/null
+++ b/jdk11-jtreg-test-persist-results.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk11-jtreg-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk11u/openjdk-jtreg-nightly-tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Write jtreg tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - jdk
+                - hotspot
+                - langtools
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk11-jtreg-test
+            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk11-build-image
+            filter: 'out/jdk11u-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk11u
+            export JDK_VERSION=11u
+
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz
+
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk11u-${BUILD_TYPE}.tar.gz
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            basedir=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
+
+            rm -rf  ${image_dir}
+            mkdir -p ${image_dir}
+
+            tar -C ${basedir} \
+              --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${result_tarball}
+
+            tar -C ${image_dir} \
+              --strip-components=1 \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${image_tarball}
+
+            # Change location.
+            # Match the exact output of the cron-based scripts.
+            sed_expr1=$(echo s!XXX__YEAR__XXX!$YEAR!g)
+            sed_expr2=$(echo s!YYY__DAY_OF_YEAR__YYY!$DAY_OF_YEAR!g)
+
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
+
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
diff --git a/jdk11-jtreg-test-publish-results.yaml b/jdk11-jtreg-test-publish-results.yaml
new file mode 100644
index 0000000000..3b0b0cedef
--- /dev/null
+++ b/jdk11-jtreg-test-publish-results.yaml
@@ -0,0 +1,71 @@
+- job:
+    name: jdk11-jtreg-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/jdk11u/openjdk-jtreg-nightly-tests/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Publish jtreg results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            PERSIST=$HOME/srv/openjdk11u
+            SCRIPT_DIR=$PERSIST/openjdk-test-scripts
+            export JDK_VERSION=11u
+
+            (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
+            tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
+            fi
+
+            tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            export PATH=${WORKSPACE}/jtreg/bin:$PATH
+            which jtdiff
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
+    publishers:
+        - archive:
+            artifacts: 'tree.out.xz, env.out'
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk11-jtreg-test.yaml b/jdk11-jtreg-test.yaml
new file mode 100644
index 0000000000..440f2cae03
--- /dev/null
+++ b/jdk11-jtreg-test.yaml
@@ -0,0 +1,191 @@
+- job:
+    name: jdk11-jtreg-test
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the jtreg tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Run jtreg tests'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - hotspot
+                - langtools
+                - jdk
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - xvfb:
+            auto-display-name: true
+            additional-options: '-p unix'
+            debug: true
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "DISPLAY=${DISPLAY}"
+
+            set -exu
+
+            DEPS=$HOME/workspace/jdk11-get-deps
+
+            source $DEPS/build-date.sh
+
+            export JDK_VERSION=11u
+            IMAGE_DIR=${WORKSPACE}/jdk11u-${BUILD_TYPE}
+            PERSIST=$HOME/srv/openjdk11u
+
+            JCSTRESS=$DEPS/jcstress.jar
+
+            tar xf $DEPS/jdk11u.tar.gz
+            tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11u-${BUILD_TYPE}.tar.gz
+            tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11u-${BUILD_TYPE}-support.tar.gz
+
+            # All the output directories and general frobbing
+            # output is to match the existing layout as expected
+            # by the cron-based publish and reporting scripts.
+            # XXX There's probably a better way.
+
+            YEAR=XXX__YEAR__XXX
+            DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY
+
+            basedir=cron_output
+            mkdir -p ${basedir}/{src,builds,reports}
+
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+
+            mkdir -p out ${src_dir} ${work_dir} ${report_dir}
+
+            mv jdk11u/* ${src_dir}
+
+            blacklist=${WORKSPACE}/excludes.txt
+            # Add jtreg directory level for hotspot only.
+            jdk_problem_list=${src_dir}/test/${JTREG_CATEGORY}
+            if [ $JTREG_CATEGORY = "hotspot" ]; then
+                jdk_problem_list=${jdk_problem_list}/jtreg/ProblemList.txt
+            else
+                jdk_problem_list=${jdk_problem_list}/ProblemList.txt
+            fi
+
+            if [ -e $jdk_problem_list ]; then
+                cat $jdk_problem_list > ${blacklist}
+            fi
+
+            aarch64_exclude_file=${src_dir}/test/exclude_aarch64.txt
+
+            if [ -e ${aarch64_exclude_file} ]; then
+                cat ${aarch64_exclude_file} >> ${blacklist}
+            fi
+
+            touch ${blacklist}
+
+            echo "Blacklist"
+            echo "========="
+            cat ${blacklist}
+            echo "---------"
+
+            export JAVA_HOME=${WORKSPACE}/jdk11u-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:${PATH}
+
+            # For hotspot and jdk we pass a -nativepath: option to jtreg.
+            # This enables the tests needing native libraries to run.
+            NATIVEPATH=${WORKSPACE}/jdk11u-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
+
+            if [ $JTREG_CATEGORY = "langtools" ]; then
+                # The nativepath option we pass must be a valid directory, or
+                # not at all.`
+                NATIVE_OPT=
+            else
+                # Test executables are expected to be in same directory as libraries
+                mv $NATIVEPATH/../bin/* $NATIVEPATH
+                NATIVE_OPT=-nativepath:$NATIVEPATH
+            fi
+
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            which java
+            java -version
+
+            # Ignore error in jtreg final result.
+            set +e
+
+            # hotspot splits its tests into gtest jtreg tests. We just do jtreg.
+            if [ $JTREG_CATEGORY == "hotspot" ]; then
+                TEST_SUBDIR=test/${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps
+            else
+                TEST_SUBDIR=test/${JTREG_CATEGORY}
+            fi
+
+            java -jar jtreg/lib/jtreg.jar \
+                 -dir:${src_dir} \
+                 -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
+                 -vmoption:-Xmx2G \
+                 -testjdk:${IMAGE_DIR} \
+                 -exclude:${blacklist} \
+                 -conc:20 \
+                 -r:${report_dir} \
+                 -w:${work_dir} \
+                 $NATIVE_OPT \
+                 -timeout:8 \
+                 -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n
+
+
+            # Kill leftover jstatd processes.
+            killall -9 jstatd
+            set -e
+
+            # We don't care for the .class files.
+            find ${work_dir} -name \*.class -exec rm {} \;
+
+            # Match the exact output of the cron-based scripts.
+            dest=$PERSIST/openjdk-jtreg-nightly-tests
+            sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+
+            mkdir -p out
+            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports
+    publishers:
+        - archive:
+            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk11-persist-all-results.yaml b/jdk11-persist-all-results.yaml
new file mode 100644
index 0000000000..65e64bf4fc
--- /dev/null
+++ b/jdk11-persist-all-results.yaml
@@ -0,0 +1,51 @@
+- job:
+    name: jdk11-persist-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * This job persist all results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 11u - Persist all results'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk11-jtreg-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-specjbb2015-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-terasort-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-jcstress-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-update-src-tree-persist
+              block: true
+              current-parameters: true
diff --git a/jdk11-publish-all-results.yaml b/jdk11-publish-all-results.yaml
new file mode 100644
index 0000000000..69d43df53f
--- /dev/null
+++ b/jdk11-publish-all-results.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk11-publish-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 11u - Invoke all the scripts to sync results to openjdk.linaro.org'
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: '/home/openjdk-testing/jdk11u'
+        - string:
+            name: PUBLISH_HOST
+            default: 'stuart.monteith@people.linaro.org'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk11-jtreg-test-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-specjbb2015-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-terasort-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk11-jcstress-test-publish-results
+              block: true
+              current-parameters: true
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk11-publish-and-report.yaml b/jdk11-publish-and-report.yaml
new file mode 100644
index 0000000000..2e86bddf67
--- /dev/null
+++ b/jdk11-publish-and-report.yaml
@@ -0,0 +1,63 @@
+- job:
+    name: jdk11-publish-and-report
+    project-type: multijob
+    defaults: global
+    description: |
+        * This job publishes results and send e-mail reports.
+    logrotate:
+        numToKeep: 10
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: DAYS
+            default: '15'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 11u - Publish results and send reports'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-content: 'DAYS=15'
+    builders:
+        - multijob:
+            name: 'Persist results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-persist-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-publish-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Generate e-mail report'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-generate-email-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'E-mail results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk11-email-results
+                current-parameters: true
+                kill-phase-on: FAILURE
diff --git a/jdk11-specjbb2015-benchmark-persist-results.yaml b/jdk11-specjbb2015-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..ba1e4786b3
--- /dev/null
+++ b/jdk11-specjbb2015-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk11-specjbb2015-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk11u/SPECjbb2015-nightly-runs.<br>
+        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
+          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Write SPECjbb2015 results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk11-specjbb2015-benchmark
+            filter: 'out/specjbb*.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk11u
+            TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            mkdir -p $TOP_DIR
+
+            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
+            fi
+
+            source $SCRIPT_DIR/common.sh
+
+            # Ensure nightly results dir exists.
+            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
+
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            set -eux
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz
+            [ -e $result_tarball ] || exit 1
+            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
+            cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
+            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
+            echo "Updating ${RESULTS_CSV}"
+            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk11-specjbb2015-benchmark-publish-results.yaml b/jdk11-specjbb2015-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..5bcb4569db
--- /dev/null
+++ b/jdk11-specjbb2015-benchmark-publish-results.yaml
@@ -0,0 +1,59 @@
+- job:
+    name: jdk11-specjbb2015-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jdk11/SPECjbb2015-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Publish SPECjbb2015 benchmark results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+                users:
+                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+            PERSIST=$HOME/srv/openjdk11u
+            export TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+
+            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk11-specjbb2015-benchmark.yaml b/jdk11-specjbb2015-benchmark.yaml
new file mode 100644
index 0000000000..510d9991dd
--- /dev/null
+++ b/jdk11-specjbb2015-benchmark.yaml
@@ -0,0 +1,102 @@
+- job:
+    name: jdk11-specjbb2015-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Run SPECjbb2015 benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ## Extract jdk
+            tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11u-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk11u-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:$PATH
+            which java
+            java -version
+
+            ## Extract specjbb2015 product
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015-jdk11.tar.gz
+
+            ## Run test
+
+            SPECJBB_PRODUCT_HOME=SPECjbb2015-1.00
+
+            # This commented-out invocation is a quick test that
+            # takes about 10 minutes to complete - which can be
+            # useful when debugging.
+
+            #(cd $SPECJBB_PRODUCT_HOME; \
+            # time java \
+            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
+            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
+            #   -Dspecjbb.controller.type=PRESET \
+            #   -Dspecjbb.controller.preset.ir=4000 \
+            #   -Dspecjbb.controller.preset.duration=100 \
+            #   -jar specjbb2015.jar -m composite)
+
+            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
+
+            mkdir -p out
+
+            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/")
+
+            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
+
+            java -jar $SPECJBB_PRODUCT_HOME/specjbb2015.jar \
+              -m REPORTER \
+              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
+              -p $SPECJBB_PRODUCT_HOME/config/specjbb2015.props \
+              -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
+              -l 1
+
+            tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result
+
+            rm -rf html
+            mkdir html
+            cp -a result/**/report-00001/* html
+            cp html/*0001.html html/index.html
+    publishers:
+        - archive:
+            artifacts: 'out/*.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'html'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk11-terasort-benchmark-persist-results.yaml b/jdk11-terasort-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..76caf2216b
--- /dev/null
+++ b/jdk11-terasort-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk11-terasort-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Write terasort results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk11-terasort-benchmark
+            filter: 'out/terasort-results-${BUILD_TYPE}.csv'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk11u
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv
+            prev_results=$BENCHMARK_RESULTS_DIR/results.csv
+
+            # Ensure persistent directory exists.
+            mkdir -p $BENCHMARK_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $prev_results ]; then
+                touch $prev_results
+            fi
+
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            echo "Previous Results"
+            echo "----------------"
+            cat ${prev_results}
+            echo
+
+            cat ${new_results} >> ${prev_results}
+
+            $SCRIPT_DIR/update-results-db
diff --git a/jdk11-terasort-benchmark-publish-results.yaml b/jdk11-terasort-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..a91ef7ea84
--- /dev/null
+++ b/jdk11-terasort-benchmark-publish-results.yaml
@@ -0,0 +1,67 @@
+- job:
+    name: jdk11-terasort-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '3275'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '854'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Publish terasort benchmark results'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+            PERSIST=$HOME/srv/openjdk11u
+            export JDK_VERSION=11u
+
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk11-terasort-benchmark.yaml b/jdk11-terasort-benchmark.yaml
new file mode 100644
index 0000000000..745fe2fb9c
--- /dev/null
+++ b/jdk11-terasort-benchmark.yaml
@@ -0,0 +1,112 @@
+- job:
+    name: jdk11-terasort-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the terasort benchmark.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Run terasort benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            NGIGABYTES=1
+
+
+            CACHE_FILES=$HOME/srv/jdk-cache
+            ## Extract jdk
+            rm -rf jdk11u*
+            tar xf ~/workspace/jdk11-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk11u-${BUILD_TYPE}.tar.gz
+
+            export JAVA_HOME=${WORKSPACE}/jdk11u-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:$PATH
+
+            ## Extract Hadoop pre-builts
+            rm -rf openjdk8-hadooop-LCA14
+            tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz
+
+            rm -rf incoming; mkdir -p incoming
+            ## Benchmark
+            (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
+
+            TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
+            HADOOP_DIR=${WORKSPACE}/openjdk8-hadoop-LCA14
+
+            rm -rf out
+            mkdir out
+
+            sed -i '/^export JAVA_HOME=/d' ${HADOOP_DIR}/conf/hadoop-env.sh
+            echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_DIR}/conf/hadoop-env.sh
+            sed -i 's|/work/${user.name}/hadoop-tmp|${user.home}/hadoop/tmp|' ${HADOOP_DIR}/conf/core-site.xml
+
+            source ${HADOOP_DIR}/env.sh
+
+            which hadoop
+            which java
+            which hdfs
+            java -version
+
+            stop-dfs.sh
+            stop-yarn.sh
+
+            rm -rf ${HOME}/hadoop
+            mkdir -p ${HOME}/hadoop/tmp
+            hdfs namenode -format -force
+            start-dfs.sh
+            start-yarn.sh
+
+            # Need time for the datanodes to materialise.
+            sleep 30
+            jps
+
+            hadoop fs -mkdir -p /user/$USER
+            hadoop fs -copyFromLocal $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB /user/$USER
+
+            trap "stop-dfs.sh; stop-yarn.sh" EXIT
+
+            elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
+            /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+
+            hadoop fs -rm -R ${NGIGABYTES}GB-sorted
+            sed -i 's/\..*//' $elapsed_time_file
+            elapsed_time=$(cat $elapsed_time_file)
+            date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
+            echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv
+            rm -rf incoming/${NGIGABYTES}*
+    publishers:
+        - archive:
+            artifacts: 'out/terasort-results-*.csv'
diff --git a/jdk11-update-src-tree-persist.yaml b/jdk11-update-src-tree-persist.yaml
new file mode 100644
index 0000000000..51436b1445
--- /dev/null
+++ b/jdk11-update-src-tree-persist.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk11-update-src-tree-persist
+    project-type: freestyle
+    defaults: global
+    description: |
+        This jobs writes the current jdk11 src tree to /work/openjdk-testing/jdk11/openjdk-jtreg-nightly-tests/...<br>
+        It is used to report failure/errors against the jtreg results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Write jdk11 source tree'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk11-update-src-tree
+            filter: 'out/*'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+            PERSIST=$HOME/srv/openjdk11u
+
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
+            mkdir -p $src_dir
+            echo "Extracting tarball to $src_dir"
+            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk11u.tar.gz
+
+            # Copy bill-of-materials to persistent area for email report.
+            cp incoming/BOM $TOP_DIR
diff --git a/jdk11-update-src-tree.yaml b/jdk11-update-src-tree.yaml
new file mode 100644
index 0000000000..4a73e78042
--- /dev/null
+++ b/jdk11-update-src-tree.yaml
@@ -0,0 +1,101 @@
+- scm:
+    name: jdk11u
+    scm:
+        - hg:
+            url: https://hg.openjdk.java.net/jdk-updates/jdk11u
+            clean: true
+            subdir: jdk11u
+- job:
+    name: jdk11-update-src-tree
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job polls upstream Mercurial servers for changes and,<br>
+        if there are any, triggers "jdk11-build-and-test".<br>
+        Note: this job archives the src which is later required by the jtreg<br>
+        report and publish job. The build-date.sh artefact contains shell<br>
+        variables for the day and day-of-year the source was archived.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk14-.*"
+                - "jdk13-.*"
+                - "jdk8-.*"
+                - "jdkX-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 11u - Update jdk11 source tree'
+    scm:
+        - jdk11u
+    triggers:
+        - pollscm:
+            cron: '0 7 * * 2,4,6'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            rm -rf out
+            mkdir out
+
+            pushd jdk11u
+            #find . -name BOM -exec rm {} \;
+            #commit_id=$(hg identify | awk '{print $1}')
+            #echo "jdk11-${commit_id}" | tee -a BOM
+
+            #for i in corba jaxp jaxws langtools jdk hotspot nashorn; do
+            #  pushd $i
+            #  commit_id=$(hg identify | awk '{print $1}')
+            #  dir=$(basename $PWD)
+            #  echo "${dir}-${commit_id}" | tee -a ../BOM
+            #  popd
+            #done
+
+            ## Pull out subdirectory HG versions
+            echo BOM for $(hg paths default) > BOM
+            echo -e Subdir\\tHash\\t\\tTag\\tTag hash >> BOM
+            echo -e .\\t$(hg head --template '{node|short}\t' tip; hg tags --template="{tag}\t{node|short}\n" | grep -ve '^tip' | head -n1) >>BOM
+
+            cp BOM $WORKSPACE/out
+
+            popd
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            : ${YEAR_YESTERDAY:=$YEAR}
+            : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
+
+            echo "YEAR=${YEAR}" >dates.prop
+            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
+
+            echo "export YEAR=${YEAR}" > out/build-date.sh
+            echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
+
+            tar --exclude=.hg -acf out/jdk11u.tar.gz jdk11u
+    publishers:
+        - archive:
+            artifacts: 'out/jdk11u.tar.gz, out/build-date.sh, out/BOM'
+        - fingerprint:
+            files: 'out/*'
+            record-artifacts: true
+        - trigger-parameterized-builds:
+            - project: jdk11-build-and-test
+              condition: SUCCESS
+              property-file: dates.prop
diff --git a/jdk12-build-and-test.yaml b/jdk12-build-and-test.yaml
new file mode 100644
index 0000000000..deabef258f
--- /dev/null
+++ b/jdk12-build-and-test.yaml
@@ -0,0 +1,133 @@
+- job:
+    name: jdk12-build-and-test
+    project-type: multijob
+    defaults: global
+    description: |
+        * This jobs builds the jdk images and runs tests and benchmarks against the built images.<br>
+        * <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk12-update-src-tree" job).<br>
+        If it is run manually it will use the source tarball from the last successful build of that job.<br>
+        * If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 12 - Build jdk images and run tests/benchmarks'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - multijob:
+            name: 'OpenJDK Clean job'
+            condition: SUCCESSFUL
+            projects:
+                - name: jdk-clean-job
+                  current-parameters: true
+                  kill-phase-on: NEVER
+        - multijob:
+            name: 'Build jdk images'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-build-image
+                current-parameters: true
+                kill-phase-on: FAILURE
+        # Get depenencies for subsequent jobs.
+        - multijob:
+            name: 'Get Deps'
+            condition: ALWAYS
+            projects:
+              - name: jdk12-get-deps
+                current-parameters: true
+                kill-phase-on: FAILURE
+# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
+# Exception in thread "main" java.util.ServiceConfigurationError:
+# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
+# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
+# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
+        - multijob:
+            name: 'SPECjbb2015 benchmark'
+            condition: ALWAYS
+            projects:
+              - name: jdk12-specjbb2015-benchmark
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: '1GB Terasort benchmark'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-terasort-benchmark
+                current-parameters: true
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'JTREG tests'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-jtreg-test
+                current-parameters: true
+                predefined-parameters: 'XJTREG_SUBCATEGORIES=tools/javap/typeAnnotations'
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'jcstress'
+            condition: COMPLETED
+            projects:
+              - name: jdk12-jcstress-test
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-publish-and-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - copyartifact:
+            project: jdk12-update-src-tree
+            filter: 'out/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk12-build-image
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk12-specjbb2015-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk12-terasort-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk12-jtreg-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+            stable: true
+        - copyartifact:
+            project: jdk12-jcstress-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+    publishers:
+        - archive:
+            artifacts: 'out/**/*'
diff --git a/jdk12-build-image.yaml b/jdk12-build-image.yaml
new file mode 100644
index 0000000000..7a3fb0986f
--- /dev/null
+++ b/jdk12-build-image.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk12-build-image
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk12 (ie, bin/java, bin/javac, et al) for various configurations.<br>
+        * The source tarball is copied from the jdk12-update-src-tree job.<br>
+        * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Configure and build OpenJDK 12'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk12-update-src-tree
+            filter: 'out/jdk12.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+
+            cd $HOME/srv/jdk-cache/jdk11
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xf incoming/jdk12.tar.gz
+
+            shopt -s nullglob
+
+
+
+            # Configure and build.
+            mkdir -p build-stage1 build-stage2 out
+
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../jdk12/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk12 ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
+              popd
+
+              pushd build-stage2
+              sh ../jdk12/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            else
+              pushd build-stage2
+              sh ../jdk12/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk12-${BUILD_TYPE}
+            tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
+
+            # Copy gtest materials to the correct place.
+            ( cd build-stage2
+              mkdir support/test/hotspot/jtreg/native/lib/server
+              cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/jtreg/native/lib/server
+            )
+
+            # Archive test support files.
+            tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.gz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk12-build-release.yaml b/jdk12-build-release.yaml
new file mode 100644
index 0000000000..09c116e7e6
--- /dev/null
+++ b/jdk12-build-release.yaml
@@ -0,0 +1,123 @@
+- job:
+    name: jdk12-build-release
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk12 for release. Run after the source has passed tests.
+        * Tags build with Linaro-YYMM as per normal release procedure.
+        * The source tarball is copied from the jdk12-update-src-tree job.<br>
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Configure and build OpenJDK 12 Release'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk12-update-src-tree
+            filter: 'out/jdk12.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            # Generate files names dependent on year/month.
+            RELEASE=$(date +%y%m)
+            JDKDIR=jdk12-${BUILD_TYPE}-${RELEASE}
+            JDK_SRCDIR=jdk12-src-${RELEASE}
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+            mkdir -p build-stage1 build-stage2 out
+
+            cd $HOME/srv/jdk-cache/jdk11
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xaf incoming/jdk12.tar.gz
+
+            mv jdk12 $JDK_SRCDIR
+            # Tar up the source before sullying it with a build.
+            tar --exclude=.hg\* -acf out/jdk12-src-${RELEASE}.tar.xz $JDK_SRCDIR
+
+            mv $JDK_SRCDIR $JDKDIR
+            shopt -s nullglob
+
+            # Configure and build.
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk12 ${ccache_build_opts}
+              make images
+              popd
+
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            else
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk12-${BUILD_TYPE}-${RELEASE}
+
+            # This is different from ordinary builds.
+            tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.xz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk12-email-results.yaml b/jdk12-email-results.yaml
new file mode 100644
index 0000000000..580a2982fb
--- /dev/null
+++ b/jdk12-email-results.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: jdk12-email-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Sends the report.txt file to the aarch64-port-dev mailing list.<br>
+        * The text report is copied from the jdk12-generate-text-report job.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 12 - Send e-mail report'
+
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk12-generate-email-report
+            filter: 'report.txt'
+    publishers:
+        - email-ext:
+            recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net'
+            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 12 on AArch64'
+            content-type: text
+            body: |
+                ${FILE,path="report.txt"}
+            success: true
diff --git a/jdk12-generate-email-report.yaml b/jdk12-generate-email-report.yaml
new file mode 100644
index 0000000000..25b17f85c3
--- /dev/null
+++ b/jdk12-generate-email-report.yaml
@@ -0,0 +1,74 @@
+- job:
+    name: jdk12-generate-email-report
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job aggregates the results from various jobs:<br>
+        <br>
+            * jcstress<br>
+            * jtreg<br>
+            * terasort<br>
+            * specjbb<br>
+        <br>
+        in text form suitable for the aarch64-port-dev mailing list.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Generate e-mail report'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            PERSIST=$HOME/srv/openjdk12
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            export JDK_VERSION=12
+            which jtdiff
+
+            TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/jdk${JDK_VERSION}/ >> ${WORKSPACE}/report.txt
+    publishers:
+        - archive:
+            artifacts: 'report.txt'
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk12-get-deps.yaml b/jdk12-get-deps.yaml
new file mode 100644
index 0000000000..184a7ba72b
--- /dev/null
+++ b/jdk12-get-deps.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: jdk12-get-deps
+    project-type: freestyle
+    defaults: global
+    description: |
+        Download dependencies for builds. This includes build source code, jtreg, jcstress.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Get Dependencies'
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jcstress-build
+            filter: 'tests-all/target/jcstress.jar'
+            flatten: true
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - copyartifact:
+            project: jdk12-update-src-tree
+            filter: 'out/jdk12.tar.gz, out/build-date.sh'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            find $PWD -maxdepth 1
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk12-jcstress-test-persist-results.yaml b/jdk12-jcstress-test-persist-results.yaml
new file mode 100644
index 0000000000..38b5d68a02
--- /dev/null
+++ b/jdk12-jcstress-test-persist-results.yaml
@@ -0,0 +1,89 @@
+- job:
+    name: jdk12-jcstress-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to:<br>
+          * /work/openjdk-testing/jcstress-nightly-runs<br>
+          * /work/openjdk-testing/jcstress-results
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Write jcstress tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk12-update-src-tree
+            filter: 'out/build-date.sh'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk12-jcstress-test
+            filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk12
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
+            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
+            RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
+
+            mkdir -p $JCSTRESS_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $RESULTS_CSV ]; then
+                touch $RESULTS_CSV
+            fi
+
+            mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz
+            numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
+            sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
+
diff --git a/jdk12-jcstress-test-publish-results.yaml b/jdk12-jcstress-test-publish-results.yaml
new file mode 100644
index 0000000000..a5348c8c3f
--- /dev/null
+++ b/jdk12-jcstress-test-publish-results.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: jdk12-jcstress-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Publish jcstress report'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+
+            PERSIST=$HOME/srv/openjdk12
+            SCRIPT_DIR=$PERSIST/jcstress-test-scripts
+            export JDK_VERSION=12
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
+            fi
+            export TOP_DIR=$PERSIST
+
+            $SCRIPT_DIR/jcstress-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk12-jcstress-test.yaml b/jdk12-jcstress-test.yaml
new file mode 100644
index 0000000000..679461fd3c
--- /dev/null
+++ b/jdk12-jcstress-test.yaml
@@ -0,0 +1,92 @@
+- job:
+    name: jdk12-jcstress-test
+    project-type: matrix
+    defaults: global
+    description: |
+        This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
+        <b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
+        This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Run jcstress tests'
+    parameters:
+        - string:
+            name: JCSTRESS_MODE
+            default: 'sanity'
+    axes:
+        - axis:
+            type: user-defined
+
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+        - timeout:
+            timeout: 900
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            TEST_TYPE=all
+            DEPS=$HOME/workspace/jdk12-get-deps
+
+            JCSTRESS_JAR=$DEPS/jcstress.jar
+            rm -rf jdk12*
+            tar xf ~/workspace/jdk12-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk12-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk12-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:${PATH}
+            which java
+            java -version
+
+            # XXX Don't fail the job if jcstress itself fails.
+            set +e
+            java -jar ${JCSTRESS_JAR} -m ${JCSTRESS_MODE}
+
+            test_result=$?
+            set -e
+
+            rm -rf out
+            mkdir out
+
+            out_dirname=jcstress-results-${BUILD_TYPE}
+
+            rm -rf ${out_dirname}
+            mkdir -p ${out_dirname}
+            cp jcstress-results*.bin.gz ${out_dirname}
+            cp -a results ${out_dirname}
+
+            tar czvf out/${out_dirname}.tar.gz ${out_dirname}
+    publishers:
+        - archive:
+            artifacts: 'out/jcstress-results-*.tar.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'results'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk12-jtreg-test-persist-results.yaml b/jdk12-jtreg-test-persist-results.yaml
new file mode 100644
index 0000000000..de32737f02
--- /dev/null
+++ b/jdk12-jtreg-test-persist-results.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk12-jtreg-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk12/openjdk-jtreg-nightly-tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Write jtreg tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - jdk
+                - hotspot
+                - langtools
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk12-jtreg-test
+            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk12-build-image
+            filter: 'out/jdk12-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk12
+            export JDK_VERSION=12
+
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz
+
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk12-${BUILD_TYPE}.tar.gz
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            basedir=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
+
+            rm -rf  ${image_dir}
+            mkdir -p ${image_dir}
+
+            tar -C ${basedir} \
+              --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${result_tarball}
+
+            tar -C ${image_dir} \
+              --strip-components=1 \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${image_tarball}
+
+            # Change location.
+            # Match the exact output of the cron-based scripts.
+            sed_expr1=$(echo s!XXX__YEAR__XXX!$YEAR!g)
+            sed_expr2=$(echo s!YYY__DAY_OF_YEAR__YYY!$DAY_OF_YEAR!g)
+
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
+
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
diff --git a/jdk12-jtreg-test-publish-results.yaml b/jdk12-jtreg-test-publish-results.yaml
new file mode 100644
index 0000000000..7ec022d1e7
--- /dev/null
+++ b/jdk12-jtreg-test-publish-results.yaml
@@ -0,0 +1,71 @@
+- job:
+    name: jdk12-jtreg-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/jdk12/openjdk-jtreg-nightly-tests/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Publish jtreg results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            PERSIST=$HOME/srv/openjdk12
+            SCRIPT_DIR=$PERSIST/openjdk-test-scripts
+            export JDK_VERSION=12
+
+            (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
+            tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
+            fi
+
+            tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            export PATH=${WORKSPACE}/jtreg/bin:$PATH
+            which jtdiff
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
+    publishers:
+        - archive:
+            artifacts: 'tree.out.xz, env.out'
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk12-jtreg-test.yaml b/jdk12-jtreg-test.yaml
new file mode 100644
index 0000000000..19ca325cde
--- /dev/null
+++ b/jdk12-jtreg-test.yaml
@@ -0,0 +1,191 @@
+- job:
+    name: jdk12-jtreg-test
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the jtreg tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Run jtreg tests'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - hotspot
+                - langtools
+                - jdk
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - xvfb:
+            auto-display-name: true
+            additional-options: '-p unix'
+            debug: true
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "DISPLAY=${DISPLAY}"
+
+            set -exu
+
+            DEPS=$HOME/workspace/jdk12-get-deps
+
+            source $DEPS/build-date.sh
+
+            export JDK_VERSION=12
+            IMAGE_DIR=${WORKSPACE}/jdk12-${BUILD_TYPE}
+            PERSIST=$HOME/srv/openjdk12
+
+            JCSTRESS=$DEPS/jcstress.jar
+
+            tar xf $DEPS/jdk12.tar.gz
+            tar xf ~/workspace/jdk12-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk12-${BUILD_TYPE}.tar.gz
+            tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            tar xf ~/workspace/jdk12-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk12-${BUILD_TYPE}-support.tar.gz
+
+            # All the output directories and general frobbing
+            # output is to match the existing layout as expected
+            # by the cron-based publish and reporting scripts.
+            # XXX There's probably a better way.
+
+            YEAR=XXX__YEAR__XXX
+            DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY
+
+            basedir=cron_output
+            mkdir -p ${basedir}/{src,builds,reports}
+
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+
+            mkdir -p out ${src_dir} ${work_dir} ${report_dir}
+
+            mv jdk12/* ${src_dir}
+
+            blacklist=${WORKSPACE}/excludes.txt
+            # Add jtreg directory level for hotspot only.
+            jdk_problem_list=${src_dir}/test/${JTREG_CATEGORY}
+            if [ $JTREG_CATEGORY = "hotspot" ]; then
+                jdk_problem_list=${jdk_problem_list}/jtreg/ProblemList.txt
+            else
+                jdk_problem_list=${jdk_problem_list}/ProblemList.txt
+            fi
+
+            if [ -e $jdk_problem_list ]; then
+                cat $jdk_problem_list > ${blacklist}
+            fi
+
+            aarch64_exclude_file=${src_dir}/test/exclude_aarch64.txt
+
+            if [ -e ${aarch64_exclude_file} ]; then
+                cat ${aarch64_exclude_file} >> ${blacklist}
+            fi
+
+            touch ${blacklist}
+
+            echo "Blacklist"
+            echo "========="
+            cat ${blacklist}
+            echo "---------"
+
+            export JAVA_HOME=${WORKSPACE}/jdk12-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:${PATH}
+
+            # For hotspot and jdk we pass a -nativepath: option to jtreg.
+            # This enables the tests needing native libraries to run.
+            NATIVEPATH=${WORKSPACE}/jdk12-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
+
+            if [ $JTREG_CATEGORY = "langtools" ]; then
+                # The nativepath option we pass must be a valid directory, or
+                # not at all.`
+                NATIVE_OPT=
+            else
+                # Test executables are expected to be in same directory as libraries
+                mv $NATIVEPATH/../bin/* $NATIVEPATH
+                NATIVE_OPT=-nativepath:$NATIVEPATH
+            fi
+
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            which java
+            java -version
+
+            # Ignore error in jtreg final result.
+            set +e
+
+            # hotspot splits its tests into gtest jtreg tests. We just do jtreg.
+            if [ $JTREG_CATEGORY == "hotspot" ]; then
+                TEST_SUBDIR=test/${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps
+            else
+                TEST_SUBDIR=test/${JTREG_CATEGORY}
+            fi
+
+            java -jar jtreg/lib/jtreg.jar \
+                 -dir:${src_dir} \
+                 -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
+                 -vmoption:-Xmx2G \
+                 -testjdk:${IMAGE_DIR} \
+                 -exclude:${blacklist} \
+                 -conc:20 \
+                 -r:${report_dir} \
+                 -w:${work_dir} \
+                 $NATIVE_OPT \
+                 -timeout:8 \
+                 -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n
+
+
+            # Kill leftover jstatd processes.
+            killall -9 jstatd
+            set -e
+
+            # We don't care for the .class files.
+            find ${work_dir} -name \*.class -exec rm {} \;
+
+            # Match the exact output of the cron-based scripts.
+            dest=$PERSIST/openjdk-jtreg-nightly-tests
+            sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+
+            mkdir -p out
+            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports
+    publishers:
+        - archive:
+            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk12-persist-all-results.yaml b/jdk12-persist-all-results.yaml
new file mode 100644
index 0000000000..d6c7b7eaf1
--- /dev/null
+++ b/jdk12-persist-all-results.yaml
@@ -0,0 +1,51 @@
+- job:
+    name: jdk12-persist-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * This job persist all results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 12 - Persist all results'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk12-jtreg-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-specjbb2015-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-terasort-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-jcstress-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-update-src-tree-persist
+              block: true
+              current-parameters: true
diff --git a/jdk12-publish-all-results.yaml b/jdk12-publish-all-results.yaml
new file mode 100644
index 0000000000..d9abcd6d7b
--- /dev/null
+++ b/jdk12-publish-all-results.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk12-publish-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 12 - Invoke all the scripts to sync results to openjdk.linaro.org'
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: '/home/openjdk-testing/jdk12'
+        - string:
+            name: PUBLISH_HOST
+            default: 'stuart.monteith@people.linaro.org'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk12-jtreg-test-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-specjbb2015-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-terasort-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk12-jcstress-test-publish-results
+              block: true
+              current-parameters: true
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk12-publish-and-report.yaml b/jdk12-publish-and-report.yaml
new file mode 100644
index 0000000000..6b9b27fae8
--- /dev/null
+++ b/jdk12-publish-and-report.yaml
@@ -0,0 +1,63 @@
+- job:
+    name: jdk12-publish-and-report
+    project-type: multijob
+    defaults: global
+    description: |
+        * This job publishes results and send e-mail reports.
+    logrotate:
+        numToKeep: 10
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: DAYS
+            default: '15'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 12 - Publish results and send reports'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-content: 'DAYS=15'
+    builders:
+        - multijob:
+            name: 'Persist results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-persist-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-publish-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Generate e-mail report'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-generate-email-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'E-mail results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk12-email-results
+                current-parameters: true
+                kill-phase-on: FAILURE
diff --git a/jdk12-specjbb2015-benchmark-persist-results.yaml b/jdk12-specjbb2015-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..232101d071
--- /dev/null
+++ b/jdk12-specjbb2015-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk12-specjbb2015-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk12/SPECjbb2015-nightly-runs.<br>
+        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
+          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Write SPECjbb2015 results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk12-specjbb2015-benchmark
+            filter: 'out/specjbb*.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk12
+            TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            mkdir -p $TOP_DIR
+
+            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
+            fi
+
+            source $SCRIPT_DIR/common.sh
+
+            # Ensure nightly results dir exists.
+            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
+
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            set -eux
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz
+            [ -e $result_tarball ] || exit 1
+            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
+            cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
+            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
+            echo "Updating ${RESULTS_CSV}"
+            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk12-specjbb2015-benchmark-publish-results.yaml b/jdk12-specjbb2015-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..bc31b2c8bf
--- /dev/null
+++ b/jdk12-specjbb2015-benchmark-publish-results.yaml
@@ -0,0 +1,59 @@
+- job:
+    name: jdk12-specjbb2015-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jdk12/SPECjbb2015-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Publish SPECjbb2015 benchmark results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+                users:
+                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+            PERSIST=$HOME/srv/openjdk12
+            export TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+
+            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk12-specjbb2015-benchmark.yaml b/jdk12-specjbb2015-benchmark.yaml
new file mode 100644
index 0000000000..2ac1a0ceb8
--- /dev/null
+++ b/jdk12-specjbb2015-benchmark.yaml
@@ -0,0 +1,102 @@
+- job:
+    name: jdk12-specjbb2015-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Run SPECjbb2015 benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ## Extract jdk
+            tar xf ~/workspace/jdk12-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk12-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk12-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:$PATH
+            which java
+            java -version
+
+            ## Extract specjbb2015 product
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015-jdk11.tar.gz
+
+            ## Run test
+
+            SPECJBB_PRODUCT_HOME=SPECjbb2015-1.00
+
+            # This commented-out invocation is a quick test that
+            # takes about 10 minutes to complete - which can be
+            # useful when debugging.
+
+            #(cd $SPECJBB_PRODUCT_HOME; \
+            # time java \
+            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
+            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
+            #   -Dspecjbb.controller.type=PRESET \
+            #   -Dspecjbb.controller.preset.ir=4000 \
+            #   -Dspecjbb.controller.preset.duration=100 \
+            #   -jar specjbb2015.jar -m composite)
+
+            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
+
+            mkdir -p out
+
+            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/")
+
+            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
+
+            java -jar $SPECJBB_PRODUCT_HOME/specjbb2015.jar \
+              -m REPORTER \
+              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
+              -p $SPECJBB_PRODUCT_HOME/config/specjbb2015.props \
+              -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
+              -l 1
+
+            tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result
+
+            rm -rf html
+            mkdir html
+            cp -a result/**/report-00001/* html
+            cp html/*0001.html html/index.html
+    publishers:
+        - archive:
+            artifacts: 'out/*.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'html'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk12-terasort-benchmark-persist-results.yaml b/jdk12-terasort-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..17820b959e
--- /dev/null
+++ b/jdk12-terasort-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk12-terasort-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Write terasort results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk12-terasort-benchmark
+            filter: 'out/terasort-results-${BUILD_TYPE}.csv'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk12
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv
+            prev_results=$BENCHMARK_RESULTS_DIR/results.csv
+
+            # Ensure persistent directory exists.
+            mkdir -p $BENCHMARK_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $prev_results ]; then
+                touch $prev_results
+            fi
+
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            echo "Previous Results"
+            echo "----------------"
+            cat ${prev_results}
+            echo
+
+            cat ${new_results} >> ${prev_results}
+
+            $SCRIPT_DIR/update-results-db
diff --git a/jdk12-terasort-benchmark-publish-results.yaml b/jdk12-terasort-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..6769b31ee0
--- /dev/null
+++ b/jdk12-terasort-benchmark-publish-results.yaml
@@ -0,0 +1,67 @@
+- job:
+    name: jdk12-terasort-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '3275'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '854'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Publish terasort benchmark results'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+            PERSIST=$HOME/srv/openjdk12
+            export JDK_VERSION=12
+
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk12-terasort-benchmark.yaml b/jdk12-terasort-benchmark.yaml
new file mode 100644
index 0000000000..7f0440c050
--- /dev/null
+++ b/jdk12-terasort-benchmark.yaml
@@ -0,0 +1,112 @@
+- job:
+    name: jdk12-terasort-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the terasort benchmark.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Run terasort benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            NGIGABYTES=1
+
+
+            CACHE_FILES=$HOME/srv/jdk-cache
+            ## Extract jdk
+            rm -rf jdk12*
+            tar xf ~/workspace/jdk12-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk12-${BUILD_TYPE}.tar.gz
+
+            export JAVA_HOME=${WORKSPACE}/jdk12-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:$PATH
+
+            ## Extract Hadoop pre-builts
+            rm -rf openjdk8-hadooop-LCA14
+            tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz
+
+            rm -rf incoming; mkdir -p incoming
+            ## Benchmark
+            (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
+
+            TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
+            HADOOP_DIR=${WORKSPACE}/openjdk8-hadoop-LCA14
+
+            rm -rf out
+            mkdir out
+
+            sed -i '/^export JAVA_HOME=/d' ${HADOOP_DIR}/conf/hadoop-env.sh
+            echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_DIR}/conf/hadoop-env.sh
+            sed -i 's|/work/${user.name}/hadoop-tmp|${user.home}/hadoop/tmp|' ${HADOOP_DIR}/conf/core-site.xml
+
+            source ${HADOOP_DIR}/env.sh
+
+            which hadoop
+            which java
+            which hdfs
+            java -version
+
+            stop-dfs.sh
+            stop-yarn.sh
+
+            rm -rf ${HOME}/hadoop
+            mkdir -p ${HOME}/hadoop/tmp
+            hdfs namenode -format -force
+            start-dfs.sh
+            start-yarn.sh
+
+            # Need time for the datanodes to materialise.
+            sleep 30
+            jps
+
+            hadoop fs -mkdir -p /user/$USER
+            hadoop fs -copyFromLocal $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB /user/$USER
+
+            trap "stop-dfs.sh; stop-yarn.sh" EXIT
+
+            elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
+            /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+
+            hadoop fs -rm -R ${NGIGABYTES}GB-sorted
+            sed -i 's/\..*//' $elapsed_time_file
+            elapsed_time=$(cat $elapsed_time_file)
+            date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
+            echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv
+            rm -rf incoming/${NGIGABYTES}*
+    publishers:
+        - archive:
+            artifacts: 'out/terasort-results-*.csv'
diff --git a/jdk12-update-src-tree-persist.yaml b/jdk12-update-src-tree-persist.yaml
new file mode 100644
index 0000000000..59d41ac369
--- /dev/null
+++ b/jdk12-update-src-tree-persist.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk12-update-src-tree-persist
+    project-type: freestyle
+    defaults: global
+    description: |
+        This jobs writes the current jdk12 src tree to /work/openjdk-testing/jdk12/openjdk-jtreg-nightly-tests/...<br>
+        It is used to report failure/errors against the jtreg results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Write jdk12 source tree'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk12-update-src-tree
+            filter: 'out/*'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+            PERSIST=$HOME/srv/openjdk12
+
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
+            mkdir -p $src_dir
+            echo "Extracting tarball to $src_dir"
+            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk12.tar.gz
+
+            # Copy bill-of-materials to persistent area for email report.
+            cp incoming/BOM $TOP_DIR
diff --git a/jdk12-update-src-tree.yaml b/jdk12-update-src-tree.yaml
new file mode 100644
index 0000000000..a812d5bcb0
--- /dev/null
+++ b/jdk12-update-src-tree.yaml
@@ -0,0 +1,101 @@
+- scm:
+    name: jdk12
+    scm:
+        - hg:
+            url: https://hg.openjdk.java.net/jdk/jdk12u
+            clean: true
+            subdir: jdk12
+- job:
+    name: jdk12-update-src-tree
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job polls upstream Mercurial servers for changes and,<br>
+        if there are any, triggers "jdk12-build-and-test".<br>
+        Note: this job archives the src which is later required by the jtreg<br>
+        report and publish job. The build-date.sh artefact contains shell<br>
+        variables for the day and day-of-year the source was archived.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk13-.*"
+                - "jdk11-.*"
+                - "jdk8-.*"
+                - "jdkX-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 12 - Update jdk12 source tree'
+    scm:
+        - jdk12
+    triggers:
+        - pollscm:
+            cron: '0 7 * * 2,4,6'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            rm -rf out
+            mkdir out
+
+            pushd jdk12
+            #find . -name BOM -exec rm {} \;
+            #commit_id=$(hg identify | awk '{print $1}')
+            #echo "jdk12-${commit_id}" | tee -a BOM
+
+            #for i in corba jaxp jaxws langtools jdk hotspot nashorn; do
+            #  pushd $i
+            #  commit_id=$(hg identify | awk '{print $1}')
+            #  dir=$(basename $PWD)
+            #  echo "${dir}-${commit_id}" | tee -a ../BOM
+            #  popd
+            #done
+
+            ## Pull out subdirectory HG versions
+            echo BOM for $(hg paths default) > BOM
+            echo -e Subdir\\tHash\\t\\tTag\\tTag hash >> BOM
+            echo -e .\\t$(hg head --template '{node|short}\t' tip; hg tags --template="{tag}\t{node|short}\n" | grep -ve '^tip' | head -n1) >>BOM
+
+            cp BOM $WORKSPACE/out
+
+            popd
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            : ${YEAR_YESTERDAY:=$YEAR}
+            : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
+
+            echo "YEAR=${YEAR}" >dates.prop
+            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
+
+            echo "export YEAR=${YEAR}" > out/build-date.sh
+            echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
+
+            tar --exclude=.hg -acf out/jdk12.tar.gz jdk12
+    publishers:
+        - archive:
+            artifacts: 'out/jdk12.tar.gz, out/build-date.sh, out/BOM'
+        - fingerprint:
+            files: 'out/*'
+            record-artifacts: true
+        - trigger-parameterized-builds:
+            - project: jdk12-build-and-test
+              condition: SUCCESS
+              property-file: dates.prop
diff --git a/jdk13-build-and-test.yaml b/jdk13-build-and-test.yaml
new file mode 100644
index 0000000000..86aebc3c07
--- /dev/null
+++ b/jdk13-build-and-test.yaml
@@ -0,0 +1,133 @@
+- job:
+    name: jdk13-build-and-test
+    project-type: multijob
+    defaults: global
+    description: |
+        * This jobs builds the jdk images and runs tests and benchmarks against the built images.<br>
+        * <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk13-update-src-tree" job).<br>
+        If it is run manually it will use the source tarball from the last successful build of that job.<br>
+        * If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 13 - Build jdk images and run tests/benchmarks'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - multijob:
+            name: 'OpenJDK Clean job'
+            condition: SUCCESSFUL
+            projects:
+                - name: jdk-clean-job
+                  current-parameters: true
+                  kill-phase-on: NEVER
+        - multijob:
+            name: 'Build jdk images'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-build-image
+                current-parameters: true
+                kill-phase-on: FAILURE
+        # Get depenencies for subsequent jobs.
+        - multijob:
+            name: 'Get Deps'
+            condition: ALWAYS
+            projects:
+              - name: jdk13-get-deps
+                current-parameters: true
+                kill-phase-on: FAILURE
+# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
+# Exception in thread "main" java.util.ServiceConfigurationError:
+# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
+# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
+# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
+        - multijob:
+            name: 'SPECjbb2015 benchmark'
+            condition: ALWAYS
+            projects:
+              - name: jdk13-specjbb2015-benchmark
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: '1GB Terasort benchmark'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-terasort-benchmark
+                current-parameters: true
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'JTREG tests'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-jtreg-test
+                current-parameters: true
+                predefined-parameters: 'XJTREG_SUBCATEGORIES=tools/javap/typeAnnotations'
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'jcstress'
+            condition: COMPLETED
+            projects:
+              - name: jdk13-jcstress-test
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-publish-and-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - copyartifact:
+            project: jdk13-update-src-tree
+            filter: 'out/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk13-build-image
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk13-specjbb2015-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk13-terasort-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk13-jtreg-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+            stable: true
+        - copyartifact:
+            project: jdk13-jcstress-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+    publishers:
+        - archive:
+            artifacts: 'out/**/*'
diff --git a/jdk13-build-image.yaml b/jdk13-build-image.yaml
new file mode 100644
index 0000000000..528b3e65a6
--- /dev/null
+++ b/jdk13-build-image.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk13-build-image
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk13 (ie, bin/java, bin/javac, et al) for various configurations.<br>
+        * The source tarball is copied from the jdk13-update-src-tree job.<br>
+        * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Configure and build OpenJDK 13'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk13-update-src-tree
+            filter: 'out/jdk13.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+
+            cd $HOME/srv/jdk-cache/jdk12
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xf incoming/jdk13.tar.gz
+
+            shopt -s nullglob
+
+
+
+            # Configure and build.
+            mkdir -p build-stage1 build-stage2 out
+
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../jdk13/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk13 ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
+              popd
+
+              pushd build-stage2
+              sh ../jdk13/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            else
+              pushd build-stage2
+              sh ../jdk13/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk13-${BUILD_TYPE}
+            tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
+
+            # Copy gtest materials to the correct place.
+            ( cd build-stage2
+              mkdir support/test/hotspot/jtreg/native/lib/server
+              cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/jtreg/native/lib/server
+            )
+
+            # Archive test support files.
+            tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.gz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk13-build-release.yaml b/jdk13-build-release.yaml
new file mode 100644
index 0000000000..964baa7660
--- /dev/null
+++ b/jdk13-build-release.yaml
@@ -0,0 +1,123 @@
+- job:
+    name: jdk13-build-release
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk13 for release. Run after the source has passed tests.
+        * Tags build with Linaro-YYMM as per normal release procedure.
+        * The source tarball is copied from the jdk13-update-src-tree job.<br>
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Configure and build OpenJDK 13 Release'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk13-update-src-tree
+            filter: 'out/jdk13.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            # Generate files names dependent on year/month.
+            RELEASE=$(date +%y%m)
+            JDKDIR=jdk13-${BUILD_TYPE}-${RELEASE}
+            JDK_SRCDIR=jdk13-src-${RELEASE}
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+            mkdir -p build-stage1 build-stage2 out
+
+            cd $HOME/srv/jdk-cache/jdk12
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xaf incoming/jdk13.tar.gz
+
+            mv jdk13 $JDK_SRCDIR
+            # Tar up the source before sullying it with a build.
+            tar --exclude=.hg\* -acf out/jdk13-src-${RELEASE}.tar.xz $JDK_SRCDIR
+
+            mv $JDK_SRCDIR $JDKDIR
+            shopt -s nullglob
+
+            # Configure and build.
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk13 ${ccache_build_opts}
+              make images
+              popd
+
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            else
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk13-${BUILD_TYPE}-${RELEASE}
+
+            # This is different from ordinary builds.
+            tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.xz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk13-email-results.yaml b/jdk13-email-results.yaml
new file mode 100644
index 0000000000..852ca3e38c
--- /dev/null
+++ b/jdk13-email-results.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: jdk13-email-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Sends the report.txt file to the aarch64-port-dev mailing list.<br>
+        * The text report is copied from the jdk13-generate-text-report job.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 13 - Send e-mail report'
+
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk13-generate-email-report
+            filter: 'report.txt'
+    publishers:
+        - email-ext:
+            recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net'
+            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 13 on AArch64'
+            content-type: text
+            body: |
+                ${FILE,path="report.txt"}
+            success: true
diff --git a/jdk13-generate-email-report.yaml b/jdk13-generate-email-report.yaml
new file mode 100644
index 0000000000..f48f64b2f1
--- /dev/null
+++ b/jdk13-generate-email-report.yaml
@@ -0,0 +1,74 @@
+- job:
+    name: jdk13-generate-email-report
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job aggregates the results from various jobs:<br>
+        <br>
+            * jcstress<br>
+            * jtreg<br>
+            * terasort<br>
+            * specjbb<br>
+        <br>
+        in text form suitable for the aarch64-port-dev mailing list.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Generate e-mail report'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            PERSIST=$HOME/srv/openjdk13
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            export JDK_VERSION=13
+            which jtdiff
+
+            TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/jdk${JDK_VERSION}/ >> ${WORKSPACE}/report.txt
+    publishers:
+        - archive:
+            artifacts: 'report.txt'
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk13-get-deps.yaml b/jdk13-get-deps.yaml
new file mode 100644
index 0000000000..5b30cea9e4
--- /dev/null
+++ b/jdk13-get-deps.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: jdk13-get-deps
+    project-type: freestyle
+    defaults: global
+    description: |
+        Download dependencies for builds. This includes build source code, jtreg, jcstress.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Get Dependencies'
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jcstress-build
+            filter: 'tests-all/target/jcstress.jar'
+            flatten: true
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - copyartifact:
+            project: jdk13-update-src-tree
+            filter: 'out/jdk13.tar.gz, out/build-date.sh'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            find $PWD -maxdepth 1
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk13-jcstress-test-persist-results.yaml b/jdk13-jcstress-test-persist-results.yaml
new file mode 100644
index 0000000000..7b9bcf8e6f
--- /dev/null
+++ b/jdk13-jcstress-test-persist-results.yaml
@@ -0,0 +1,89 @@
+- job:
+    name: jdk13-jcstress-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to:<br>
+          * /work/openjdk-testing/jcstress-nightly-runs<br>
+          * /work/openjdk-testing/jcstress-results
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Write jcstress tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk13-update-src-tree
+            filter: 'out/build-date.sh'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk13-jcstress-test
+            filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk13
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
+            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
+            RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
+
+            mkdir -p $JCSTRESS_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $RESULTS_CSV ]; then
+                touch $RESULTS_CSV
+            fi
+
+            mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz
+            numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
+            sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
+
diff --git a/jdk13-jcstress-test-publish-results.yaml b/jdk13-jcstress-test-publish-results.yaml
new file mode 100644
index 0000000000..3f7fde7357
--- /dev/null
+++ b/jdk13-jcstress-test-publish-results.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: jdk13-jcstress-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Publish jcstress report'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+
+            PERSIST=$HOME/srv/openjdk13
+            SCRIPT_DIR=$PERSIST/jcstress-test-scripts
+            export JDK_VERSION=13
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
+            fi
+            export TOP_DIR=$PERSIST
+
+            $SCRIPT_DIR/jcstress-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk13-jcstress-test.yaml b/jdk13-jcstress-test.yaml
new file mode 100644
index 0000000000..4dee3ae15b
--- /dev/null
+++ b/jdk13-jcstress-test.yaml
@@ -0,0 +1,92 @@
+- job:
+    name: jdk13-jcstress-test
+    project-type: matrix
+    defaults: global
+    description: |
+        This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
+        <b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
+        This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Run jcstress tests'
+    parameters:
+        - string:
+            name: JCSTRESS_MODE
+            default: 'sanity'
+    axes:
+        - axis:
+            type: user-defined
+
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+        - timeout:
+            timeout: 900
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            TEST_TYPE=all
+            DEPS=$HOME/workspace/jdk13-get-deps
+
+            JCSTRESS_JAR=$DEPS/jcstress.jar
+            rm -rf jdk13*
+            tar xf ~/workspace/jdk13-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk13-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk13-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:${PATH}
+            which java
+            java -version
+
+            # XXX Don't fail the job if jcstress itself fails.
+            set +e
+            java -jar ${JCSTRESS_JAR} -m ${JCSTRESS_MODE}
+
+            test_result=$?
+            set -e
+
+            rm -rf out
+            mkdir out
+
+            out_dirname=jcstress-results-${BUILD_TYPE}
+
+            rm -rf ${out_dirname}
+            mkdir -p ${out_dirname}
+            cp jcstress-results*.bin.gz ${out_dirname}
+            cp -a results ${out_dirname}
+
+            tar czvf out/${out_dirname}.tar.gz ${out_dirname}
+    publishers:
+        - archive:
+            artifacts: 'out/jcstress-results-*.tar.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'results'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk13-jtreg-test-persist-results.yaml b/jdk13-jtreg-test-persist-results.yaml
new file mode 100644
index 0000000000..b6f14e9159
--- /dev/null
+++ b/jdk13-jtreg-test-persist-results.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk13-jtreg-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk13/openjdk-jtreg-nightly-tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Write jtreg tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - jdk
+                - hotspot
+                - langtools
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk13-jtreg-test
+            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk13-build-image
+            filter: 'out/jdk13-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk13
+            export JDK_VERSION=13
+
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz
+
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk13-${BUILD_TYPE}.tar.gz
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            basedir=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
+
+            rm -rf  ${image_dir}
+            mkdir -p ${image_dir}
+
+            tar -C ${basedir} \
+              --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${result_tarball}
+
+            tar -C ${image_dir} \
+              --strip-components=1 \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${image_tarball}
+
+            # Change location.
+            # Match the exact output of the cron-based scripts.
+            sed_expr1=$(echo s!XXX__YEAR__XXX!$YEAR!g)
+            sed_expr2=$(echo s!YYY__DAY_OF_YEAR__YYY!$DAY_OF_YEAR!g)
+
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
+
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
diff --git a/jdk13-jtreg-test-publish-results.yaml b/jdk13-jtreg-test-publish-results.yaml
new file mode 100644
index 0000000000..b15fb19798
--- /dev/null
+++ b/jdk13-jtreg-test-publish-results.yaml
@@ -0,0 +1,71 @@
+- job:
+    name: jdk13-jtreg-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/jdk13/openjdk-jtreg-nightly-tests/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Publish jtreg results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            PERSIST=$HOME/srv/openjdk13
+            SCRIPT_DIR=$PERSIST/openjdk-test-scripts
+            export JDK_VERSION=13
+
+            (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
+            tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
+            fi
+
+            tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            export PATH=${WORKSPACE}/jtreg/bin:$PATH
+            which jtdiff
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
+    publishers:
+        - archive:
+            artifacts: 'tree.out.xz, env.out'
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk13-jtreg-test.yaml b/jdk13-jtreg-test.yaml
new file mode 100644
index 0000000000..317dbfde5e
--- /dev/null
+++ b/jdk13-jtreg-test.yaml
@@ -0,0 +1,191 @@
+- job:
+    name: jdk13-jtreg-test
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the jtreg tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Run jtreg tests'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - hotspot
+                - langtools
+                - jdk
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - xvfb:
+            auto-display-name: true
+            additional-options: '-p unix'
+            debug: true
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "DISPLAY=${DISPLAY}"
+
+            set -exu
+
+            DEPS=$HOME/workspace/jdk13-get-deps
+
+            source $DEPS/build-date.sh
+
+            export JDK_VERSION=13
+            IMAGE_DIR=${WORKSPACE}/jdk13-${BUILD_TYPE}
+            PERSIST=$HOME/srv/openjdk13
+
+            JCSTRESS=$DEPS/jcstress.jar
+
+            tar xf $DEPS/jdk13.tar.gz
+            tar xf ~/workspace/jdk13-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk13-${BUILD_TYPE}.tar.gz
+            tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            tar xf ~/workspace/jdk13-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk13-${BUILD_TYPE}-support.tar.gz
+
+            # All the output directories and general frobbing
+            # output is to match the existing layout as expected
+            # by the cron-based publish and reporting scripts.
+            # XXX There's probably a better way.
+
+            YEAR=XXX__YEAR__XXX
+            DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY
+
+            basedir=cron_output
+            mkdir -p ${basedir}/{src,builds,reports}
+
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+
+            mkdir -p out ${src_dir} ${work_dir} ${report_dir}
+
+            mv jdk13/* ${src_dir}
+
+            blacklist=${WORKSPACE}/excludes.txt
+            # Add jtreg directory level for hotspot only.
+            jdk_problem_list=${src_dir}/test/${JTREG_CATEGORY}
+            if [ $JTREG_CATEGORY = "hotspot" ]; then
+                jdk_problem_list=${jdk_problem_list}/jtreg/ProblemList.txt
+            else
+                jdk_problem_list=${jdk_problem_list}/ProblemList.txt
+            fi
+
+            if [ -e $jdk_problem_list ]; then
+                cat $jdk_problem_list > ${blacklist}
+            fi
+
+            aarch64_exclude_file=${src_dir}/test/exclude_aarch64.txt
+
+            if [ -e ${aarch64_exclude_file} ]; then
+                cat ${aarch64_exclude_file} >> ${blacklist}
+            fi
+
+            touch ${blacklist}
+
+            echo "Blacklist"
+            echo "========="
+            cat ${blacklist}
+            echo "---------"
+
+            export JAVA_HOME=${WORKSPACE}/jdk13-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:${PATH}
+
+            # For hotspot and jdk we pass a -nativepath: option to jtreg.
+            # This enables the tests needing native libraries to run.
+            NATIVEPATH=${WORKSPACE}/jdk13-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
+
+            if [ $JTREG_CATEGORY = "langtools" ]; then
+                # The nativepath option we pass must be a valid directory, or
+                # not at all.`
+                NATIVE_OPT=
+            else
+                # Test executables are expected to be in same directory as libraries
+                mv $NATIVEPATH/../bin/* $NATIVEPATH
+                NATIVE_OPT=-nativepath:$NATIVEPATH
+            fi
+
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            which java
+            java -version
+
+            # Ignore error in jtreg final result.
+            set +e
+
+            # hotspot splits its tests into gtest jtreg tests. We just do jtreg.
+            if [ $JTREG_CATEGORY == "hotspot" ]; then
+                TEST_SUBDIR=test/${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps
+            else
+                TEST_SUBDIR=test/${JTREG_CATEGORY}
+            fi
+
+            java -jar jtreg/lib/jtreg.jar \
+                 -dir:${src_dir} \
+                 -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
+                 -vmoption:-Xmx2G \
+                 -testjdk:${IMAGE_DIR} \
+                 -exclude:${blacklist} \
+                 -conc:20 \
+                 -r:${report_dir} \
+                 -w:${work_dir} \
+                 $NATIVE_OPT \
+                 -timeout:8 \
+                 -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n
+
+
+            # Kill leftover jstatd processes.
+            killall -9 jstatd
+            set -e
+
+            # We don't care for the .class files.
+            find ${work_dir} -name \*.class -exec rm {} \;
+
+            # Match the exact output of the cron-based scripts.
+            dest=$PERSIST/openjdk-jtreg-nightly-tests
+            sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+
+            mkdir -p out
+            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports
+    publishers:
+        - archive:
+            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk13-persist-all-results.yaml b/jdk13-persist-all-results.yaml
new file mode 100644
index 0000000000..cd17fcfef8
--- /dev/null
+++ b/jdk13-persist-all-results.yaml
@@ -0,0 +1,51 @@
+- job:
+    name: jdk13-persist-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * This job persist all results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 13 - Persist all results'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk13-jtreg-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-specjbb2015-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-terasort-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-jcstress-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-update-src-tree-persist
+              block: true
+              current-parameters: true
diff --git a/jdk13-publish-all-results.yaml b/jdk13-publish-all-results.yaml
new file mode 100644
index 0000000000..1d0808613c
--- /dev/null
+++ b/jdk13-publish-all-results.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk13-publish-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 13 - Invoke all the scripts to sync results to openjdk.linaro.org'
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: '/home/openjdk-testing/jdk13'
+        - string:
+            name: PUBLISH_HOST
+            default: 'stuart.monteith@people.linaro.org'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk13-jtreg-test-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-specjbb2015-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-terasort-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk13-jcstress-test-publish-results
+              block: true
+              current-parameters: true
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk13-publish-and-report.yaml b/jdk13-publish-and-report.yaml
new file mode 100644
index 0000000000..7b59a67066
--- /dev/null
+++ b/jdk13-publish-and-report.yaml
@@ -0,0 +1,63 @@
+- job:
+    name: jdk13-publish-and-report
+    project-type: multijob
+    defaults: global
+    description: |
+        * This job publishes results and send e-mail reports.
+    logrotate:
+        numToKeep: 10
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: DAYS
+            default: '15'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 13 - Publish results and send reports'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-content: 'DAYS=15'
+    builders:
+        - multijob:
+            name: 'Persist results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-persist-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-publish-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Generate e-mail report'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-generate-email-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'E-mail results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk13-email-results
+                current-parameters: true
+                kill-phase-on: FAILURE
diff --git a/jdk13-specjbb2015-benchmark-persist-results.yaml b/jdk13-specjbb2015-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..113d173c88
--- /dev/null
+++ b/jdk13-specjbb2015-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk13-specjbb2015-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk13/SPECjbb2015-nightly-runs.<br>
+        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
+          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Write SPECjbb2015 results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk13-specjbb2015-benchmark
+            filter: 'out/specjbb*.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk13
+            TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            mkdir -p $TOP_DIR
+
+            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
+            fi
+
+            source $SCRIPT_DIR/common.sh
+
+            # Ensure nightly results dir exists.
+            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
+
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            set -eux
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz
+            [ -e $result_tarball ] || exit 1
+            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
+            cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
+            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
+            echo "Updating ${RESULTS_CSV}"
+            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk13-specjbb2015-benchmark-publish-results.yaml b/jdk13-specjbb2015-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..0e7752d628
--- /dev/null
+++ b/jdk13-specjbb2015-benchmark-publish-results.yaml
@@ -0,0 +1,59 @@
+- job:
+    name: jdk13-specjbb2015-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jdk13/SPECjbb2015-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Publish SPECjbb2015 benchmark results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+                users:
+                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+            PERSIST=$HOME/srv/openjdk13
+            export TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+
+            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk13-specjbb2015-benchmark.yaml b/jdk13-specjbb2015-benchmark.yaml
new file mode 100644
index 0000000000..74962aa821
--- /dev/null
+++ b/jdk13-specjbb2015-benchmark.yaml
@@ -0,0 +1,102 @@
+- job:
+    name: jdk13-specjbb2015-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Run SPECjbb2015 benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ## Extract jdk
+            tar xf ~/workspace/jdk13-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk13-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk13-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:$PATH
+            which java
+            java -version
+
+            ## Extract specjbb2015 product
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015-jdk11.tar.gz
+
+            ## Run test
+
+            SPECJBB_PRODUCT_HOME=SPECjbb2015-1.00
+
+            # This commented-out invocation is a quick test that
+            # takes about 10 minutes to complete - which can be
+            # useful when debugging.
+
+            #(cd $SPECJBB_PRODUCT_HOME; \
+            # time java \
+            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
+            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
+            #   -Dspecjbb.controller.type=PRESET \
+            #   -Dspecjbb.controller.preset.ir=4000 \
+            #   -Dspecjbb.controller.preset.duration=100 \
+            #   -jar specjbb2015.jar -m composite)
+
+            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
+
+            mkdir -p out
+
+            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/")
+
+            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
+
+            java -jar $SPECJBB_PRODUCT_HOME/specjbb2015.jar \
+              -m REPORTER \
+              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
+              -p $SPECJBB_PRODUCT_HOME/config/specjbb2015.props \
+              -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
+              -l 1
+
+            tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result
+
+            rm -rf html
+            mkdir html
+            cp -a result/**/report-00001/* html
+            cp html/*0001.html html/index.html
+    publishers:
+        - archive:
+            artifacts: 'out/*.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'html'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk13-terasort-benchmark-persist-results.yaml b/jdk13-terasort-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..b20eee815d
--- /dev/null
+++ b/jdk13-terasort-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk13-terasort-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Write terasort results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk13-terasort-benchmark
+            filter: 'out/terasort-results-${BUILD_TYPE}.csv'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk13
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv
+            prev_results=$BENCHMARK_RESULTS_DIR/results.csv
+
+            # Ensure persistent directory exists.
+            mkdir -p $BENCHMARK_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $prev_results ]; then
+                touch $prev_results
+            fi
+
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            echo "Previous Results"
+            echo "----------------"
+            cat ${prev_results}
+            echo
+
+            cat ${new_results} >> ${prev_results}
+
+            $SCRIPT_DIR/update-results-db
diff --git a/jdk13-terasort-benchmark-publish-results.yaml b/jdk13-terasort-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..50b1c8e568
--- /dev/null
+++ b/jdk13-terasort-benchmark-publish-results.yaml
@@ -0,0 +1,67 @@
+- job:
+    name: jdk13-terasort-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '3275'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '854'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Publish terasort benchmark results'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+            PERSIST=$HOME/srv/openjdk13
+            export JDK_VERSION=13
+
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk13-terasort-benchmark.yaml b/jdk13-terasort-benchmark.yaml
new file mode 100644
index 0000000000..84b61dea62
--- /dev/null
+++ b/jdk13-terasort-benchmark.yaml
@@ -0,0 +1,112 @@
+- job:
+    name: jdk13-terasort-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the terasort benchmark.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Run terasort benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            NGIGABYTES=1
+
+
+            CACHE_FILES=$HOME/srv/jdk-cache
+            ## Extract jdk
+            rm -rf jdk13*
+            tar xf ~/workspace/jdk13-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk13-${BUILD_TYPE}.tar.gz
+
+            export JAVA_HOME=${WORKSPACE}/jdk13-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:$PATH
+
+            ## Extract Hadoop pre-builts
+            rm -rf openjdk8-hadooop-LCA14
+            tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz
+
+            rm -rf incoming; mkdir -p incoming
+            ## Benchmark
+            (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
+
+            TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
+            HADOOP_DIR=${WORKSPACE}/openjdk8-hadoop-LCA14
+
+            rm -rf out
+            mkdir out
+
+            sed -i '/^export JAVA_HOME=/d' ${HADOOP_DIR}/conf/hadoop-env.sh
+            echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_DIR}/conf/hadoop-env.sh
+            sed -i 's|/work/${user.name}/hadoop-tmp|${user.home}/hadoop/tmp|' ${HADOOP_DIR}/conf/core-site.xml
+
+            source ${HADOOP_DIR}/env.sh
+
+            which hadoop
+            which java
+            which hdfs
+            java -version
+
+            stop-dfs.sh
+            stop-yarn.sh
+
+            rm -rf ${HOME}/hadoop
+            mkdir -p ${HOME}/hadoop/tmp
+            hdfs namenode -format -force
+            start-dfs.sh
+            start-yarn.sh
+
+            # Need time for the datanodes to materialise.
+            sleep 30
+            jps
+
+            hadoop fs -mkdir -p /user/$USER
+            hadoop fs -copyFromLocal $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB /user/$USER
+
+            trap "stop-dfs.sh; stop-yarn.sh" EXIT
+
+            elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
+            /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+
+            hadoop fs -rm -R ${NGIGABYTES}GB-sorted
+            sed -i 's/\..*//' $elapsed_time_file
+            elapsed_time=$(cat $elapsed_time_file)
+            date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
+            echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv
+            rm -rf incoming/${NGIGABYTES}*
+    publishers:
+        - archive:
+            artifacts: 'out/terasort-results-*.csv'
diff --git a/jdk13-update-src-tree-persist.yaml b/jdk13-update-src-tree-persist.yaml
new file mode 100644
index 0000000000..b826a4137c
--- /dev/null
+++ b/jdk13-update-src-tree-persist.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk13-update-src-tree-persist
+    project-type: freestyle
+    defaults: global
+    description: |
+        This jobs writes the current jdk13 src tree to /work/openjdk-testing/jdk13/openjdk-jtreg-nightly-tests/...<br>
+        It is used to report failure/errors against the jtreg results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Write jdk13 source tree'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk13-update-src-tree
+            filter: 'out/*'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+            PERSIST=$HOME/srv/openjdk13
+
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
+            mkdir -p $src_dir
+            echo "Extracting tarball to $src_dir"
+            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk13.tar.gz
+
+            # Copy bill-of-materials to persistent area for email report.
+            cp incoming/BOM $TOP_DIR
diff --git a/jdk13-update-src-tree.yaml b/jdk13-update-src-tree.yaml
new file mode 100644
index 0000000000..a4736d95f3
--- /dev/null
+++ b/jdk13-update-src-tree.yaml
@@ -0,0 +1,101 @@
+- scm:
+    name: jdk13
+    scm:
+        - hg:
+            url: https://hg.openjdk.java.net/jdk-updates/jdk13u
+            clean: true
+            subdir: jdk13
+- job:
+    name: jdk13-update-src-tree
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job polls upstream Mercurial servers for changes and,<br>
+        if there are any, triggers "jdk13-build-and-test".<br>
+        Note: this job archives the src which is later required by the jtreg<br>
+        report and publish job. The build-date.sh artefact contains shell<br>
+        variables for the day and day-of-year the source was archived.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk14-.*"
+                - "jdk11-.*"
+                - "jdk8-.*"
+                - "jdkX-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 13 - Update jdk13 source tree'
+    scm:
+        - jdk13
+    triggers:
+        - pollscm:
+            cron: '0 7 * * 2,4,6'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            rm -rf out
+            mkdir out
+
+            pushd jdk13
+            #find . -name BOM -exec rm {} \;
+            #commit_id=$(hg identify | awk '{print $1}')
+            #echo "jdk13-${commit_id}" | tee -a BOM
+
+            #for i in corba jaxp jaxws langtools jdk hotspot nashorn; do
+            #  pushd $i
+            #  commit_id=$(hg identify | awk '{print $1}')
+            #  dir=$(basename $PWD)
+            #  echo "${dir}-${commit_id}" | tee -a ../BOM
+            #  popd
+            #done
+
+            ## Pull out subdirectory HG versions
+            echo BOM for $(hg paths default) > BOM
+            echo -e Subdir\\tHash\\t\\tTag\\tTag hash >> BOM
+            echo -e .\\t$(hg head --template '{node|short}\t' tip; hg tags --template="{tag}\t{node|short}\n" | grep -ve '^tip' | head -n1) >>BOM
+
+            cp BOM $WORKSPACE/out
+
+            popd
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            : ${YEAR_YESTERDAY:=$YEAR}
+            : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
+
+            echo "YEAR=${YEAR}" >dates.prop
+            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
+
+            echo "export YEAR=${YEAR}" > out/build-date.sh
+            echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
+
+            tar --exclude=.hg -acf out/jdk13.tar.gz jdk13
+    publishers:
+        - archive:
+            artifacts: 'out/jdk13.tar.gz, out/build-date.sh, out/BOM'
+        - fingerprint:
+            files: 'out/*'
+            record-artifacts: true
+        - trigger-parameterized-builds:
+            - project: jdk13-build-and-test
+              condition: SUCCESS
+              property-file: dates.prop
diff --git a/jdk14-build-and-test.yaml b/jdk14-build-and-test.yaml
new file mode 100644
index 0000000000..d8efad29db
--- /dev/null
+++ b/jdk14-build-and-test.yaml
@@ -0,0 +1,133 @@
+- job:
+    name: jdk14-build-and-test
+    project-type: multijob
+    defaults: global
+    description: |
+        * This jobs builds the jdk images and runs tests and benchmarks against the built images.<br>
+        * <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk14-update-src-tree" job).<br>
+        If it is run manually it will use the source tarball from the last successful build of that job.<br>
+        * If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 14 - Build jdk images and run tests/benchmarks'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - multijob:
+            name: 'OpenJDK Clean job'
+            condition: SUCCESSFUL
+            projects:
+                - name: jdk-clean-job
+                  current-parameters: true
+                  kill-phase-on: NEVER
+        - multijob:
+            name: 'Build jdk images'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-build-image
+                current-parameters: true
+                kill-phase-on: FAILURE
+        # Get depenencies for subsequent jobs.
+        - multijob:
+            name: 'Get Deps'
+            condition: ALWAYS
+            projects:
+              - name: jdk14-get-deps
+                current-parameters: true
+                kill-phase-on: FAILURE
+# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
+# Exception in thread "main" java.util.ServiceConfigurationError:
+# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
+# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
+# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
+        - multijob:
+            name: 'SPECjbb2015 benchmark'
+            condition: ALWAYS
+            projects:
+              - name: jdk14-specjbb2015-benchmark
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: '1GB Terasort benchmark'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-terasort-benchmark
+                current-parameters: true
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'JTREG tests'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-jtreg-test
+                current-parameters: true
+                predefined-parameters: 'XJTREG_SUBCATEGORIES=tools/javap/typeAnnotations'
+                kill-phase-on: NEVER
+        - multijob:
+            name: 'jcstress'
+            condition: COMPLETED
+            projects:
+              - name: jdk14-jcstress-test
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-publish-and-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - copyartifact:
+            project: jdk14-update-src-tree
+            filter: 'out/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk14-build-image
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk14-specjbb2015-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk14-terasort-benchmark
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+        - copyartifact:
+            project: jdk14-jtreg-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+            stable: true
+        - copyartifact:
+            project: jdk14-jcstress-test
+            filter: 'out/**/*'
+            target: out
+            flatten: true
+    publishers:
+        - archive:
+            artifacts: 'out/**/*'
diff --git a/jdk14-build-image.yaml b/jdk14-build-image.yaml
new file mode 100644
index 0000000000..138a30f239
--- /dev/null
+++ b/jdk14-build-image.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk14-build-image
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk14 (ie, bin/java, bin/javac, et al) for various configurations.<br>
+        * The source tarball is copied from the jdk14-update-src-tree job.<br>
+        * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Configure and build OpenJDK 14'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk14-update-src-tree
+            filter: 'out/jdk14.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+
+            cd $HOME/srv/jdk-cache/jdk13
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xf incoming/jdk14.tar.gz
+
+            shopt -s nullglob
+
+
+
+            # Configure and build.
+            mkdir -p build-stage1 build-stage2 out
+
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../jdk14/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk14 ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
+              popd
+
+              pushd build-stage2
+              sh ../jdk14/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            else
+              pushd build-stage2
+              sh ../jdk14/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} --disable-warnings-as-errors
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk14-${BUILD_TYPE}
+            tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
+
+            # Copy gtest materials to the correct place.
+            ( cd build-stage2
+              mkdir support/test/hotspot/jtreg/native/lib/server
+              cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/jtreg/native/lib/server
+            )
+
+            # Archive test support files.
+            tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.gz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk14-build-release.yaml b/jdk14-build-release.yaml
new file mode 100644
index 0000000000..96231e9783
--- /dev/null
+++ b/jdk14-build-release.yaml
@@ -0,0 +1,123 @@
+- job:
+    name: jdk14-build-release
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdk14 for release. Run after the source has passed tests.
+        * Tags build with Linaro-YYMM as per normal release procedure.
+        * The source tarball is copied from the jdk14-update-src-tree job.<br>
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Configure and build OpenJDK 14 Release'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk14-update-src-tree
+            filter: 'out/jdk14.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            # Generate files names dependent on year/month.
+            RELEASE=$(date +%y%m)
+            JDKDIR=jdk14-${BUILD_TYPE}-${RELEASE}
+            JDK_SRCDIR=jdk14-src-${RELEASE}
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+            mkdir -p build-stage1 build-stage2 out
+
+            cd $HOME/srv/jdk-cache/jdk13
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xaf incoming/jdk14.tar.gz
+
+            mv jdk14 $JDK_SRCDIR
+            # Tar up the source before sullying it with a build.
+            tar --exclude=.hg\* -acf out/jdk14-src-${RELEASE}.tar.xz $JDK_SRCDIR
+
+            mv $JDK_SRCDIR $JDKDIR
+            shopt -s nullglob
+
+            # Configure and build.
+            two_stage_build=0
+
+            which java
+            java -version
+
+            if [ $two_stage_build = 1 ]; then
+              pushd build-stage1
+              sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk14 ${ccache_build_opts}
+              make images
+              popd
+
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            else
+              pushd build-stage2
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
+                                        ${ccache_build_opts} \
+                                        --with-version-opt="Linaro-$RELEASE" \
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
+              make images
+              popd
+            fi
+
+            # Archive the result
+            artifact_name=jdk14-${BUILD_TYPE}-${RELEASE}
+
+            # This is different from ordinary builds.
+            tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.xz'
+        - email:
+            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk14-email-results.yaml b/jdk14-email-results.yaml
new file mode 100644
index 0000000000..d7f2fb6851
--- /dev/null
+++ b/jdk14-email-results.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: jdk14-email-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Sends the report.txt file to the aarch64-port-dev mailing list.<br>
+        * The text report is copied from the jdk14-generate-text-report job.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 14 - Send e-mail report'
+
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk14-generate-email-report
+            filter: 'report.txt'
+    publishers:
+        - email-ext:
+            recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net'
+            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 14 on AArch64'
+            content-type: text
+            body: |
+                ${FILE,path="report.txt"}
+            success: true
diff --git a/jdk14-generate-email-report.yaml b/jdk14-generate-email-report.yaml
new file mode 100644
index 0000000000..d9b0e6325d
--- /dev/null
+++ b/jdk14-generate-email-report.yaml
@@ -0,0 +1,74 @@
+- job:
+    name: jdk14-generate-email-report
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job aggregates the results from various jobs:<br>
+        <br>
+            * jcstress<br>
+            * jtreg<br>
+            * terasort<br>
+            * specjbb<br>
+        <br>
+        in text form suitable for the aarch64-port-dev mailing list.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Generate e-mail report'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            PERSIST=$HOME/srv/openjdk14
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            export JDK_VERSION=14
+            which jtdiff
+
+            TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
+            echo "" >> ${WORKSPACE}/report.txt
+
+            TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/jdk${JDK_VERSION}/ >> ${WORKSPACE}/report.txt
+    publishers:
+        - archive:
+            artifacts: 'report.txt'
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk14-get-deps.yaml b/jdk14-get-deps.yaml
new file mode 100644
index 0000000000..6d20463366
--- /dev/null
+++ b/jdk14-get-deps.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: jdk14-get-deps
+    project-type: freestyle
+    defaults: global
+    description: |
+        Download dependencies for builds. This includes build source code, jtreg, jcstress.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Get Dependencies'
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jcstress-build
+            filter: 'tests-all/target/jcstress.jar'
+            flatten: true
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - copyartifact:
+            project: jdk14-update-src-tree
+            filter: 'out/jdk14.tar.gz, out/build-date.sh'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            find $PWD -maxdepth 1
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk14-jcstress-test-persist-results.yaml b/jdk14-jcstress-test-persist-results.yaml
new file mode 100644
index 0000000000..5e8b6989a6
--- /dev/null
+++ b/jdk14-jcstress-test-persist-results.yaml
@@ -0,0 +1,89 @@
+- job:
+    name: jdk14-jcstress-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to:<br>
+          * /work/openjdk-testing/jcstress-nightly-runs<br>
+          * /work/openjdk-testing/jcstress-results
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Write jcstress tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk14-update-src-tree
+            filter: 'out/build-date.sh'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk14-jcstress-test
+            filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk14
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
+            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
+            RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
+
+            mkdir -p $JCSTRESS_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $RESULTS_CSV ]; then
+                touch $RESULTS_CSV
+            fi
+
+            mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz
+            numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
+            sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
+
diff --git a/jdk14-jcstress-test-publish-results.yaml b/jdk14-jcstress-test-publish-results.yaml
new file mode 100644
index 0000000000..b2b34e799e
--- /dev/null
+++ b/jdk14-jcstress-test-publish-results.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: jdk14-jcstress-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Publish jcstress report'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+
+            PERSIST=$HOME/srv/openjdk14
+            SCRIPT_DIR=$PERSIST/jcstress-test-scripts
+            export JDK_VERSION=14
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
+            fi
+            export TOP_DIR=$PERSIST
+
+            $SCRIPT_DIR/jcstress-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk14-jcstress-test.yaml b/jdk14-jcstress-test.yaml
new file mode 100644
index 0000000000..d0a69e8642
--- /dev/null
+++ b/jdk14-jcstress-test.yaml
@@ -0,0 +1,92 @@
+- job:
+    name: jdk14-jcstress-test
+    project-type: matrix
+    defaults: global
+    description: |
+        This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
+        <b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
+        This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Run jcstress tests'
+    parameters:
+        - string:
+            name: JCSTRESS_MODE
+            default: 'sanity'
+    axes:
+        - axis:
+            type: user-defined
+
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+        - timeout:
+            timeout: 900
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            TEST_TYPE=all
+            DEPS=$HOME/workspace/jdk14-get-deps
+
+            JCSTRESS_JAR=$DEPS/jcstress.jar
+            rm -rf jdk14*
+            tar xf ~/workspace/jdk14-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk14-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk14-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:${PATH}
+            which java
+            java -version
+
+            # XXX Don't fail the job if jcstress itself fails.
+            set +e
+            java -jar ${JCSTRESS_JAR} -m ${JCSTRESS_MODE}
+
+            test_result=$?
+            set -e
+
+            rm -rf out
+            mkdir out
+
+            out_dirname=jcstress-results-${BUILD_TYPE}
+
+            rm -rf ${out_dirname}
+            mkdir -p ${out_dirname}
+            cp jcstress-results*.bin.gz ${out_dirname}
+            cp -a results ${out_dirname}
+
+            tar czvf out/${out_dirname}.tar.gz ${out_dirname}
+    publishers:
+        - archive:
+            artifacts: 'out/jcstress-results-*.tar.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'results'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk14-jtreg-test-persist-results.yaml b/jdk14-jtreg-test-persist-results.yaml
new file mode 100644
index 0000000000..53723a0510
--- /dev/null
+++ b/jdk14-jtreg-test-persist-results.yaml
@@ -0,0 +1,114 @@
+- job:
+    name: jdk14-jtreg-test-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk14/openjdk-jtreg-nightly-tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Write jtreg tests results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - jdk
+                - hotspot
+                - langtools
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk14-jtreg-test
+            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - copyartifact:
+            project: jdk14-build-image
+            filter: 'out/jdk14-${BUILD_TYPE}.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk14
+            export JDK_VERSION=14
+
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz
+
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk14-${BUILD_TYPE}.tar.gz
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            basedir=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
+
+            rm -rf  ${image_dir}
+            mkdir -p ${image_dir}
+
+            tar -C ${basedir} \
+              --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${result_tarball}
+
+            tar -C ${image_dir} \
+              --strip-components=1 \
+              --show-transformed-names \
+              --overwrite \
+              -xvf ${image_tarball}
+
+            # Change location.
+            # Match the exact output of the cron-based scripts.
+            sed_expr1=$(echo s!XXX__YEAR__XXX!$YEAR!g)
+            sed_expr2=$(echo s!YYY__DAY_OF_YEAR__YYY!$DAY_OF_YEAR!g)
+
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
+
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
diff --git a/jdk14-jtreg-test-publish-results.yaml b/jdk14-jtreg-test-publish-results.yaml
new file mode 100644
index 0000000000..807436a26d
--- /dev/null
+++ b/jdk14-jtreg-test-publish-results.yaml
@@ -0,0 +1,71 @@
+- job:
+    name: jdk14-jtreg-test-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/jdk14/openjdk-jtreg-nightly-tests/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Publish jtreg results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+    builders:
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            PERSIST=$HOME/srv/openjdk14
+            SCRIPT_DIR=$PERSIST/openjdk-test-scripts
+            export JDK_VERSION=14
+
+            (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
+            tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
+            fi
+
+            tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            export PATH=${WORKSPACE}/jtreg/bin:$PATH
+            which jtdiff
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
+    publishers:
+        - archive:
+            artifacts: 'tree.out.xz, env.out'
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk14-jtreg-test.yaml b/jdk14-jtreg-test.yaml
new file mode 100644
index 0000000000..ff69ac23d2
--- /dev/null
+++ b/jdk14-jtreg-test.yaml
@@ -0,0 +1,191 @@
+- job:
+    name: jdk14-jtreg-test
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the jtreg tests.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Run jtreg tests'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: user-defined
+            name: JTREG_CATEGORY
+            values:
+                - hotspot
+                - langtools
+                - jdk
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - xvfb:
+            auto-display-name: true
+            additional-options: '-p unix'
+            debug: true
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "DISPLAY=${DISPLAY}"
+
+            set -exu
+
+            DEPS=$HOME/workspace/jdk14-get-deps
+
+            source $DEPS/build-date.sh
+
+            export JDK_VERSION=14
+            IMAGE_DIR=${WORKSPACE}/jdk14-${BUILD_TYPE}
+            PERSIST=$HOME/srv/openjdk14
+
+            JCSTRESS=$DEPS/jcstress.jar
+
+            tar xf $DEPS/jdk14.tar.gz
+            tar xf ~/workspace/jdk14-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk14-${BUILD_TYPE}.tar.gz
+            tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            tar xf ~/workspace/jdk14-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk14-${BUILD_TYPE}-support.tar.gz
+
+            # All the output directories and general frobbing
+            # output is to match the existing layout as expected
+            # by the cron-based publish and reporting scripts.
+            # XXX There's probably a better way.
+
+            YEAR=XXX__YEAR__XXX
+            DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY
+
+            basedir=cron_output
+            mkdir -p ${basedir}/{src,builds,reports}
+
+            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+
+            mkdir -p out ${src_dir} ${work_dir} ${report_dir}
+
+            mv jdk14/* ${src_dir}
+
+            blacklist=${WORKSPACE}/excludes.txt
+            # Add jtreg directory level for hotspot only.
+            jdk_problem_list=${src_dir}/test/${JTREG_CATEGORY}
+            if [ $JTREG_CATEGORY = "hotspot" ]; then
+                jdk_problem_list=${jdk_problem_list}/jtreg/ProblemList.txt
+            else
+                jdk_problem_list=${jdk_problem_list}/ProblemList.txt
+            fi
+
+            if [ -e $jdk_problem_list ]; then
+                cat $jdk_problem_list > ${blacklist}
+            fi
+
+            aarch64_exclude_file=${src_dir}/test/exclude_aarch64.txt
+
+            if [ -e ${aarch64_exclude_file} ]; then
+                cat ${aarch64_exclude_file} >> ${blacklist}
+            fi
+
+            touch ${blacklist}
+
+            echo "Blacklist"
+            echo "========="
+            cat ${blacklist}
+            echo "---------"
+
+            export JAVA_HOME=${WORKSPACE}/jdk14-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:${PATH}
+
+            # For hotspot and jdk we pass a -nativepath: option to jtreg.
+            # This enables the tests needing native libraries to run.
+            NATIVEPATH=${WORKSPACE}/jdk14-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
+
+            if [ $JTREG_CATEGORY = "langtools" ]; then
+                # The nativepath option we pass must be a valid directory, or
+                # not at all.`
+                NATIVE_OPT=
+            else
+                # Test executables are expected to be in same directory as libraries
+                mv $NATIVEPATH/../bin/* $NATIVEPATH
+                NATIVE_OPT=-nativepath:$NATIVEPATH
+            fi
+
+            PATH=${WORKSPACE}/jtreg/bin:${PATH}
+            which java
+            java -version
+
+            # Ignore error in jtreg final result.
+            set +e
+
+            # hotspot splits its tests into gtest jtreg tests. We just do jtreg.
+            if [ $JTREG_CATEGORY == "hotspot" ]; then
+                TEST_SUBDIR=test/${JTREG_CATEGORY}/jtreg:hotspot_all_no_apps
+            else
+                TEST_SUBDIR=test/${JTREG_CATEGORY}
+            fi
+
+            java -jar jtreg/lib/jtreg.jar \
+                 -dir:${src_dir} \
+                 -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
+                 -vmoption:-Xmx2G \
+                 -testjdk:${IMAGE_DIR} \
+                 -exclude:${blacklist} \
+                 -conc:20 \
+                 -r:${report_dir} \
+                 -w:${work_dir} \
+                 $NATIVE_OPT \
+                 -timeout:8 \
+                 -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n
+
+
+            # Kill leftover jstatd processes.
+            killall -9 jstatd
+            set -e
+
+            # We don't care for the .class files.
+            find ${work_dir} -name \*.class -exec rm {} \;
+
+            # Match the exact output of the cron-based scripts.
+            dest=$PERSIST/openjdk-jtreg-nightly-tests
+            sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
+            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
+
+            mkdir -p out
+            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports
+    publishers:
+        - archive:
+            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk14-persist-all-results.yaml b/jdk14-persist-all-results.yaml
new file mode 100644
index 0000000000..766a9ce022
--- /dev/null
+++ b/jdk14-persist-all-results.yaml
@@ -0,0 +1,51 @@
+- job:
+    name: jdk14-persist-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * This job persist all results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 14 - Persist all results'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk14-jtreg-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-specjbb2015-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-terasort-benchmark-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-jcstress-test-persist-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-update-src-tree-persist
+              block: true
+              current-parameters: true
diff --git a/jdk14-publish-all-results.yaml b/jdk14-publish-all-results.yaml
new file mode 100644
index 0000000000..002aa32b8c
--- /dev/null
+++ b/jdk14-publish-all-results.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk14-publish-all-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 14 - Invoke all the scripts to sync results to openjdk.linaro.org'
+    parameters:
+        - string:
+            name: PUBLISH_DEST
+            default: '/home/openjdk-testing/jdk14'
+        - string:
+            name: PUBLISH_HOST
+            default: 'stuart.monteith@people.linaro.org'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: jdk14-jtreg-test-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-specjbb2015-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-terasort-benchmark-publish-results
+              block: true
+              current-parameters: true
+        - trigger-builds:
+            - project: jdk14-jcstress-test-publish-results
+              block: true
+              current-parameters: true
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk14-publish-and-report.yaml b/jdk14-publish-and-report.yaml
new file mode 100644
index 0000000000..2eed5131cd
--- /dev/null
+++ b/jdk14-publish-and-report.yaml
@@ -0,0 +1,63 @@
+- job:
+    name: jdk14-publish-and-report
+    project-type: multijob
+    defaults: global
+    description: |
+        * This job publishes results and send e-mail reports.
+    logrotate:
+        numToKeep: 10
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: DAYS
+            default: '15'
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: master
+    display-name: 'OpenJDK 14 - Publish results and send reports'
+    wrappers:
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-content: 'DAYS=15'
+    builders:
+        - multijob:
+            name: 'Persist results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-persist-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Publish results to openjdk.linaro.org'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-publish-all-results
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'Generate e-mail report'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-generate-email-report
+                current-parameters: true
+                kill-phase-on: FAILURE
+        - multijob:
+            name: 'E-mail results'
+            condition: SUCCESSFUL
+            projects:
+              - name: jdk14-email-results
+                current-parameters: true
+                kill-phase-on: FAILURE
diff --git a/jdk14-specjbb2015-benchmark-persist-results.yaml b/jdk14-specjbb2015-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..b60c4561d6
--- /dev/null
+++ b/jdk14-specjbb2015-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk14-specjbb2015-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes the results to $HOME/srv/openjdk14/SPECjbb2015-nightly-runs.<br>
+        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
+          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Write SPECjbb2015 results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk14-specjbb2015-benchmark
+            filter: 'out/specjbb*.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            tree -f .
+
+            PERSIST=$HOME/srv/openjdk14
+            TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+            mkdir -p $TOP_DIR
+
+            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
+            fi
+
+            source $SCRIPT_DIR/common.sh
+
+            # Ensure nightly results dir exists.
+            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
+
+            echo "Previous Results"
+            cat ${RESULTS_CSV}
+            set -eux
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz
+            [ -e $result_tarball ] || exit 1
+            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
+            cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
+            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
+            echo "Updating ${RESULTS_CSV}"
+            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk14-specjbb2015-benchmark-publish-results.yaml b/jdk14-specjbb2015-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..dfaad4a19a
--- /dev/null
+++ b/jdk14-specjbb2015-benchmark-publish-results.yaml
@@ -0,0 +1,59 @@
+- job:
+    name: jdk14-specjbb2015-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Reports are published to http://openjdk.linaro.org/jdk14/SPECjbb2015-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '4090'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '1015'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Publish SPECjbb2015 benchmark results'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+                users:
+                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+            PERSIST=$HOME/srv/openjdk14
+            export TOP_DIR=$PERSIST
+            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
+
+            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk14-specjbb2015-benchmark.yaml b/jdk14-specjbb2015-benchmark.yaml
new file mode 100644
index 0000000000..1fec00e871
--- /dev/null
+++ b/jdk14-specjbb2015-benchmark.yaml
@@ -0,0 +1,102 @@
+- job:
+    name: jdk14-specjbb2015-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Run SPECjbb2015 benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ## Extract jdk
+            tar xf ~/workspace/jdk14-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk14-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk14-${BUILD_TYPE}
+            export PATH=$JAVA_HOME/bin:$PATH
+            which java
+            java -version
+
+            ## Extract specjbb2015 product
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015-jdk11.tar.gz
+
+            ## Run test
+
+            SPECJBB_PRODUCT_HOME=SPECjbb2015-1.00
+
+            # This commented-out invocation is a quick test that
+            # takes about 10 minutes to complete - which can be
+            # useful when debugging.
+
+            #(cd $SPECJBB_PRODUCT_HOME; \
+            # time java \
+            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
+            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
+            #   -Dspecjbb.controller.type=PRESET \
+            #   -Dspecjbb.controller.preset.ir=4000 \
+            #   -Dspecjbb.controller.preset.duration=100 \
+            #   -jar specjbb2015.jar -m composite)
+
+            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
+
+            mkdir -p out
+
+            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/")
+
+            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
+
+            java -jar $SPECJBB_PRODUCT_HOME/specjbb2015.jar \
+              -m REPORTER \
+              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
+              -p $SPECJBB_PRODUCT_HOME/config/specjbb2015.props \
+              -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
+              -l 1
+
+            tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result
+
+            rm -rf html
+            mkdir html
+            cp -a result/**/report-00001/* html
+            cp html/*0001.html html/index.html
+    publishers:
+        - archive:
+            artifacts: 'out/*.gz'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'html'
+            files: 'index.html'
+            keep-all: true
diff --git a/jdk14-terasort-benchmark-persist-results.yaml b/jdk14-terasort-benchmark-persist-results.yaml
new file mode 100644
index 0000000000..9ea78630e1
--- /dev/null
+++ b/jdk14-terasort-benchmark-persist-results.yaml
@@ -0,0 +1,79 @@
+- job:
+    name: jdk14-terasort-benchmark-persist-results
+    project-type: matrix
+    defaults: global
+    description: |
+        * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Write terasort results'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - copyartifact:
+            project: jdk14-terasort-benchmark
+            filter: 'out/terasort-results-${BUILD_TYPE}.csv'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            PERSIST=$HOME/srv/openjdk14
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv
+            prev_results=$BENCHMARK_RESULTS_DIR/results.csv
+
+            # Ensure persistent directory exists.
+            mkdir -p $BENCHMARK_RESULTS_DIR
+
+            # Tolerate missing results.csv file.
+            if [ ! -f $prev_results ]; then
+                touch $prev_results
+            fi
+
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            echo "Previous Results"
+            echo "----------------"
+            cat ${prev_results}
+            echo
+
+            cat ${new_results} >> ${prev_results}
+
+            $SCRIPT_DIR/update-results-db
diff --git a/jdk14-terasort-benchmark-publish-results.yaml b/jdk14-terasort-benchmark-publish-results.yaml
new file mode 100644
index 0000000000..6efab53f97
--- /dev/null
+++ b/jdk14-terasort-benchmark-publish-results.yaml
@@ -0,0 +1,67 @@
+- job:
+    name: jdk14-terasort-benchmark-publish-results
+    project-type: freestyle
+    defaults: global
+    description: |
+        * Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: ZERO_BASELINE
+            default: '14115'
+        - string:
+            name: SERVER_MAX_JOPS_BASELINE
+            default: '3275'
+        - string:
+            name: SERVER_CRITICAL_JOPS_BASELINE
+            default: '854'
+        - string:
+            name: PUBLISH_DEST
+            default: ''
+        - string:
+            name: PUBLISH_HOST
+            default: ''
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Publish terasort benchmark results'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - ssh-agent-credentials:
+            # openjdk-testing user id
+            users:
+                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
+        - timestamps
+# Replaced by parameters
+#        - inject:
+#            properties-file: '${HOME}/performance-baseline.properties'
+    builders:
+        - shell: |
+            #!/bin/bash
+            PERSIST=$HOME/srv/openjdk14
+            export JDK_VERSION=14
+
+            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
+            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
+
+            if [ -d $SCRIPT_DIR ]; then
+                (cd $SCRIPT_DIR; git pull)
+            else
+                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
+            fi
+
+            $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk14-terasort-benchmark.yaml b/jdk14-terasort-benchmark.yaml
new file mode 100644
index 0000000000..10b1dc440f
--- /dev/null
+++ b/jdk14-terasort-benchmark.yaml
@@ -0,0 +1,112 @@
+- job:
+    name: jdk14-terasort-benchmark
+    project-type: matrix
+    defaults: global
+    description: |
+        * Runs the terasort benchmark.
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            openjdk-members:
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Run terasort benchmark'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - release
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            NGIGABYTES=1
+
+
+            CACHE_FILES=$HOME/srv/jdk-cache
+            ## Extract jdk
+            rm -rf jdk14*
+            tar xf ~/workspace/jdk14-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk14-${BUILD_TYPE}.tar.gz
+
+            export JAVA_HOME=${WORKSPACE}/jdk14-${BUILD_TYPE}
+            export PATH=${JAVA_HOME}/bin:$PATH
+
+            ## Extract Hadoop pre-builts
+            rm -rf openjdk8-hadooop-LCA14
+            tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz
+
+            rm -rf incoming; mkdir -p incoming
+            ## Benchmark
+            (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
+
+            TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
+            HADOOP_DIR=${WORKSPACE}/openjdk8-hadoop-LCA14
+
+            rm -rf out
+            mkdir out
+
+            sed -i '/^export JAVA_HOME=/d' ${HADOOP_DIR}/conf/hadoop-env.sh
+            echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_DIR}/conf/hadoop-env.sh
+            sed -i 's|/work/${user.name}/hadoop-tmp|${user.home}/hadoop/tmp|' ${HADOOP_DIR}/conf/core-site.xml
+
+            source ${HADOOP_DIR}/env.sh
+
+            which hadoop
+            which java
+            which hdfs
+            java -version
+
+            stop-dfs.sh
+            stop-yarn.sh
+
+            rm -rf ${HOME}/hadoop
+            mkdir -p ${HOME}/hadoop/tmp
+            hdfs namenode -format -force
+            start-dfs.sh
+            start-yarn.sh
+
+            # Need time for the datanodes to materialise.
+            sleep 30
+            jps
+
+            hadoop fs -mkdir -p /user/$USER
+            hadoop fs -copyFromLocal $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB /user/$USER
+
+            trap "stop-dfs.sh; stop-yarn.sh" EXIT
+
+            elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
+            /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+
+            hadoop fs -rm -R ${NGIGABYTES}GB-sorted
+            sed -i 's/\..*//' $elapsed_time_file
+            elapsed_time=$(cat $elapsed_time_file)
+            date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
+            echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv
+            rm -rf incoming/${NGIGABYTES}*
+    publishers:
+        - archive:
+            artifacts: 'out/terasort-results-*.csv'
diff --git a/jdk14-update-src-tree-persist.yaml b/jdk14-update-src-tree-persist.yaml
new file mode 100644
index 0000000000..f36cfd1727
--- /dev/null
+++ b/jdk14-update-src-tree-persist.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: jdk14-update-src-tree-persist
+    project-type: freestyle
+    defaults: global
+    description: |
+        This jobs writes the current jdk14 src tree to /work/openjdk-testing/jdk14/openjdk-jtreg-nightly-tests/...<br>
+        It is used to report failure/errors against the jtreg results.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+    parameters:
+        - string:
+            name: YEAR
+            default: 'default'
+        - string:
+            name: DAY_OF_YEAR
+            default: 'default'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Write jdk14 source tree'
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jdk14-update-src-tree
+            filter: 'out/*'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+            PERSIST=$HOME/srv/openjdk14
+
+            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
+            src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
+            mkdir -p $src_dir
+            echo "Extracting tarball to $src_dir"
+            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk14.tar.gz
+
+            # Copy bill-of-materials to persistent area for email report.
+            cp incoming/BOM $TOP_DIR
diff --git a/jdk14-update-src-tree.yaml b/jdk14-update-src-tree.yaml
new file mode 100644
index 0000000000..f2c0217243
--- /dev/null
+++ b/jdk14-update-src-tree.yaml
@@ -0,0 +1,101 @@
+- scm:
+    name: jdk14
+    scm:
+        - hg:
+            url: https://hg.openjdk.java.net/jdk-updates/jdk14u
+            clean: true
+            subdir: jdk14
+- job:
+    name: jdk14-update-src-tree
+    project-type: freestyle
+    defaults: global
+    description: |
+        This job polls upstream Mercurial servers for changes and,<br>
+        if there are any, triggers "jdk14-build-and-test".<br>
+        Note: this job archives the src which is later required by the jtreg<br>
+        report and publish job. The build-date.sh artefact contains shell<br>
+        variables for the day and day-of-year the source was archived.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk13-.*"
+                - "jdk11-.*"
+                - "jdk8-.*"
+                - "jdkX-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK 14 - Update jdk14 source tree'
+    scm:
+        - jdk14
+    triggers:
+        - pollscm:
+            cron: '0 7 * * 2,4,6'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -eu
+
+            rm -rf out
+            mkdir out
+
+            pushd jdk14
+            #find . -name BOM -exec rm {} \;
+            #commit_id=$(hg identify | awk '{print $1}')
+            #echo "jdk14-${commit_id}" | tee -a BOM
+
+            #for i in corba jaxp jaxws langtools jdk hotspot nashorn; do
+            #  pushd $i
+            #  commit_id=$(hg identify | awk '{print $1}')
+            #  dir=$(basename $PWD)
+            #  echo "${dir}-${commit_id}" | tee -a ../BOM
+            #  popd
+            #done
+
+            ## Pull out subdirectory HG versions
+            echo BOM for $(hg paths default) > BOM
+            echo -e Subdir\\tHash\\t\\tTag\\tTag hash >> BOM
+            echo -e .\\t$(hg head --template '{node|short}\t' tip; hg tags --template="{tag}\t{node|short}\n" | grep -ve '^tip' | head -n1) >>BOM
+
+            cp BOM $WORKSPACE/out
+
+            popd
+
+            : ${YEAR:=$(date +%Y)}
+            : ${DAY_OF_YEAR:=$(date +%j)}
+
+            : ${YEAR_YESTERDAY:=$YEAR}
+            : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
+
+            echo "YEAR=${YEAR}" >dates.prop
+            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
+
+            echo "export YEAR=${YEAR}" > out/build-date.sh
+            echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
+
+            tar --exclude=.hg -acf out/jdk14.tar.gz jdk14
+    publishers:
+        - archive:
+            artifacts: 'out/jdk14.tar.gz, out/build-date.sh, out/BOM'
+        - fingerprint:
+            files: 'out/*'
+            record-artifacts: true
+        - trigger-parameterized-builds:
+            - project: jdk14-build-and-test
+              condition: SUCCESS
+              property-file: dates.prop
diff --git a/jdk7u-build-image-amd64.yaml b/jdk7u-build-image-amd64.yaml
deleted file mode 100644
index 3f1b3463cc..0000000000
--- a/jdk7u-build-image-amd64.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-- job:
-    name: jdk7u-build-image-amd64
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Builds the jdk7 images.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 10
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: JVM_VARIANT
-            default: client
-        - string:
-            name: BUILD_TYPE
-            default: release
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'OpenJDK - Build OpenJDK 7 images'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - copyartifact:
-            project: jdk7u-update-src-tree
-            filter: 'out/jdk7u.tar.gz'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: archive-primordial-jdk7-amd64
-            filter: 'out/primordial-jdk7.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            sudo apt-get -q=2 update
-            sudo apt-get -q=2 install -y --no-install-recommends \
-              ant \
-              cpio \
-              gawk \
-              libasound2-dev \
-              libcups2-dev \
-              libfreetype6-dev \
-              libxext-dev \
-              libxrender-dev \
-              libxt-dev \
-              libxtst-dev \
-              python-requests \
-              unzip \
-              zip
-
-            set -exu
-
-            rm -rf jdk7u primordial-jdk7
-            tar xf incoming/jdk7u.tar.gz
-            tar xf incoming/primordial-jdk7.tar.gz
-            cd jdk7u
-            export LANG=C
-            make ALT_BOOTDIR=${WORKSPACE}/primordial-jdk7 BUILD_NUMBER=b${BUILD_NUMBER}
-
-            # Archive the result
-            cd ${WORKSPACE}
-            rm -rf out
-            mkdir out
-            artifact_name=jdk7u-${JVM_VARIANT}-${BUILD_TYPE}
-            tar -C jdk7u/build/linux-amd64/j2sdk-image --exclude=\*.diz --transform="s#^#${artifact_name}/#" -acf out/${artifact_name}.tar.gz jre bin lib
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out components/openjdk/jdk7u-x86_64/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.gz'
diff --git a/jdk7u-build-image.yaml b/jdk7u-build-image.yaml
index 3edc0aa1bb..9bc4b30d5b 100644
--- a/jdk7u-build-image.yaml
+++ b/jdk7u-build-image.yaml
@@ -11,7 +11,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK - Build OpenJDK 7 images'
     axes:
diff --git a/jdk7u-update-src-tree.yaml b/jdk7u-update-src-tree.yaml
index f35aef9b3f..ce656e19bc 100644
--- a/jdk7u-update-src-tree.yaml
+++ b/jdk7u-update-src-tree.yaml
@@ -2,49 +2,49 @@
     name: jdk7u
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u
             clean: true
             subdir: jdk7u
 - scm:
     name: corba
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u/corba
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u/corba
             clean: true
             subdir: jdk7u/corba
 - scm:
     name: hotspot
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u/hotspot
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u/hotspot
             clean: true
             subdir: jdk7u/hotspot
 - scm:
     name: jaxp
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u/jaxp
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u/jaxp
             clean: true
             subdir: jdk7u/jaxp
 - scm:
     name: jaxws
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u/jaxws
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u/jaxws
             clean: true
             subdir: jdk7u/jaxws
 - scm:
     name: jdk
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u/jdk
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u/jdk
             clean: true
             subdir: jdk7u/jdk
 - scm:
     name: langtools
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk7u/jdk7u/langtools
+            url: https://hg.openjdk.java.net/jdk7u/jdk7u/langtools
             clean: true
             subdir: jdk7u/langtools
 - job:
@@ -61,10 +61,10 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK - Archive jdk7 source tree'
     scm:
diff --git a/jdk8-archive-test-scripts.yaml b/jdk8-archive-test-scripts.yaml
index b31b788738..9478b4f8f4 100644
--- a/jdk8-archive-test-scripts.yaml
+++ b/jdk8-archive-test-scripts.yaml
@@ -13,8 +13,8 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Archive OpenJDK 8 test scripts'
     wrappers:
         - timestamps
diff --git a/jdk8-build-and-test.yaml b/jdk8-build-and-test.yaml
index d6b62dbf30..6a27f2e8ec 100644
--- a/jdk8-build-and-test.yaml
+++ b/jdk8-build-and-test.yaml
@@ -26,7 +26,7 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK 8 - Build jdk images and run tests/benchmarks'
     wrappers:
@@ -35,19 +35,38 @@
         - timestamps
     builders:
         - multijob:
+            name: 'OpenJDK Clean job'
+            condition: SUCCESSFUL
+            projects:
+                - name: jdk-clean-job
+                  current-parameters: true
+                  kill-phase-on: NEVER
+        - multijob:
             name: 'Build j2sdk images'
             condition: SUCCESSFUL
             projects:
               - name: jdk8-build-image
                 current-parameters: true
                 kill-phase-on: FAILURE
+        # Get depenencies for subsequent jobs.
+        - multijob:
+            name: 'Get Deps'
+            condition: ALWAYS
+            projects:
+              - name: jdk8-get-deps
+                current-parameters: true
+                kill-phase-on: FAILURE
+# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
+# Exception in thread "main" java.util.ServiceConfigurationError:
+# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
+# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
+# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
         - multijob:
             name: 'SPECjbb2015 benchmark'
             condition: SUCCESSFUL
             projects:
               - name: jdk8-specjbb2015-benchmark
                 current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
                 kill-phase-on: FAILURE
         - multijob:
             name: '1GB Terasort benchmark'
@@ -70,7 +89,6 @@
             projects:
               - name: jdk8-jcstress-test
                 current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
                 kill-phase-on: FAILURE
         - multijob:
             name: 'Publish results to openjdk.linaro.org'
diff --git a/jdk8-build-image.yaml b/jdk8-build-image.yaml
index 64bf331ac1..447a4d04d3 100644
--- a/jdk8-build-image.yaml
+++ b/jdk8-build-image.yaml
@@ -14,12 +14,13 @@
             openjdk-members:
                 - job-build
                 - job-cancel
+                - job-workspace
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Configure and build OpenJDK 8'
     scm:
         - git:
@@ -35,12 +36,6 @@
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - zero
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -48,7 +43,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -56,78 +51,68 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdk8-update-src-tree
             filter: 'out/jdk8u.tar.gz'
             target: incoming
             flatten: true
-        - copyartifact:
-            project: archive-primordial-jdk7
-            filter: 'out/primordial-jdk7.tar.gz'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
             set -exu
 
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-
             ccache_build_opts=--disable-ccache
 
+            rm -rf jdk* primordial-jdk* build* out
+
+            cd $HOME/srv/jdk-cache/jdk8u
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
             # Extract sources from upstream job
             rm -rf jdk8u
             tar xf incoming/jdk8u.tar.gz
 
             shopt -s nullglob
 
-            # SRDM Commented out as not needed for buildng client builds, but
-            # maybe necessary in future.
-            #
-            # Apply patches
-            # Only apply to client builds.
-            # if [ "$JVM_VARIANT" = "client" ]; then
-            #    OLDDIR=$PWD
-            #    cd $WORKSPACE/patches
-            #    for patch in $(find  -name '*.patch'); do
-            #        patch_dir=$(dirname $patch)
-            #        patch_path=$(pwd)/$patch
-            #        (echo Applying $patch to $patch_dir ; cd $OLDDIR/jdk8u/$patch_dir; \
-            #        patch -p1  < $patch_path)
-            #    done
-            #    cd $OLDDIR
-            # fi
-
-            # Extract boot jdk
-            rm -rf primordial-jdk7
-            tar xf incoming/primordial-jdk7.tar.gz
-
             # Configure and build.
-            rm -rf build*
-            mkdir -p build-stage1 build-stage2
+            mkdir -p build-stage1 build-stage2 out
 
             two_stage_build=0
 
             which java
             java -version
 
+            EXTRA_CFLAGS="-Wno-error -fno-delete-null-pointer-checks \
+              -fno-lifetime-dse -Wno-deprecated-declarations         \
+              -Wno-maybe-uninitialized -Wno-misleading-indentation \
+              -Wno-shift-negative-value"
+            EXTRA_CPP_FLAGS="-Wno-error -std=gnu++98 \
+              -fno-delete-null-pointer-checks -fno-lifetime-dse \
+              -Wno-deprecated-declarations -Wno-maybe-uninitialized \
+              -Wno-misleading-indentation -Wno-shift-negative-value"
+
             if [ $two_stage_build = 1 ]; then
               pushd build-stage1
-              sh ../jdk8u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts}
+              sh ../jdk8u/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 \
+                 ${ccache_build_opts} --with-extra-cxxflags="$EXTRA_CPP_FLAGS" --with-extra-cflags="$EXTRA_CFLAGS"
               make images
               popd
 
               pushd build-stage2
-              sh ../jdk8u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image ${ccache_build_opts}
+              sh ../jdk8u/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image \
+                 ${ccache_build_opts} --with-extra-cxxflags="$EXTRA_CPP_FLAGS" --with-extra-cflags="$EXTRA_CFLAGS"
               make images
               popd
             else
               pushd build-stage2
-              sh ../jdk8u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts}
+              sh ../jdk8u/configure --with-debug-level=${BUILD_TYPE} \
+                ${ccache_build_opts} --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
+                 --with-extra-cflags="$EXTRA_CFLAGS"
               make images
               popd
             fi
@@ -135,7 +120,7 @@
             # Archive the result
             rm -rf out
             mkdir out
-            artifact_name=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}
+            artifact_name=jdk8u-${BUILD_TYPE}
             tar -C build-stage2/images/j2sdk-image --exclude=\*.diz --transform="s!^!$artifact_name/!" -acf out/${artifact_name}.tar.gz jre bin lib
     publishers:
         - archive:
diff --git a/jdk8-build-release.yaml b/jdk8-build-release.yaml
index 187769dc06..25b4a02d4d 100644
--- a/jdk8-build-release.yaml
+++ b/jdk8-build-release.yaml
@@ -14,12 +14,13 @@
             openjdk-members:
                 - job-build
                 - job-cancel
+                - job-workspace
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Configure and build OpenJDK 8 Release'
     scm:
         - git:
@@ -35,11 +36,6 @@
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -47,7 +43,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -55,16 +51,13 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdk8-update-src-tree
             filter: 'out/jdk8u.tar.gz'
             target: incoming
             flatten: true
-        - copyartifact:
-            project: archive-primordial-jdk7
-            filter: 'out/primordial-jdk7.tar.gz'
             target: incoming
             flatten: true
         - shell: |
@@ -72,20 +65,22 @@
 
             set -exu
 
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-            export JVM_VARIANT=server
-
             # Generate files names dependent on year/month.
             RELEASE=$(date +%y%m)
-            JDKDIR=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
+            JDKDIR=jdk8u-${BUILD_TYPE}-${RELEASE}
             JDK_SRCDIR=jdk8u-src-${RELEASE}
 
             ccache_build_opts=--disable-ccache
 
-            # Setup archive directory
-            mkdir out
+            rm -rf jdk* primordial-jdk* build* out
+            mkdir -p build-stage1 build-stage2 out
+
+            cd $HOME/srv/jdk-cache/jdk8u
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
 
             # Extract sources from upstream job
             rm -rf jdk8u
@@ -98,39 +93,43 @@
             mv $JDK_SRCDIR $JDKDIR
             shopt -s nullglob
 
-            # Extract boot jdk
-            rm -rf primordial-jdk7
-            tar xf incoming/primordial-jdk7.tar.gz
-
             # Configure and build.
-            rm -rf build*
-            mkdir -p build-stage1 build-stage2
-
             two_stage_build=0
 
             which java
             java -version
 
+            EXTRA_CFLAGS="-Wno-error -fno-delete-null-pointer-checks \
+              -fno-lifetime-dse -Wno-deprecated-declarations         \
+              -Wno-maybe-uninitialized -Wno-misleading-indentation \
+              -Wno-shift-negative-value"
+            EXTRA_CPP_FLAGS="-Wno-error -std=gnu++98 \
+              -fno-delete-null-pointer-checks -fno-lifetime-dse \
+              -Wno-deprecated-declarations -Wno-maybe-uninitialized \
+              -Wno-misleading-indentation -Wno-shift-negative-value"
             if [ $two_stage_build = 1 ]; then
               pushd build-stage1
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} 
+              sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk7 ${ccache_build_opts} \
+                 --with-extra-cxxflags="$EXTRA_CPP_FLAGS" --with-extra-cflags="$EXTRA_CFLAGS"
               make images
               popd
 
               pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
                                         --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image \
                                         ${ccache_build_opts} \
+                                        --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
+                                        --with-extra-cflags="$EXTRA_CFLAGS" \
                                         --with-user-release-suffix="Linaro-$RELEASE" \
                                         --with-milestone="release"
               make images
               popd
             else
               pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
                                         ${ccache_build_opts} \
+                                         --with-extra-cxxflags="$EXTRA_CPP_FLAGS" \
+                                        --with-extra-cflags="$EXTRA_CFLAGS" \
                                         --with-user-release-suffix="Linaro-$RELEASE" \
                                         --with-milestone="release"
               make images
@@ -138,7 +137,7 @@
             fi
 
             # Archive the result
-            artifact_name=jdk8u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
+            artifact_name=jdk8u-${BUILD_TYPE}-${RELEASE}
 
             # This is different from ordinary builds.
             tar -C build-stage2/images --exclude=\*.diz --transform="s!^j2sdk-image!$artifact_name!" -acf out/${artifact_name}.tar.xz j2sdk-image
diff --git a/jdk8-email-results.yaml b/jdk8-email-results.yaml
index 1a4aa90662..d6c43c23e7 100644
--- a/jdk8-email-results.yaml
+++ b/jdk8-email-results.yaml
@@ -17,7 +17,7 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK 8 - Send e-mail report'
     wrappers:
diff --git a/jdk8-generate-email-report.yaml b/jdk8-generate-email-report.yaml
index bf2b5ec511..7d287eafee 100644
--- a/jdk8-generate-email-report.yaml
+++ b/jdk8-generate-email-report.yaml
@@ -33,8 +33,8 @@
         - string:
             name: SERVER_CRITICAL_JOPS_BASELINE
             default: '901'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Generate e-mail report'
     wrappers:
         - timestamps
diff --git a/jdk8-get-deps.yaml b/jdk8-get-deps.yaml
new file mode 100644
index 0000000000..564fc1e7f3
--- /dev/null
+++ b/jdk8-get-deps.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: jdk8-get-deps
+    project-type: freestyle
+    defaults: global
+    description: |
+        Download dependencies for builds. This includes build source code, jtreg, jcstress.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK - Get Dependencies'
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jcstress-build
+            filter: 'tests-all/target/jcstress.jar'
+            flatten: true
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - copyartifact:
+            project: jdk8-update-src-tree
+            filter: 'out/jdk8u.tar.gz, out/build-date.sh'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            find $PWD -maxdepth 1
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdk8-jcstress-test-persist-results.yaml b/jdk8-jcstress-test-persist-results.yaml
index d6bc1b4308..ff9045ee47 100644
--- a/jdk8-jcstress-test-persist-results.yaml
+++ b/jdk8-jcstress-test-persist-results.yaml
@@ -8,7 +8,7 @@
           * /work/openjdk-testing/jcstress-results
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -25,18 +25,12 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Write jcstress tests results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -44,17 +38,15 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
         sequential: true
     wrappers:
         - workspace-cleanup:
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdk8-update-src-tree
@@ -63,7 +55,7 @@
             flatten: true
         - copyartifact:
             project: jdk8-jcstress-test
-            filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - shell: |
@@ -88,7 +80,7 @@
             fi
 
             mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
-            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz
             numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
             echo "Previous Results"
             cat ${RESULTS_CSV}
diff --git a/jdk8-jcstress-test-publish-results.yaml b/jdk8-jcstress-test-publish-results.yaml
index 619a80a46e..5ca1755bd7 100644
--- a/jdk8-jcstress-test-publish-results.yaml
+++ b/jdk8-jcstress-test-publish-results.yaml
@@ -23,8 +23,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Publish jcstress report'
     wrappers:
         - timestamps
diff --git a/jdk8-jcstress-test.yaml b/jdk8-jcstress-test.yaml
index ffbdd2776f..06a27b21fd 100644
--- a/jdk8-jcstress-test.yaml
+++ b/jdk8-jcstress-test.yaml
@@ -8,7 +8,7 @@
         This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -18,22 +18,16 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Run jcstress tests'
     parameters:
         - string:
             name: JCSTRESS_MODE
-            default: 'quick'
+            default: 'sanity'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -41,7 +35,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -49,37 +43,22 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
         - timeout:
             timeout: 900
     builders:
-        - copyartifact:
-            project: jcstress-build
-            filter: 'tests-custom/target/jcstress.jar, tests-all/target/jcstress.jar'
-            target: incoming
-            flatten: false
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk8-build-image
-#            filter: 'out/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
         - shell: |
             #!/bin/bash
 
             set -eu
 
             TEST_TYPE=all
+            DEPS=$HOME/workspace/jdk8-get-deps
 
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
+            JCSTRESS_JAR=$DEPS/jcstress.jar
             rm -rf jdk8u*
-            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk8u-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:${PATH}
             which java
             java -version
@@ -94,7 +73,7 @@
             rm -rf out
             mkdir out
 
-            out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}
+            out_dirname=jcstress-results-${BUILD_TYPE}
 
             rm -rf ${out_dirname}
             mkdir -p ${out_dirname}
diff --git a/jdk8-jtreg-test-persist-results.yaml b/jdk8-jtreg-test-persist-results.yaml
index 78947026a0..92f8ac72b6 100644
--- a/jdk8-jtreg-test-persist-results.yaml
+++ b/jdk8-jtreg-test-persist-results.yaml
@@ -6,7 +6,7 @@
         * Writes the results to $HOME/srv/openjdk8u/openjdk-jtreg-nightly-tests.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -24,18 +24,12 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Write jtreg tests results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -50,7 +44,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -58,16 +52,16 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdk8-jtreg-test
-            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - copyartifact:
             project: jdk8-build-image
-            filter: 'out/jdk8u-server-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jdk8u-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - shell: |
@@ -80,18 +74,18 @@
             PERSIST=$HOME/srv/openjdk8u
             export JDK_VERSION=8u
 
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz
 
-            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk8u-server-${BUILD_TYPE}.tar.gz
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdk8u-${BUILD_TYPE}.tar.gz
 
             : ${YEAR:=$(date +%Y)}
             : ${DAY_OF_YEAR:=$(date +%j)}
 
             basedir=$PERSIST/openjdk-jtreg-nightly-tests
             src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
-            image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/j2sdk-image
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/j2sdk-image
 
             rm -rf  ${image_dir}
             mkdir -p ${image_dir}
diff --git a/jdk8-jtreg-test-publish-results.yaml b/jdk8-jtreg-test-publish-results.yaml
index 70ce46e82a..3321afde6f 100644
--- a/jdk8-jtreg-test-publish-results.yaml
+++ b/jdk8-jtreg-test-publish-results.yaml
@@ -29,8 +29,8 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Publish jtreg results'
     wrappers:
         - timestamps
diff --git a/jdk8-jtreg-test.yaml b/jdk8-jtreg-test.yaml
index d091ac34f1..82813a5a57 100644
--- a/jdk8-jtreg-test.yaml
+++ b/jdk8-jtreg-test.yaml
@@ -6,13 +6,14 @@
         * Runs the jtreg tests.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-read
                 - job-extended-read
                 - job-build
                 - job-cancel
+                - job-workspace
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 10
@@ -24,18 +25,12 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Run jtreg tests'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -50,7 +45,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -62,25 +57,8 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            target: incoming
-            flatten: true
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk8-build-image
-#            filter: 'out/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: jdk8-update-src-tree
-            filter: 'out/jdk8u.tar.gz, out/build-date.sh'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
@@ -88,15 +66,15 @@
 
             set -exu
 
-            source incoming/build-date.sh
+            DEPS=$HOME/workspace/jdk8-get-deps
+
+            source $DEPS/build-date.sh
 
             export JDK_VERSION=8u
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-            IMAGE_DIR=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
+            IMAGE_DIR=${WORKSPACE}/jdk8u-${BUILD_TYPE}
             PERSIST=$HOME/srv/openjdk8u
 
+            JCSTRESS=$DEPS/jcstress.jar
 
             # Only set =1 for debugging.
             use_subcategories=0
@@ -117,9 +95,9 @@
 
             : ${JTREG_SUBCATEGORIES:=.}
 
-            tar xf incoming/jdk8u.tar.gz
-            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            tar xf $DEPS/jdk8u.tar.gz
+            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz
+            tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz
 
             # All the output directories and general frobbing
             # output is to match the existing layout as expected
@@ -133,8 +111,8 @@
             mkdir -p ${basedir}/{src,builds,reports}
 
             src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
 
             mkdir -p out ${src_dir} ${work_dir} ${report_dir}
 
@@ -160,7 +138,7 @@
             cat ${blacklist}
             echo "---------"
 
-            export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk8u${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:${PATH}
 
             PATH=${WORKSPACE}/jtreg/bin:${PATH}
@@ -170,9 +148,8 @@
             # Ignore error in jtreg final result.
             set +e
 
-            if [ $JVM_VARIANT = "server" ]; then
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir}/${JTREG_CATEGORY}/test \
+            java -jar jtreg/lib/jtreg.jar \
+                 -dir:${src_dir}/${JTREG_CATEGORY}/test \
                   -testjdk:${IMAGE_DIR} \
                   -exclude:${blacklist} \
                   -conc:auto \
@@ -180,19 +157,7 @@
                   -w:${work_dir} \
                   -timeout:2 \
                   -a -othervm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
-            else
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir}/${JTREG_CATEGORY}/test \
-                  -vmoption:-XX:+TieredCompilation \
-                  -vmoption:-XX:TieredStopAtLevel=1 \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  -timeout:2 \
-                  -a -othervm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
-            fi
+
 
             # Kill leftover jstatd processes.
             killall -9 jstatd
@@ -208,7 +173,7 @@
             find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
 
             mkdir -p out
-            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports
+            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports
     publishers:
         - archive:
-            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk8-persist-all-results.yaml b/jdk8-persist-all-results.yaml
index cab541dd45..94438a6d90 100644
--- a/jdk8-persist-all-results.yaml
+++ b/jdk8-persist-all-results.yaml
@@ -23,7 +23,7 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK 8 - Persist all results'
     wrappers:
diff --git a/jdk8-publish-all-results.yaml b/jdk8-publish-all-results.yaml
index 1e71f5de22..53f7850d58 100644
--- a/jdk8-publish-all-results.yaml
+++ b/jdk8-publish-all-results.yaml
@@ -16,7 +16,7 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK 8 - Invoke all the scripts to sync results to openjdk.linaro.org'
     parameters:
diff --git a/jdk8-publish-and-report.yaml b/jdk8-publish-and-report.yaml
index 5fded62e1e..99315619df 100644
--- a/jdk8-publish-and-report.yaml
+++ b/jdk8-publish-and-report.yaml
@@ -24,7 +24,7 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK 8 - Publish results and send reports'
     wrappers:
diff --git a/jdk8-specjbb2013-benchmark-persist-results.yaml b/jdk8-specjbb2013-benchmark-persist-results.yaml
deleted file mode 100644
index 199c98c24f..0000000000
--- a/jdk8-specjbb2013-benchmark-persist-results.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-- job:
-    name: jdk8-specjbb2013-benchmark-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes the results to /work/openjdk-testing/SPECjbb2013-1.00-nightly-runs.<br>
-        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
-          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 8 - Write SPECjbb2013 results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk8-specjbb2013-benchmark
-            filter: 'out/specjbb*.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            tree -f .
-
-            PERSIST=$HOME/srv/openjdk8u
-            TOP_DIR=$PERSIST
-            mkdir -p $TOP_DIR
-
-            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
-            fi
-
-            source $SCRIPT_DIR/common.sh
-
-            # Ensure nightly results dir exists.
-            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
-
-            echo "Previous Results"
-            cat ${RESULTS_CSV}
-            set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            [ -e $result_tarball ] || exit 1
-            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
-            cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
-            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
-            echo "Updating ${RESULTS_CSV}"
-            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk8-specjbb2013-benchmark-publish-results.yaml b/jdk8-specjbb2013-benchmark-publish-results.yaml
index 23bd0047c7..fc944ddfd9 100644
--- a/jdk8-specjbb2013-benchmark-publish-results.yaml
+++ b/jdk8-specjbb2013-benchmark-publish-results.yaml
@@ -29,8 +29,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Publish SPECjbb2013 benchmark results'
     wrappers:
         - timestamps
diff --git a/jdk8-specjbb2013-benchmark.yaml b/jdk8-specjbb2013-benchmark.yaml
deleted file mode 100644
index 1417c70516..0000000000
--- a/jdk8-specjbb2013-benchmark.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-- job:
-    name: jdk8-specjbb2013-benchmark
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the specjbb benchmark in composite mode (i.e., single VM, single node).
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 8 - Run SPECjbb2013 benchmark'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-# SRDM: Disable client build while waiting for LEG-347 to be fixed.
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk8-build-image
-#            filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: archive-specjbb2013-product-tarball
-            filter: 'out/SPECjbb2013-1.00.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            ## Extract jdk
-            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk8u-${JVM_VARIANT}-${BUILD_TYPE}
-            export PATH=$JAVA_HOME/bin:$PATH
-            which java
-            java -version
-
-            ## Extract specjbb2013 product
-            #(cd incoming; wget -nv http://openjdk-apm1/openjdk8-build-artefacts/SPECjbb2013-1.00.tar.gz)
-            tar xf incoming/SPECjbb2013-1.00.tar.gz
-
-            ## Run test
-
-            SPECJBB_PRODUCT_HOME=SPECjbb2013-1.00
-
-            # This commented-out invocation is a quick test that
-            # takes about 10 minutes to complete - which can be
-            # useful when debugging.
-
-            #(cd $SPECJBB_PRODUCT_HOME; \
-            # time java \
-            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
-            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
-            #   -Dspecjbb.controller.type=PRESET \
-            #   -Dspecjbb.controller.preset.ir=4000 \
-            #   -Dspecjbb.controller.preset.duration=100 \
-            #   -jar specjbb2013.jar -m composite)
-
-            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2013.jar -m composite)
-
-            mkdir -p out
-
-            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2013\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/")
-
-            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
-
-            java -jar $SPECJBB_PRODUCT_HOME/specjbb2013.jar \
-              -m REPORTER \
-              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
-              -p $SPECJBB_PRODUCT_HOME/config/specjbb2013.props \
-              -s $SPECJBB_PRODUCT_HOME/specjbb2013-C-*.data.gz \
-              -l 1
-
-            tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result
-
-            rm -rf html
-            mkdir html
-            cp -a result/**/report-00001/* html
-            cp html/*0001.html html/index.html
-    publishers:
-        - archive:
-            artifacts: 'out/*.gz'
-        - html-publisher:
-            name: 'HTML Report'
-            dir: 'html'
-            files: 'index.html'
-            keep-all: true
diff --git a/jdk8-specjbb2015-benchmark-persist-results.yaml b/jdk8-specjbb2015-benchmark-persist-results.yaml
index 8f0d770669..da67cfb8cb 100644
--- a/jdk8-specjbb2015-benchmark-persist-results.yaml
+++ b/jdk8-specjbb2015-benchmark-persist-results.yaml
@@ -8,7 +8,7 @@
           * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-build
@@ -17,18 +17,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Write SPECjbb2015 results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -36,17 +30,15 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
         sequential: true
     wrappers:
         - workspace-cleanup:
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdk8-specjbb2015-benchmark
@@ -78,10 +70,10 @@
             echo "Previous Results"
             cat ${RESULTS_CSV}
             set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz
             [ -e $result_tarball ] || exit 1
             tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
-            cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
+            cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
             pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
             echo "Updating ${RESULTS_CSV}"
             $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk8-specjbb2015-benchmark-publish-results.yaml b/jdk8-specjbb2015-benchmark-publish-results.yaml
index 8a88cf0b8d..ba693e6a88 100644
--- a/jdk8-specjbb2015-benchmark-publish-results.yaml
+++ b/jdk8-specjbb2015-benchmark-publish-results.yaml
@@ -32,8 +32,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Publish SPECjbb2015 benchmark results'
     wrappers:
         - timestamps
diff --git a/jdk8-specjbb2015-benchmark.yaml b/jdk8-specjbb2015-benchmark.yaml
index 61d897b4d0..5d01118680 100644
--- a/jdk8-specjbb2015-benchmark.yaml
+++ b/jdk8-specjbb2015-benchmark.yaml
@@ -6,7 +6,7 @@
         * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-build
@@ -15,18 +15,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Run SPECjbb2015 benchmark'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -34,7 +28,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -42,38 +36,23 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk8-build-image
-#            filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: archive-specjbb2015-product-tarball
-            filter: 'out/SPECjbb2015.tgz'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
             set -exu
-            #
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
 
             ## Extract jdk
-            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdk8u-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:$PATH
             which java
             java -version
 
             ## Extract specjbb2015 product
-            tar xf incoming/SPECjbb2015.tgz
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015.tgz
 
             ## Run test
 
@@ -92,15 +71,12 @@
             #   -Dspecjbb.controller.preset.duration=100 \
             #   -jar specjbb2015.jar -m composite)
 
-            if [ $JVM_VARIANT = "server" ]; then
-                (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
-            else
-                (cd $SPECJBB_PRODUCT_HOME; java -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
-            fi
+            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
+
 
             mkdir -p out
 
-            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/")
+            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/")
 
             cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
 
@@ -111,7 +87,7 @@
               -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
               -l 1
 
-            tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result
+            tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result
 
             rm -rf html
             mkdir html
diff --git a/jdk8-terasort-benchmark-persist-results.yaml b/jdk8-terasort-benchmark-persist-results.yaml
index 5fd8eaf1fb..048e6b4ffc 100644
--- a/jdk8-terasort-benchmark-persist-results.yaml
+++ b/jdk8-terasort-benchmark-persist-results.yaml
@@ -6,7 +6,7 @@
         * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-build
@@ -15,18 +15,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Write terasort results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -34,7 +28,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -42,11 +36,11 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdk8-terasort-benchmark
-            filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv'
+            filter: 'out/terasort-results-${BUILD_TYPE}.csv'
             target: incoming
             flatten: true
         - shell: |
@@ -56,7 +50,7 @@
 
             PERSIST=$HOME/srv/openjdk8u
             export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
-            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv
+            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv
             prev_results=$BENCHMARK_RESULTS_DIR/results.csv
 
             # Ensure persistent directory exists.
diff --git a/jdk8-terasort-benchmark-publish-results.yaml b/jdk8-terasort-benchmark-publish-results.yaml
index cd28b7ad1f..e1a1f60015 100644
--- a/jdk8-terasort-benchmark-publish-results.yaml
+++ b/jdk8-terasort-benchmark-publish-results.yaml
@@ -32,8 +32,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Publish terasort benchmark results'
     wrappers:
         - workspace-cleanup:
diff --git a/jdk8-terasort-benchmark.yaml b/jdk8-terasort-benchmark.yaml
index eda47e9cdf..1fd3008a8a 100644
--- a/jdk8-terasort-benchmark.yaml
+++ b/jdk8-terasort-benchmark.yaml
@@ -6,27 +6,22 @@
         * Runs the terasort benchmark.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
+                - job-extended-read
                 - job-build
                 - job-cancel
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Run terasort benchmark'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -34,7 +29,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -42,20 +37,8 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk8-build-image
-#            filter: 'out/jdk8-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: openjdk8-hadoop-LCA14
-            filter: 'out/openjdk8-hadoop-LCA14.tar.gz'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
@@ -63,24 +46,20 @@
 
             NGIGABYTES=1
 
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
+            CACHE_FILES=$HOME/srv/jdk-cache
             ## Extract jdk
             rm -rf jdk8*
-            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar xf ~/workspace/jdk8-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdk8u-${BUILD_TYPE}.tar.gz
 
-            export JAVA_HOME=${WORKSPACE}/jdk8u-${REAL_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdk8u-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:$PATH
 
             ## Extract Hadoop pre-builts
             rm -rf openjdk8-hadooop-LCA14
-            tar xf incoming/openjdk8-hadoop-LCA14.tar.gz
+            tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz
 
+            rm -rf incoming; mkdir -p incoming
             ## Benchmark
-            # FIXME
-            #(cd incoming; wget --progress=dot -e dotbytes=10M http://openjdk-apm1/openjdk8-build-artefacts/${NGIGABYTES}GB.tar.gz; tar xf ${NGIGABYTES}GB.tar.gz)
             (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
 
             TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
@@ -118,21 +97,14 @@
 
             trap "stop-dfs.sh; stop-yarn.sh" EXIT
 
-            # Use only C1 compiler for client runs.
-            if [ $JVM_VARIANT = "client" ]; then
-                VARIANT_OPT=-XX:TieredStopAtLevel=1
-            else
-                VARIANT_OPT=-Dharmless.property
-            fi
-
             elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
-            HADOOP_OPTS=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+            /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
 
             hadoop fs -rm -R ${NGIGABYTES}GB-sorted
             sed -i 's/\..*//' $elapsed_time_file
             elapsed_time=$(cat $elapsed_time_file)
             date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
-            echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv
+            echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv
             rm -rf incoming/${NGIGABYTES}*
     publishers:
         - archive:
diff --git a/jdk8-update-src-tree-persist.yaml b/jdk8-update-src-tree-persist.yaml
index 0cf1d4af62..1a45675f70 100644
--- a/jdk8-update-src-tree-persist.yaml
+++ b/jdk8-update-src-tree-persist.yaml
@@ -24,8 +24,8 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8 - Write jdk8 source tree'
     wrappers:
         - workspace-cleanup:
diff --git a/jdk8-update-src-tree.yaml b/jdk8-update-src-tree.yaml
index 6378652bc8..dc156bb33c 100644
--- a/jdk8-update-src-tree.yaml
+++ b/jdk8-update-src-tree.yaml
@@ -2,56 +2,56 @@
     name: jdk8
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah
             clean: true
             subdir: jdk8u
 - scm:
     name: corba
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/corba
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/corba
             clean: true
             subdir: jdk8u/corba
 - scm:
     name: hotspot
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/hotspot
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/hotspot
             clean: true
             subdir: jdk8u/hotspot
 - scm:
     name: jaxp
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/jaxp
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxp
             clean: true
             subdir: jdk8u/jaxp
 - scm:
     name: jaxws
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/jaxws
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jaxws
             clean: true
             subdir: jdk8u/jaxws
 - scm:
     name: jdk
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/jdk
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/jdk
             clean: true
             subdir: jdk8u/jdk
 - scm:
     name: langtools
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/langtools
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/langtools
             clean: true
             subdir: jdk8u/langtools
 - scm:
     name: nashorn
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/aarch64-port/jdk8u/nashorn
+            url: https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah/nashorn
             clean: true
             subdir: jdk8u/nashorn
 - job:
@@ -76,8 +76,16 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk14-.*"
+                - "jdk13-.*"
+                - "jdk11-.*"
+                - "jdkX-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK 8u - Update jdk8u source tree'
     scm:
         - jdk8
@@ -89,7 +97,8 @@
         - langtools
         - nashorn
     triggers:
-        - pollscm: 'H 00 * * *'
+        - pollscm:
+            cron: '0 7 * * 2,4,6'
     wrappers:
         - timestamps
     builders:
diff --git a/jdk9-archive-test-scripts.yaml b/jdk9-archive-test-scripts.yaml
deleted file mode 100644
index 111b1145a8..0000000000
--- a/jdk9-archive-test-scripts.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    name: jdk9-archive-test-scripts
-    project-type: freestyle
-    defaults: global
-    description: |
-        * This job is no longer necessary as these directories are held at git.linaro.org.
-    logrotate:
-        numToKeep: 10
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Archive OpenJDK 9u test scripts'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            rm -rf out
-            mkdir out
-            cd ~openjdk-testing
-            tar --exclude=.git -acvf ${WORKSPACE}/out/specjbb-test-scripts.tar.gz specjbb-test-scripts 
-            tar --exclude=.git --exclude=jdk9 -acvf ${WORKSPACE}/out/openjdk-test-scripts.tar.gz openjdk-test-scripts
-            tar --exclude=.git -acvf ${WORKSPACE}/out/hadoop-test-scripts.tar.gz  hadoop-test-scripts
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.gz'
diff --git a/jdk9-build-and-test.yaml b/jdk9-build-and-test.yaml
deleted file mode 100644
index dc0e978dda..0000000000
--- a/jdk9-build-and-test.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-- job:
-    name: jdk9-build-and-test
-    project-type: multijob
-    defaults: global
-    description: |
-        * This jobs builds the jdk images and runs tests and benchmarks against the built images.<br>
-        * <b>Note:</b> this job is usually triggered by a source change (ie. the "jdk9-update-src-tree" job).<br>
-        If it is run manually it will use the source tarball from the last successful build of that job.<br>
-        * If this jobs runs to completion the results are published to http://openjdk.linaro.org/.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 9u - Build jdk images and run tests/benchmarks'
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-    builders:
-        - multijob:
-            name: 'Build jdk images'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-build-image
-                current-parameters: true
-                kill-phase-on: FAILURE
-# FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
-# Exception in thread "main" java.util.ServiceConfigurationError:
-# org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
-# Provider org.spec.jbb.core.comm.connectivity.GrizzlyNioProvider could not be instantiated
-# Caused by: java.lang.IllegalStateException: java.lang.RuntimeException: java.lang.NullPointerException
-        - multijob:
-            name: 'SPECjbb2015 benchmark'
-            condition: ALWAYS
-            projects:
-              - name: jdk9-specjbb2015-benchmark
-                current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
-                kill-phase-on: FAILURE
-        - multijob:
-            name: '1GB Terasort benchmark'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-terasort-benchmark
-                current-parameters: true
-                kill-phase-on: NEVER
-        - multijob:
-            name: 'JTREG tests'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-jtreg-test
-                current-parameters: true
-                predefined-parameters: 'XJTREG_SUBCATEGORIES=tools/javap/typeAnnotations'
-                kill-phase-on: NEVER
-        - multijob:
-            name: 'jcstress'
-            condition: COMPLETED
-            projects:
-              - name: jdk9-jcstress-test
-                current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'Publish results to openjdk.linaro.org'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-publish-and-report
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - copyartifact:
-            project: jdk9-update-src-tree
-            filter: 'out/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk9-build-image
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk9-specjbb2015-benchmark
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk9-terasort-benchmark
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-        - copyartifact:
-            project: jdk9-jtreg-test
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-            stable: true
-        - copyartifact:
-            project: jdk9-jcstress-test
-            filter: 'out/**/*'
-            target: out
-            flatten: true
-    publishers:
-        - archive:
-            artifacts: 'out/**/*'
diff --git a/jdk9-build-image.yaml b/jdk9-build-image.yaml
deleted file mode 100644
index 72b48ddf73..0000000000
--- a/jdk9-build-image.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-- job:
-    name: jdk9-build-image
-    project-type: matrix
-    defaults: global
-    description: |
-        * Configures and builds jdk9 (ie, bin/java, bin/javac, et al) for various configurations.<br>
-        * The source tarball is copied from the jdk9-update-src-tree job.<br>
-        * <b>Note:</b> we are no longer building -fastdebug variants as there is not enough time to test the images.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1708.tar.xz'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Configure and build OpenJDK 9u'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - zero
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-update-src-tree
-            filter: 'out/jdk9u.tar.gz'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: archive-primordial-jdk8
-            filter: 'out/primordial-jdk8.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-
-            ccache_build_opts=--disable-ccache
-
-            rm -rf jdk* primordial-jdk* build*
-
-            wget --progress=dot -e dotbytes=2M ${JDK_URL}
-            tar -Jxf jdk*.tar.xz
-
-            cd jdk*/jre/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            export PATH=${JAVA_HOME}/bin:${PATH}
-
-            cd ${WORKSPACE}
-
-            # Extract sources from upstream job
-            tar xf incoming/jdk9u.tar.gz
-
-            shopt -s nullglob
-
-            # Extract boot jdk
-            tar xf incoming/primordial-jdk8.tar.gz
-
-            # Configure and build
-            mkdir -p build-stage1 build-stage2
-
-            two_stage_build=0
-
-            which java
-            java -version
-
-            if [ $two_stage_build = 1 ]; then
-              pushd build-stage1
-              sh ../jdk9u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk8 ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
-              popd
-
-              pushd build-stage2
-              sh ../jdk9u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/j2sdk-image ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
-              popd
-            else
-              pushd build-stage2
-              sh ../jdk9u/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
-              popd
-            fi
-
-            # Archive the result
-            rm -rf out
-            mkdir out
-            artifact_name=jdk9u-${JVM_VARIANT}-${BUILD_TYPE}
-            tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
-
-            # Archive test support files.
-            tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.gz'
-        - email:
-            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk9-build-release.yaml b/jdk9-build-release.yaml
deleted file mode 100644
index b4129806ef..0000000000
--- a/jdk9-build-release.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-- job:
-    name: jdk9-build-release
-    project-type: matrix
-    defaults: global
-    description: |
-        * Configures and builds jdk9 for release. Run after the source has passed tests.
-        * Tags build with Linaro-YYMM as per normal release procedure.
-        * The source tarball is copied from the jdk9-update-src-tree job.<br>
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1708.tar.xz'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Configure and build OpenJDK 9u Release'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-update-src-tree
-            filter: 'out/jdk9u.tar.gz'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: archive-primordial-jdk8
-            filter: 'out/primordial-jdk8.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-            export JVM_VARIANT=server
-
-            # Generate files names dependent on year/month.
-            RELEASE=$(date +%y%m)
-            JDKDIR=jdk9-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
-            JDK_SRCDIR=jdk9u-src-${RELEASE}
-
-            ccache_build_opts=--disable-ccache
-
-            rm -rf jdk* primordial-jdk* build*
-
-            # Download, setup JDK8 for building.
-            wget --progress=dot -e dotbytes=2M ${JDK_URL}
-            tar -Jxf jdk*.tar.xz
-
-            cd jdk*/jre/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            export PATH=${JAVA_HOME}/bin:${PATH}
-
-            cd ${WORKSPACE}
-
-            # Setup archive directory
-            mkdir out
-
-            # Extract sources from upstream job
-            tar xaf incoming/jdk9u.tar.gz
-
-            mv jdk9u $JDK_SRCDIR
-            # Tar up the source before sullying it with a build.
-            tar --exclude=.hg\* -acf out/jdk9u-src-${RELEASE}.tar.xz $JDK_SRCDIR
-
-            mv $JDK_SRCDIR $JDKDIR
-            shopt -s nullglob
-
-            # Configure and build
-            mkdir -p build-stage1 build-stage2
-
-            two_stage_build=0
-
-            which java
-            java -version
-
-            if [ $two_stage_build = 1 ]; then
-              pushd build-stage1
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdk9 ${ccache_build_opts}
-              make images
-              popd
-
-              pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
-                                        --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
-                                        ${ccache_build_opts} \
-                                        --with-version-opt="Linaro-$RELEASE" \
-                                        --with-version-pre="release"
-              make images
-              popd
-            else
-              pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
-                                        ${ccache_build_opts} \
-                                        --with-version-opt="Linaro-$RELEASE" \
-                                        --with-version-pre="release"
-              make images
-              popd
-            fi
-
-            # Archive the result
-            artifact_name=jdk9u-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
-
-            # This is different from ordinary builds.
-            tar -C build-stage2/images --exclude=\*.diz --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
-    publishers:
-        - archive:
-            artifacts: 'out/*.tar.xz'
-        - email:
-            recipients: 'stuart.monteith@linaro.org fathi.boudra@linaro.org'
diff --git a/jdk9-email-results.yaml b/jdk9-email-results.yaml
deleted file mode 100644
index fe53b3aded..0000000000
--- a/jdk9-email-results.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-- job:
-    name: jdk9-email-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Sends the report.txt file to the aarch64-port-dev mailing list.<br>
-        * The text report is copied from the jdk9-generate-text-report job.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 9u - Send e-mail report'
-    wrappers:
-        - timestamps
-    builders:
-        - copyartifact:
-            project: jdk9-generate-email-report
-            filter: 'report.txt'
-    publishers:
-        - email-ext:
-            recipients: 'stuart.monteith@linaro.org, fathi.boudra@linaro.org, aarch64-port-dev@openjdk.java.net'
-            subject: 'JTREG, JCStress, SPECjbb2015 and Hadoop/Terasort results for OpenJDK 9u on AArch64'
-            content-type: text
-            body: |
-                ${FILE,path="report.txt"}
-            success: true
diff --git a/jdk9-generate-email-report.yaml b/jdk9-generate-email-report.yaml
deleted file mode 100644
index e066187f28..0000000000
--- a/jdk9-generate-email-report.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- job:
-    name: jdk9-generate-email-report
-    project-type: freestyle
-    defaults: global
-    description: |
-        This job aggregates the results from various jobs:<br>
-        <br>
-            * jcstress<br>
-            * jtreg<br>
-            * terasort<br>
-            * specjbb<br>
-        <br>
-        in text form suitable for the aarch64-port-dev mailing list.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '4090'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '1015'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Generate e-mail report'
-    wrappers:
-        - timestamps
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            PATH=${WORKSPACE}/jtreg/bin:${PATH}
-            PERSIST=$HOME/srv/openjdk9u
-            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-            export JDK_VERSION=9u
-            which jtdiff
-
-            TOP_DIR=${PERSIST}/openjdk-jtreg-nightly-tests ${PERSIST}/openjdk-test-scripts/openjdk-test-summary release > ${WORKSPACE}/report.txt
-            echo "" >> ${WORKSPACE}/report.txt
-
-            TOP_DIR=${PERSIST} ${PERSIST}/specjbb-test-scripts/specjbb-report >> ${WORKSPACE}/report.txt
-            echo "" >> ${WORKSPACE}/report.txt
-
-            BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results ${PERSIST}/hadoop-test-scripts/benchmark-terasort-report >> ${WORKSPACE}/report.txt
-            echo "" >> ${WORKSPACE}/report.txt
-
-            TOP_DIR=${PERSIST} ${PERSIST}/jcstress-test-scripts/jcstress-report --url http://openjdk.linaro.org/jdk${JDK_VERSION}/ >> ${WORKSPACE}/report.txt
-    publishers:
-        - archive:
-            artifacts: 'report.txt'
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk9-jcstress-test-persist-results.yaml b/jdk9-jcstress-test-persist-results.yaml
deleted file mode 100644
index 2c5980c0ee..0000000000
--- a/jdk9-jcstress-test-persist-results.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-- job:
-    name: jdk9-jcstress-test-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes results to:<br>
-          * /work/openjdk-testing/jcstress-nightly-runs<br>
-          * /work/openjdk-testing/jcstress-results
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Write jcstress tests results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-update-src-tree
-            filter: 'out/build-date.sh'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: jdk9-jcstress-test
-            filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            PERSIST=$HOME/srv/openjdk9u
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-
-            JCSTRESS_RUN_DIR=$PERSIST/jcstress-nightly-runs
-            JCSTRESS_RESULTS_DIR=$PERSIST/jcstress-results
-            RESULTS_CSV=${JCSTRESS_RESULTS_DIR}/results.csv
-
-            mkdir -p $JCSTRESS_RESULTS_DIR
-
-            # Tolerate missing results.csv file.
-            if [ ! -f $RESULTS_CSV ]; then
-                touch $RESULTS_CSV
-            fi
-
-            mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
-            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
-            echo "Previous Results"
-            cat ${RESULTS_CSV}
-            echo "${numeric_date},${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR},success" >> ${RESULTS_CSV}
-            sort --unique --field-separator=',' --numeric-sort -o ${RESULTS_CSV} ${RESULTS_CSV}
-
diff --git a/jdk9-jcstress-test-publish-results.yaml b/jdk9-jcstress-test-publish-results.yaml
deleted file mode 100644
index ab7754e0d7..0000000000
--- a/jdk9-jcstress-test-publish-results.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- job:
-    name: jdk9-jcstress-test-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Reports are published to http://openjdk.linaro.org/jcstress-nightly-runs/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Publish jcstress report'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-            users:
-                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-
-            PERSIST=$HOME/srv/openjdk9u
-            SCRIPT_DIR=$PERSIST/jcstress-test-scripts
-            export JDK_VERSION=9u
-
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/jcstress-test-scripts.git $SCRIPT_DIR
-            fi
-            export TOP_DIR=$PERSIST
-
-            $SCRIPT_DIR/jcstress-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/jdk9-jcstress-test.yaml b/jdk9-jcstress-test.yaml
deleted file mode 100644
index e6d783bdbc..0000000000
--- a/jdk9-jcstress-test.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-- job:
-    name: jdk9-jcstress-test
-    project-type: matrix
-    defaults: global
-    description: |
-        This job runs the http://openjdk.java.net/projects/code-tools/jcstress/ tests.<br>
-        <b>Note:</b> this test currently takes around <b>10 hours</b> to complete<br>
-        This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Run jcstress tests'
-    parameters:
-        - string:
-            name: JCSTRESS_MODE
-            default: 'quick'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-        - timeout:
-            timeout: 900
-    builders:
-        - copyartifact:
-            project: jcstress-build
-            filter: 'tests-custom/target/jcstress.jar, tests-all/target/jcstress.jar'
-            target: incoming
-            flatten: false
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk9-build-image
-#            filter: 'out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -eu
-
-            TEST_TYPE=all
-
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
-            rm -rf jdk9u*
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=${JAVA_HOME}/bin:${PATH}
-            which java
-            java -version
-
-            # XXX Don't fail the job if jcstress itself fails.
-            set +e
-            java -jar ${JCSTRESS_JAR} -m ${JCSTRESS_MODE}
-
-            test_result=$?
-            set -e
-
-            rm -rf out
-            mkdir out
-
-            out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}
-
-            rm -rf ${out_dirname}
-            mkdir -p ${out_dirname}
-            cp jcstress-results*.bin.gz ${out_dirname}
-            cp -a results ${out_dirname}
-
-            tar czvf out/${out_dirname}.tar.gz ${out_dirname}
-    publishers:
-        - archive:
-            artifacts: 'out/jcstress-results-*.tar.gz'
-        - html-publisher:
-            name: 'HTML Report'
-            dir: 'results'
-            files: 'index.html'
-            keep-all: true
diff --git a/jdk9-jtreg-test-persist-results.yaml b/jdk9-jtreg-test-persist-results.yaml
deleted file mode 100644
index 48ee6c9b8a..0000000000
--- a/jdk9-jtreg-test-persist-results.yaml
+++ /dev/null
@@ -1,120 +0,0 @@
-- job:
-    name: jdk9-jtreg-test-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes the results to $HOME/srv/openjdk9u/openjdk-jtreg-nightly-tests.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Write jtreg tests results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: user-defined
-            name: JTREG_CATEGORY
-            values:
-                - jdk
-                - hotspot
-                - langtools
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-jtreg-test
-            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: jdk9-build-image
-            filter: 'out/jdk9u-server-${BUILD_TYPE}.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            tree -f .
-
-            PERSIST=$HOME/srv/openjdk9u
-            export JDK_VERSION=9u
-
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-
-            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdk9u-server-${BUILD_TYPE}.tar.gz
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-
-            basedir=$PERSIST/openjdk-jtreg-nightly-tests
-            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
-            image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
-
-            rm -rf  ${image_dir}
-            mkdir -p ${image_dir}
-
-            tar -C ${basedir} \
-              --transform="s/YYY__DAY_OF_YEAR__YYY/$DAY_OF_YEAR/;s/XXX__YEAR__XXX/$YEAR/" \
-              --show-transformed-names \
-              --overwrite \
-              -xvf ${result_tarball}
-
-            tar -C ${image_dir} \
-              --strip-components=1 \
-              --show-transformed-names \
-              --overwrite \
-              -xvf ${image_tarball}
-
-            # Change location.
-            # Match the exact output of the cron-based scripts.
-            sed_expr1=$(echo s!XXX__YEAR__XXX!$YEAR!g)
-            sed_expr2=$(echo s!YYY__DAY_OF_YEAR__YYY!$DAY_OF_YEAR!g)
-
-            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
-            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
-
-            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr1" {} \;
-            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr2" {} \;
diff --git a/jdk9-jtreg-test-publish-results.yaml b/jdk9-jtreg-test-publish-results.yaml
deleted file mode 100644
index ca1aff2d8a..0000000000
--- a/jdk9-jtreg-test-publish-results.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- job:
-    name: jdk9-jtreg-test-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Results are published to http://openjdk.linaro.org/jdk9/openjdk-jtreg-nightly-tests/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Publish jtreg results'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-    builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            PERSIST=$HOME/srv/openjdk9u
-            SCRIPT_DIR=$PERSIST/openjdk-test-scripts
-            export JDK_VERSION=9u
-
-            (unset PRIVATE_KEY; env | sort  >$WORKSPACE/env.out)
-            tree -fd -L 5 $PERSIST | xz >$WORKSPACE/tree.out.xz
-
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/openjdk-test-scripts.git $SCRIPT_DIR
-            fi
-
-            tar xf jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            export PATH=${WORKSPACE}/jtreg/bin:$PATH
-            which jtdiff
-            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests bash -x $SCRIPT_DIR/publish $PUBLISH_DEST $NODE_NAME
-    publishers:
-        - archive:
-            artifacts: 'tree.out.xz, env.out'
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-jtreg-test.yaml b/jdk9-jtreg-test.yaml
deleted file mode 100644
index 0e7c8b81c3..0000000000
--- a/jdk9-jtreg-test.yaml
+++ /dev/null
@@ -1,232 +0,0 @@
-- job:
-    name: jdk9-jtreg-test
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the jtreg tests.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Run jtreg tests'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: user-defined
-            name: JTREG_CATEGORY
-            values:
-                - hotspot
-                - langtools
-                - jdk
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - xvfb:
-            auto-display-name: true
-            additional-options: '-p unix'
-            debug: true
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            target: incoming
-            flatten: true
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk9-build-image
-#            filter: 'out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: jdk9-update-src-tree
-            filter: 'out/jdk9u.tar.gz, out/build-date.sh'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            echo "DISPLAY=${DISPLAY}"
-
-            set -exu
-
-            source incoming/build-date.sh
-
-            export JDK_VERSION=9u
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-            IMAGE_DIR=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
-            PERSIST=$HOME/srv/openjdk9u
-
-
-            # Only set =1 for debugging.
-            use_subcategories=0
-
-            if [ ${use_subcategories} -eq 1 ]; then
-              case ${JTREG_CATEGORY} in
-                langtools)
-                    JTREG_SUBCATEGORIES=tools/javap/typeAnnotations
-                    ;;
-                jdk)
-                    JTREG_SUBCATEGORIES=jdk/net/Sockets
-                    ;;
-                hotspot)
-                    JTREG_SUBCATEGORIES=runtime/CommandLine
-                    ;;
-              esac
-            fi
-
-            : ${JTREG_SUBCATEGORIES:=.}
-
-            tar xf incoming/jdk9u.tar.gz
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz
-
-            # All the output directories and general frobbing
-            # output is to match the existing layout as expected
-            # by the cron-based publish and reporting scripts.
-            # XXX There's probably a better way.
-
-            YEAR=XXX__YEAR__XXX
-            DAY_OF_YEAR=YYY__DAY_OF_YEAR__YYY
-
-            basedir=cron_output
-            mkdir -p ${basedir}/{src,builds,reports}
-
-            src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
-
-            mkdir -p out ${src_dir} ${work_dir} ${report_dir}
-
-            mv jdk9u/* ${src_dir}
-
-            blacklist=${WORKSPACE}/excludes.txt
-            jdk_problem_list=${src_dir}/${JTREG_CATEGORY}/test/ProblemList.txt
-
-            if [ -e $jdk_problem_list ]; then
-                cat $jdk_problem_list > ${blacklist}
-            fi
-
-            aarch64_exclude_file=${src_dir}/test/exclude_aarch64.txt
-
-            if [ -e ${aarch64_exclude_file} ]; then
-                cat ${aarch64_exclude_file} >> ${blacklist}
-            fi
-
-            touch ${blacklist}
-
-            echo "Blacklist"
-            echo "========="
-            cat ${blacklist}
-            echo "---------"
-
-            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=$JAVA_HOME/bin:${PATH}
-
-            # For hotspot and jdk we pass a -nativepath: option to jtreg.
-            # This enables the tests needing native libraries to run.
-            NATIVEPATH=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
-
-            if [ $JTREG_CATEGORY = "langtools" ]; then
-                # The nativepath option we pass must be a valid directory, or
-                # not at all.`
-                NATIVE_OPT=
-            else
-                # Test executables are expected to be in same directory as libraries
-                mv $NATIVEPATH/../bin/* $NATIVEPATH
-                NATIVE_OPT=-nativepath:$NATIVEPATH
-            fi
-
-            PATH=${WORKSPACE}/jtreg/bin:${PATH}
-            which java
-            java -version
-
-            # Ignore error in jtreg final result.
-            set +e
-
-            if [ $JVM_VARIANT = "server" ]; then
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir}/${JTREG_CATEGORY}/test \
-                  -vmoption:-XX:-TieredCompilation \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  $NATIVE_OPT \
-                  -timeout:8 \
-                  -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
-            else
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir}/${JTREG_CATEGORY}/test \
-                  -vmoption:-XX:+TieredCompilation \
-                  -vmoption:-XX:TieredStopAtLevel=1 \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  $NATIVE_OPT \
-                  -timeout:8 \
-                  -a -agentvm -ignore:quiet -v1 ${JTREG_SUBCATEGORIES} | cat -n
-            fi
-
-            # Kill leftover jstatd processes.
-            killall -9 jstatd
-            set -e
-
-            # We don't care for the .class files.
-            find ${work_dir} -name \*.class -exec rm {} \;
-
-            # Match the exact output of the cron-based scripts.
-            dest=$PERSIST/openjdk-jtreg-nightly-tests
-            sed_expr=$(echo s!${WORKSPACE}/${basedir}!$dest!g)
-            find ${work_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
-            find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
-
-            mkdir -p out
-            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports
-    publishers:
-        - archive:
-            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
diff --git a/jdk9-persist-all-results.yaml b/jdk9-persist-all-results.yaml
deleted file mode 100644
index 9b18dba465..0000000000
--- a/jdk9-persist-all-results.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: jdk9-persist-all-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * This job persist all results.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 9u - Persist all results'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: jdk9-jtreg-test-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-specjbb2015-benchmark-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-terasort-benchmark-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-jcstress-test-persist-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-update-src-tree-persist
-              block: true
-              current-parameters: true
diff --git a/jdk9-publish-all-results.yaml b/jdk9-publish-all-results.yaml
deleted file mode 100644
index ed8a740e14..0000000000
--- a/jdk9-publish-all-results.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- job:
-    name: jdk9-publish-all-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Convenience job to invoke all the scripts that sync the results to openjdk.linaro.org.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 9u - Invoke all the scripts to sync results to openjdk.linaro.org'
-    parameters:
-        - string:
-            name: PUBLISH_DEST
-            default: '/home/openjdk-testing/jdk9u'
-        - string:
-            name: PUBLISH_HOST
-            default: 'stuart.monteith@people.linaro.org'
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: jdk9-jtreg-test-publish-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-specjbb2015-benchmark-publish-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-terasort-benchmark-publish-results
-              block: true
-              current-parameters: true
-        - trigger-builds:
-            - project: jdk9-jcstress-test-publish-results
-              block: true
-              current-parameters: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-publish-and-report.yaml b/jdk9-publish-and-report.yaml
deleted file mode 100644
index 20925906bb..0000000000
--- a/jdk9-publish-and-report.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- job:
-    name: jdk9-publish-and-report
-    project-type: multijob
-    defaults: global
-    description: |
-        * This job publishes results and send e-mail reports.
-    logrotate:
-        numToKeep: 10
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: DAYS
-            default: '15'
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: master
-    display-name: 'OpenJDK 9u - Publish results and send reports'
-    wrappers:
-        - timestamps
-# Replaced by parameters
-#        - inject:
-#            properties-content: 'DAYS=15'
-    builders:
-        - multijob:
-            name: 'Persist results'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-persist-all-results
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'Publish results to openjdk.linaro.org'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-publish-all-results
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'Generate e-mail report'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-generate-email-report
-                current-parameters: true
-                kill-phase-on: FAILURE
-        - multijob:
-            name: 'E-mail results'
-            condition: SUCCESSFUL
-            projects:
-              - name: jdk9-email-results
-                current-parameters: true
-                kill-phase-on: FAILURE
diff --git a/jdk9-specjbb2013-benchmark-persist-results.yaml b/jdk9-specjbb2013-benchmark-persist-results.yaml
deleted file mode 100644
index d44697ca2d..0000000000
--- a/jdk9-specjbb2013-benchmark-persist-results.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-- job:
-    name: jdk9-specjbb2013-benchmark-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes the results to /work/openjdk-testing/SPECjbb2013-1.00-nightly-runs.<br>
-        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
-          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Write SPECjbb2013 results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-specjbb2013-benchmark
-            filter: 'out/specjbb*.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            tree -f .
-
-            PERSIST=$HOME/srv/openjdk9u
-            TOP_DIR=$PERSIST
-            mkdir -p $TOP_DIR
-
-            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
-            fi
-
-            source $SCRIPT_DIR/common.sh
-
-            # Ensure nightly results dir exists.
-            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
-
-            echo "Previous Results"
-            cat ${RESULTS_CSV}
-            set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            [ -e $result_tarball ] || exit 1
-            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
-            cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
-            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
-            echo "Updating ${RESULTS_CSV}"
-            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk9-specjbb2013-benchmark-publish-results.yaml b/jdk9-specjbb2013-benchmark-publish-results.yaml
deleted file mode 100644
index 8d03a66b31..0000000000
--- a/jdk9-specjbb2013-benchmark-publish-results.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job:
-    name: jdk9-specjbb2013-benchmark-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Reports are published to http://openjdk.linaro.org/SPECjbb2013-1.00-results/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '3275'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '854'
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Publish SPECjbb2013 benchmark results'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-                users:
-                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-            PERSIST=$HOME/srv/openjdk9u
-            export TOP_DIR=$PERSIST
-
-            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-specjbb2013-benchmark.yaml b/jdk9-specjbb2013-benchmark.yaml
deleted file mode 100644
index ce4e8aa7a3..0000000000
--- a/jdk9-specjbb2013-benchmark.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-- job:
-    name: jdk9-specjbb2013-benchmark
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the specjbb benchmark in composite mode (i.e., single VM, single node).
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Run SPECjbb2013 benchmark'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-# SRDM: Disable client build while waiting for LEG-347 to be fixed.
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk9-build-image
-#            filter: 'out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: archive-specjbb2013-product-tarball
-            filter: 'out/SPECjbb2013-1.00.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            ## Extract jdk
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${JVM_VARIANT}/label/${NODE_NAME}/out/jdk9u-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9u-${JVM_VARIANT}-${BUILD_TYPE}
-            export PATH=$JAVA_HOME/bin:$PATH
-            which java
-            java -version
-
-            ## Extract specjbb2013 product
-            #(cd incoming; wget -nv http://openjdk-apm1/openjdk8-build-artefacts/SPECjbb2013-1.00.tar.gz)
-            tar xf incoming/SPECjbb2013-1.00.tar.gz
-
-            ## Run test
-
-            SPECJBB_PRODUCT_HOME=SPECjbb2013-1.00
-
-            # This commented-out invocation is a quick test that
-            # takes about 10 minutes to complete - which can be
-            # useful when debugging.
-
-            #(cd $SPECJBB_PRODUCT_HOME; \
-            # time java \
-            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
-            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
-            #   -Dspecjbb.controller.type=PRESET \
-            #   -Dspecjbb.controller.preset.ir=4000 \
-            #   -Dspecjbb.controller.preset.duration=100 \
-            #   -jar specjbb2013.jar -m composite)
-
-            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2013.jar -m composite)
-
-            mkdir -p out
-
-            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2013\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/")
-
-            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
-
-            java -jar $SPECJBB_PRODUCT_HOME/specjbb2013.jar \
-              -m REPORTER \
-              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
-              -p $SPECJBB_PRODUCT_HOME/config/specjbb2013.props \
-              -s $SPECJBB_PRODUCT_HOME/specjbb2013-C-*.data.gz \
-              -l 1
-
-            tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result
-
-            rm -rf html
-            mkdir html
-            cp -a result/**/report-00001/* html
-            cp html/*0001.html html/index.html
-    publishers:
-        - archive:
-            artifacts: 'out/*.gz'
-        - html-publisher:
-            name: 'HTML Report'
-            dir: 'html'
-            files: 'index.html'
-            keep-all: true
diff --git a/jdk9-specjbb2015-benchmark-persist-results.yaml b/jdk9-specjbb2015-benchmark-persist-results.yaml
deleted file mode 100644
index 3b1fd4a03c..0000000000
--- a/jdk9-specjbb2015-benchmark-persist-results.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-- job:
-    name: jdk9-specjbb2015-benchmark-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes the results to $HOME/srv/openjdk9u/SPECjbb2015-nightly-runs.<br>
-        * This job has the client axis <b>disabled</b> until there is enough build/test time available.<br>
-          * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Write SPECjbb2015 results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-specjbb2015-benchmark
-            filter: 'out/specjbb*.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            tree -f .
-
-            PERSIST=$HOME/srv/openjdk9u
-            TOP_DIR=$PERSIST
-            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-            mkdir -p $TOP_DIR
-
-            SCRIPT_DIR=$PERSIST/specjbb-test-scripts
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/specjbb-test-scripts.git $SCRIPT_DIR
-            fi
-
-            source $SCRIPT_DIR/common.sh
-
-            # Ensure nightly results dir exists.
-            mkdir -p $SPECJBB_EXPANDED_RESULTS_DIR
-
-            echo "Previous Results"
-            cat ${RESULTS_CSV}
-            set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
-            [ -e $result_tarball ] || exit 1
-            tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
-            cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
-            pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
-            echo "Updating ${RESULTS_CSV}"
-            $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdk9-specjbb2015-benchmark-publish-results.yaml b/jdk9-specjbb2015-benchmark-publish-results.yaml
deleted file mode 100644
index b81eee986e..0000000000
--- a/jdk9-specjbb2015-benchmark-publish-results.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: jdk9-specjbb2015-benchmark-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Reports are published to http://openjdk.linaro.org/jdk9u/SPECjbb2015-results/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '4090'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '1015'
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Publish SPECjbb2015 benchmark results'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-                users:
-                    - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-            PERSIST=$HOME/srv/openjdk9u
-            export TOP_DIR=$PERSIST
-            export SPECJBB_PRODUCT_HOME=$PERSIST/SPECjbb2015
-
-            $PERSIST/specjbb-test-scripts/specjbb-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-specjbb2015-benchmark.yaml b/jdk9-specjbb2015-benchmark.yaml
deleted file mode 100644
index c5442ed3c4..0000000000
--- a/jdk9-specjbb2015-benchmark.yaml
+++ /dev/null
@@ -1,127 +0,0 @@
-- job:
-    name: jdk9-specjbb2015-benchmark
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Run SPECjbb2015 benchmark'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk9-build-image
-#            filter: 'out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: archive-specjbb2015-product-tarball
-            filter: 'out/SPECjbb2015.tgz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-            #
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            ## Extract jdk
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=$JAVA_HOME/bin:$PATH
-            which java
-            java -version
-
-            ## Extract specjbb2015 product
-            tar xf incoming/SPECjbb2015.tgz
-
-            ## Run test
-
-            SPECJBB_PRODUCT_HOME=SPECjbb2015
-
-            # This commented-out invocation is a quick test that
-            # takes about 10 minutes to complete - which can be
-            # useful when debugging.
-
-            #(cd $SPECJBB_PRODUCT_HOME; \
-            # time java \
-            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
-            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
-            #   -Dspecjbb.controller.type=PRESET \
-            #   -Dspecjbb.controller.preset.ir=4000 \
-            #   -Dspecjbb.controller.preset.duration=100 \
-            #   -jar specjbb2015.jar -m composite)
-
-            if [ $JVM_VARIANT = "server" ]; then
-                (cd $SPECJBB_PRODUCT_HOME; java --add-modules java.se.ee -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
-            else
-                (cd $SPECJBB_PRODUCT_HOME; java --add-modules java.se.ee  -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -m composite)
-            fi
-
-            mkdir -p out
-
-            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/")
-
-            cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
-
-            java -jar $SPECJBB_PRODUCT_HOME/specjbb2015.jar \
-              -m REPORTER \
-              -raw $SPECJBB_PRODUCT_HOME/config/template-M.raw \
-              -p $SPECJBB_PRODUCT_HOME/config/specjbb2015.props \
-              -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
-              -l 1
-
-            tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result
-
-            rm -rf html
-            mkdir html
-            cp -a result/**/report-00001/* html
-            cp html/*0001.html html/index.html
-    publishers:
-        - archive:
-            artifacts: 'out/*.gz'
-        - html-publisher:
-            name: 'HTML Report'
-            dir: 'html'
-            files: 'index.html'
-            keep-all: true
diff --git a/jdk9-terasort-benchmark-persist-results.yaml b/jdk9-terasort-benchmark-persist-results.yaml
deleted file mode 100644
index eafcc30dc2..0000000000
--- a/jdk9-terasort-benchmark-persist-results.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- job:
-    name: jdk9-terasort-benchmark-persist-results
-    project-type: matrix
-    defaults: global
-    description: |
-        * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Write terasort results'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-        - copyartifact:
-            project: jdk9-terasort-benchmark
-            filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            PERSIST=$HOME/srv/openjdk9u
-            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
-            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv
-            prev_results=$BENCHMARK_RESULTS_DIR/results.csv
-
-            # Ensure persistent directory exists.
-            mkdir -p $BENCHMARK_RESULTS_DIR
-
-            # Tolerate missing results.csv file.
-            if [ ! -f $prev_results ]; then
-                touch $prev_results
-            fi
-
-            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
-            fi
-
-            echo "Previous Results"
-            echo "----------------"
-            cat ${prev_results}
-            echo
-
-            cat ${new_results} >> ${prev_results}
-
-            $SCRIPT_DIR/update-results-db
diff --git a/jdk9-terasort-benchmark-publish-results.yaml b/jdk9-terasort-benchmark-publish-results.yaml
deleted file mode 100644
index 3a3144019c..0000000000
--- a/jdk9-terasort-benchmark-publish-results.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-- job:
-    name: jdk9-terasort-benchmark-publish-results
-    project-type: freestyle
-    defaults: global
-    description: |
-        * Results are published to http://openjdk.linaro.org/hadoop-terasort-benchmark-results/
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: ZERO_BASELINE
-            default: '14115'
-        - string:
-            name: SERVER_MAX_JOPS_BASELINE
-            default: '3275'
-        - string:
-            name: SERVER_CRITICAL_JOPS_BASELINE
-            default: '854'
-        - string:
-            name: PUBLISH_DEST
-            default: ''
-        - string:
-            name: PUBLISH_HOST
-            default: ''
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Publish terasort benchmark results'
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - ssh-agent-credentials:
-            # openjdk-testing user id
-            users:
-                - '744cffb4-9ce1-4856-b103-9fdda06dad36'
-        - timestamps
-# Replaced by parameters
-#        - inject:
-#            properties-file: '${HOME}/performance-baseline.properties'
-    builders:
-        - shell: |
-            #!/bin/bash
-            PERSIST=$HOME/srv/openjdk9u
-            export JDK_VERSION=9u
-
-            export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
-            SCRIPT_DIR=$PERSIST/hadoop-test-scripts
-
-            if [ -d $SCRIPT_DIR ]; then
-                (cd $SCRIPT_DIR; git pull)
-            else
-                git clone https://git.linaro.org/leg/openjdk/hadoop-test-scripts.git $SCRIPT_DIR
-            fi
-
-            $SCRIPT_DIR/benchmark-terasort-publish $PUBLISH_DEST
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org stuart.monteith@linaro.org'
diff --git a/jdk9-terasort-benchmark.yaml b/jdk9-terasort-benchmark.yaml
deleted file mode 100644
index fa0a46037b..0000000000
--- a/jdk9-terasort-benchmark.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-- job:
-    name: jdk9-terasort-benchmark
-    project-type: matrix
-    defaults: global
-    description: |
-        * Runs the terasort benchmark.
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            openjdk-members:
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Run terasort benchmark'
-    axes:
-        - axis:
-            type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
-            name: BUILD_TYPE
-            values:
-                - release
-        - axis:
-            type: slave
-            name: label
-            values:
-                - aarch64-06
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-        - matrix-tie-parent:
-            node: aarch64-06
-    builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdk9-build-image
-#            filter: 'out/jdk9-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: openjdk8-hadoop-LCA14
-            filter: 'out/openjdk8-hadoop-LCA14.tar.gz'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            NGIGABYTES=1
-
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            ## Extract jdk
-            rm -rf jdk9u*
-            tar xf ~/workspace/jdk9-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-
-            export JAVA_HOME=${WORKSPACE}/jdk9u-${REAL_VARIANT}-${BUILD_TYPE}
-            export PATH=${JAVA_HOME}/bin:$PATH
-
-            ## Extract Hadoop pre-builts
-            rm -rf openjdk8-hadooop-LCA14
-            tar xf incoming/openjdk8-hadoop-LCA14.tar.gz
-
-            ## Benchmark
-            # FIXME
-            #(cd incoming; wget --progress=dot -e dotbytes=10M http://openjdk-apm1/openjdk8-build-artefacts/${NGIGABYTES}GB.tar.gz; tar xf ${NGIGABYTES}GB.tar.gz)
-            (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
-
-            TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
-            HADOOP_DIR=${WORKSPACE}/openjdk8-hadoop-LCA14
-
-            rm -rf out
-            mkdir out
-
-            sed -i '/^export JAVA_HOME=/d' ${HADOOP_DIR}/conf/hadoop-env.sh
-            echo "export JAVA_HOME=$JAVA_HOME" >> ${HADOOP_DIR}/conf/hadoop-env.sh
-            sed -i 's|/work/${user.name}/hadoop-tmp|${user.home}/hadoop/tmp|' ${HADOOP_DIR}/conf/core-site.xml
-
-            source ${HADOOP_DIR}/env.sh
-
-            which hadoop
-            which java
-            which hdfs
-            java -version
-
-            stop-dfs.sh
-            stop-yarn.sh
-
-            rm -rf ${HOME}/hadoop
-            mkdir -p ${HOME}/hadoop/tmp
-            hdfs namenode -format -force
-            start-dfs.sh
-            start-yarn.sh
-
-            # Need time for the datanodes to materialise.
-            sleep 30
-            jps
-
-            hadoop fs -mkdir -p /user/$USER
-            hadoop fs -copyFromLocal $TERAGEN_BASELINE_DIR/${NGIGABYTES}GB /user/$USER
-
-            trap "stop-dfs.sh; stop-yarn.sh" EXIT
-
-            # Use only C1 compiler for client runs.
-            if [ $JVM_VARIANT = "client" ]; then
-                VARIANT_OPT=-XX:TieredStopAtLevel=1
-            else
-                VARIANT_OPT=-Dharmless.property
-            fi
-
-            elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
-            HADOOP_OPTS=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
-
-            hadoop fs -rm -R ${NGIGABYTES}GB-sorted
-            sed -i 's/\..*//' $elapsed_time_file
-            elapsed_time=$(cat $elapsed_time_file)
-            date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
-            echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv
-            rm -rf incoming/${NGIGABYTES}*
-    publishers:
-        - archive:
-            artifacts: 'out/terasort-results-*.csv'
diff --git a/jdk9-update-src-tree-persist.yaml b/jdk9-update-src-tree-persist.yaml
deleted file mode 100644
index 066bb6e5ca..0000000000
--- a/jdk9-update-src-tree-persist.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- job:
-    name: jdk9-update-src-tree-persist
-    project-type: freestyle
-    defaults: global
-    description: |
-        This jobs writes the current jdk9 src tree to /work/openjdk-testing/jdk9/openjdk-jtreg-nightly-tests/...<br>
-        It is used to report failure/errors against the jtreg results.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: YEAR
-            default: 'default'
-        - string:
-            name: DAY_OF_YEAR
-            default: 'default'
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Write jdk9 source tree'
-    wrappers:
-        - workspace-cleanup:
-            dirmatch: false
-        - timestamps
-    builders:
-        - copyartifact:
-            project: jdk9-update-src-tree
-            filter: 'out/*'
-            target: incoming
-            flatten: true
-        - shell: |
-            #!/bin/bash
-
-            set -exu
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-            PERSIST=$HOME/srv/openjdk9u
-
-            TOP_DIR=$PERSIST/openjdk-jtreg-nightly-tests
-            src_dir=$TOP_DIR/src/$YEAR/$DAY_OF_YEAR
-            mkdir -p $src_dir
-            echo "Extracting tarball to $src_dir"
-            tar -C $src_dir --strip-components=1 -xf $WORKSPACE/incoming/jdk9u.tar.gz
-
-            # Copy bill-of-materials to persistent area for email report.
-            cp incoming/BOM $TOP_DIR
diff --git a/jdk9-update-src-tree.yaml b/jdk9-update-src-tree.yaml
deleted file mode 100644
index 47b1dea0cb..0000000000
--- a/jdk9-update-src-tree.yaml
+++ /dev/null
@@ -1,152 +0,0 @@
-- scm:
-    name: jdk9u
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u
-            clean: true
-            subdir: jdk9u
-- scm:
-    name: corba
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/corba
-            clean: true
-            subdir: jdk9u/corba
-- scm:
-    name: hotspot
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/hotspot
-            clean: true
-            subdir: jdk9u/hotspot
-- scm:
-    name: jaxp
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxp
-            clean: true
-            subdir: jdk9u/jaxp
-- scm:
-    name: jaxws
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/jaxws
-            clean: true
-            subdir: jdk9u/jaxws
-- scm:
-    name: jdk
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/jdk
-            clean: true
-            subdir: jdk9u/jdk
-- scm:
-    name: langtools
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/langtools
-            clean: true
-            subdir: jdk9u/langtools
-- scm:
-    name: nashorn
-    scm:
-        - hg:
-            url: http://hg.openjdk.java.net/jdk-updates/jdk9u/nashorn
-            clean: true
-            subdir: jdk9u/nashorn
-- job:
-    name: jdk9-update-src-tree
-    project-type: freestyle
-    defaults: global
-    description: |
-        This job polls upstream Mercurial servers for changes and,<br>
-        if there are any, triggers "jdk9-build-and-test".<br>
-        Note: this job archives the src which is later required by the jtreg<br>
-        report and publish job. The build-date.sh artefact contains shell<br>
-        variables for the day and day-of-year the source was archived.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            openjdk-members:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-            artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
-    display-name: 'OpenJDK 9u - Update jdk9 source tree'
-    scm:
-        - jdk9u
-        - corba
-        - hotspot
-        - jaxp
-        - jaxws
-        - jdk
-        - langtools
-        - nashorn
-    triggers:
-        - pollscm: 'H 12 */2 * *'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -eu
-
-            rm -rf out
-            mkdir out
-
-            pushd jdk9u
-            #find . -name BOM -exec rm {} \;
-            #commit_id=$(hg identify | awk '{print $1}')
-            #echo "jdk9-${commit_id}" | tee -a BOM
-
-            #for i in corba jaxp jaxws langtools jdk hotspot nashorn; do
-            #  pushd $i
-            #  commit_id=$(hg identify | awk '{print $1}')
-            #  dir=$(basename $PWD)
-            #  echo "${dir}-${commit_id}" | tee -a ../BOM
-            #  popd
-            #done
-
-            ## Pull out subdirectory HG versions
-            SUBREPOS=". corba jaxp jaxws langtools jdk hotspot nashorn"
-
-            echo BOM for $(hg paths default) > BOM
-            echo -e Subdir\\tHash\\t\\tTag\\tTag hash >> BOM
-            for x in $SUBREPOS; do
-                echo -e $x\\t$(cd $x; hg head --template '{node|short}\t' tip; hg tags --template="{tag}\t{node|short}\n" | grep -ve '^tip' | head -n1) >>BOM
-            done
-
-            cp BOM $WORKSPACE/out
-
-            popd
-
-            : ${YEAR:=$(date +%Y)}
-            : ${DAY_OF_YEAR:=$(date +%j)}
-
-            : ${YEAR_YESTERDAY:=$YEAR}
-            : ${DAY_OF_YEAR_YESTERDAY:=$((10#$DAY_OF_YEAR - 1))}
-
-            echo "YEAR=${YEAR}" >dates.prop
-            echo "DAY_OF_YEAR=${DAY_OF_YEAR}" >>dates.prop
-
-            echo "export YEAR=${YEAR}" > out/build-date.sh
-            echo "export DAY_OF_YEAR=${DAY_OF_YEAR}" >> out/build-date.sh
-
-            tar --exclude=.hg -acf out/jdk9u.tar.gz jdk9u
-    publishers:
-        - archive:
-            artifacts: 'out/jdk9u.tar.gz, out/build-date.sh, out/BOM'
-        - fingerprint:
-            files: 'out/*'
-            record-artifacts: true
-        - trigger-parameterized-builds:
-            - project: jdk9-build-and-test
-              condition: SUCCESS
-              property-file: dates.prop
diff --git a/jdkX-build-and-test.yaml b/jdkX-build-and-test.yaml
index 5c8fae0d63..ffe8017506 100644
--- a/jdkX-build-and-test.yaml
+++ b/jdkX-build-and-test.yaml
@@ -26,7 +26,7 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK JDK - Build jdk images and run tests/benchmarks'
     wrappers:
@@ -35,12 +35,27 @@
         - timestamps
     builders:
         - multijob:
+            name: 'OpenJDK Clean job'
+            condition: SUCCESSFUL
+            projects:
+                - name: jdk-clean-job
+                  current-parameters: true
+                  kill-phase-on: NEVER
+        - multijob:
             name: 'Build jdk images'
             condition: SUCCESSFUL
             projects:
               - name: jdkX-build-image
                 current-parameters: true
                 kill-phase-on: FAILURE
+        # Get depenencies for subsequent jobs.
+        - multijob:
+            name: 'Get Deps'
+            condition: ALWAYS
+            projects:
+              - name: jdkX-get-deps
+                current-parameters: true
+                kill-phase-on: FAILURE
 # FIXME - set SPECjbb2015 benchmark continuation condition from SUCCESSFUL to ALWAYS
 # Exception in thread "main" java.util.ServiceConfigurationError:
 # org.spec.jbb.core.comm.connectivity.ConnectivityProvider:
@@ -52,7 +67,6 @@
             projects:
               - name: jdkX-specjbb2015-benchmark
                 current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
                 kill-phase-on: FAILURE
         - multijob:
             name: '1GB Terasort benchmark'
@@ -75,7 +89,6 @@
             projects:
               - name: jdkX-jcstress-test
                 current-parameters: true
-                restrict-matrix-project: 'JVM_VARIANT == "server"'
                 kill-phase-on: FAILURE
         - multijob:
             name: 'Publish results to openjdk.linaro.org'
diff --git a/jdkX-build-image.yaml b/jdkX-build-image.yaml
index cb71826613..0226604d84 100644
--- a/jdkX-build-image.yaml
+++ b/jdkX-build-image.yaml
@@ -19,22 +19,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Configure and build OpenJDK JDK'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - zero
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -42,7 +32,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -50,39 +40,23 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdkX-update-src-tree
             filter: 'out/jdkX.tar.gz'
             target: incoming
             flatten: true
-#        - copyartifact:
-#            project: archive-primordial-jdkX
-#            filter: 'out/primordial-jdkX.tar.gz'
-#            target: incoming
-#            flatten: true
         - shell: |
             #!/bin/bash
 
             set -exu
 
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-
             ccache_build_opts=--disable-ccache
 
-            rm -rf jdk* primordial-jdk* build*
-
-            wget --progress=dot -e dotbytes=2M ${JDK_URL}
-            tar -Jxf jdk*.tar.xz
+            rm -rf jdk* primordial-jdk* build* out
 
-            cd jdk*/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
+            cd $HOME/srv/jdk-cache/jdk14
             export JAVA_HOME=${PWD}
 
             export PATH=${JAVA_HOME}/bin:${PATH}
@@ -94,11 +68,8 @@
 
             shopt -s nullglob
 
-            # Extract boot jdk
-            # Not used. tar xf incoming/primordial-jdkX.tar.gz
-
-            # Configure and build
-            mkdir -p build-stage1 build-stage2
+            # Configure and build.
+            mkdir -p build-stage1 build-stage2 out
 
             two_stage_build=0
 
@@ -107,27 +78,31 @@
 
             if [ $two_stage_build = 1 ]; then
               pushd build-stage1
-              sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts}
+              sh ../jdkX/configure } --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts}
               make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
               popd
 
               pushd build-stage2
-              sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
+              sh ../jdkX/configure  --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk ${ccache_build_opts}
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
               popd
             else
               pushd build-stage2
-              sh ../jdkX/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} ${ccache_build_opts}
-              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native
+              sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts}
+              make images build-test-hotspot-jtreg-native build-test-jdk-jtreg-native test-image-hotspot-gtest
               popd
             fi
 
             # Archive the result
-            rm -rf out
-            mkdir out
-            artifact_name=jdkX-${JVM_VARIANT}-${BUILD_TYPE}
+            artifact_name=jdkX-${BUILD_TYPE}
             tar -C build-stage2/images/jdk --exclude=\*.diz --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
 
+            # Copy gtest materials to the correct place.
+            ( cd build-stage2
+              mkdir support/test/hotspot/jtreg/native/lib/server
+              cp -r hotspot/variant-server/libjvm/gtest/gtestLauncher hotspot/variant-server/libjvm/gtest/libjvm.so support/test/hotspot/jtreg/native/lib/server
+            )
+
             # Archive test support files.
             tar -C build-stage2/ --exclude=hotspot/jtreg/native/support/\* --transform="s!^support/!${artifact_name}-support/support/!" -acf out/${artifact_name}-support.tar.gz support/test
     publishers:
diff --git a/jdkX-build-release.yaml b/jdkX-build-release.yaml
index 383e997efc..3b050489cc 100644
--- a/jdkX-build-release.yaml
+++ b/jdkX-build-release.yaml
@@ -14,25 +14,18 @@
             openjdk-members:
                 - job-build
                 - job-cancel
+                - job-workspace
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
-    disabled: false
-    node: aarch64-06
+
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Configure and build OpenJDK JDK Release'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -40,7 +33,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -48,55 +41,35 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdkX-update-src-tree
             filter: 'out/jdkX.tar.gz'
             target: incoming
             flatten: true
-#        - copyartifact:
-#            project: archive-primordial-jdkX
-#            filter: 'out/primordial-jdkX.tar.gz'
-#            target: incoming
-#            flatten: true
         - shell: |
             #!/bin/bash
 
             set -exu
 
-            #export CCACHE_DIR=~/.ccache-${JVM_VARIANT}-${BUILD_TYPE}
-            #ccache -M 1G
-            #ccache -s
-            export JVM_VARIANT=server
-
             # Generate files names dependent on year/month.
             RELEASE=$(date +%y%m)
-            JDKDIR=jdkX-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
+            JDKDIR=jdkX-${BUILD_TYPE}-${RELEASE}
             JDK_SRCDIR=jdkX-src-${RELEASE}
 
             ccache_build_opts=--disable-ccache
 
-            rm -rf jdk* primordial-jdk* build*
+            rm -rf jdk* primordial-jdk* build* out
+            mkdir -p build-stage1 build-stage2 out
 
-            # Download, setup JDK9 for building.
-            wget --progress=dot -e dotbytes=2M ${JDK_URL}
-            tar -Jxf jdk*.tar.xz
-
-            cd jdk*/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cd ${WORKSPACE}/jdk*
+            cd $HOME/srv/jdk-cache/jdk12
             export JAVA_HOME=${PWD}
 
             export PATH=${JAVA_HOME}/bin:${PATH}
 
             cd ${WORKSPACE}
 
-            # Setup archive directory
-            mkdir out
-
             # Extract sources from upstream job
             tar xaf incoming/jdkX.tar.gz
 
@@ -107,9 +80,7 @@
             mv $JDK_SRCDIR $JDKDIR
             shopt -s nullglob
 
-            # Configure and build
-            mkdir -p build-stage1 build-stage2
-
+            # Configure and build.
             two_stage_build=0
 
             which java
@@ -117,35 +88,35 @@
 
             if [ $two_stage_build = 1 ]; then
               pushd build-stage1
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts}
+              sh ../$JDKDIR/configure --with-debug-level=${BUILD_TYPE} --with-boot-jdk=${WORKSPACE}/primordial-jdkX ${ccache_build_opts}
               make images
               popd
 
               pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
                                         --with-boot-jdk=${WORKSPACE}/build-stage1/images/jdk \
                                         ${ccache_build_opts} \
                                         --with-version-opt="Linaro-$RELEASE" \
-                                        --with-version-pre="release"
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
               make images
               popd
             else
               pushd build-stage2
-              sh ../$JDKDIR/configure --with-jvm-variants=${JVM_VARIANT} \
-                                        --with-debug-level=${BUILD_TYPE} \
+              sh ../$JDKDIR/configure   --with-debug-level=${BUILD_TYPE} \
                                         ${ccache_build_opts} \
                                         --with-version-opt="Linaro-$RELEASE" \
-                                        --with-version-pre="release"
+                                        --with-version-pre="release" \
+                                        --disable-warnings-as-errors
               make images
               popd
             fi
 
             # Archive the result
-            artifact_name=jdkX-${JVM_VARIANT}-${BUILD_TYPE}-${RELEASE}
+            artifact_name=jdkX-${BUILD_TYPE}-${RELEASE}
 
             # This is different from ordinary builds.
-            tar -C build-stage2/images --exclude=\*.diz --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
+            tar -C build-stage2/images --exclude=\*.debuginfo --transform="s!^jdk!$artifact_name!" -acf out/${artifact_name}.tar.xz jdk
     publishers:
         - archive:
             artifacts: 'out/*.tar.xz'
diff --git a/jdkX-ci-build.yaml b/jdkX-ci-build.yaml
new file mode 100644
index 0000000000..f7fa153369
--- /dev/null
+++ b/jdkX-ci-build.yaml
@@ -0,0 +1,102 @@
+- scm:
+    name: jdkX
+    scm:
+        - hg:
+            url: https://hg.openjdk.java.net/jdk/jdk
+            clean: true
+            subdir: jdkX
+- job:
+    name: jdkX-ci-build
+    project-type: freestyle
+    defaults: global
+    description: |
+        Updates source and builds OpenJDK frequently to ensure builds are successful.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 11
+            artifact-num-to-keep: 5
+    disabled: true
+    node: aarch64-06
+    display-name: 'OpenJDK JDK - CI Build'
+    scm:
+        - jdkX
+    wrappers:
+        - timestamps
+    triggers:
+        - pollscm:
+            cron: 'H * * * *'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ccache_build_opts=--disable-ccache
+            # Include when Jtreg tests make sense to be run.
+            #rm -rf jtreg
+            #tar xJf jtreg-build-4.2.0-SNAPSHOT.tar.xz
+
+            cd $HOME/srv/jdk-cache/jdk14
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            shopt -s nullglob
+
+            # Configure and build
+            rm -rf build
+            mkdir -p build
+
+            which java
+            java -version
+
+            rm -rf out
+            mkdir out
+
+            pushd build
+            sh ../jdkX/configure --with-debug-level=fastdebug \
+                ${ccache_build_opts}
+            # In future we could trun with jtreg tests, if they run in under 1 hour.
+            # --with-jtreg=${WORKSPACE}/jtreg
+            make images |& tee ../out/build.out
+            popd
+
+            # Take bottom 100 lines of build output, shift it right by two characters
+            tail -n 100 out/build.out | sed 's,^,   ,' > build-tail.out
+
+            # Archive the result
+            artifact_name=jdkX-ci-build
+            tar -C build/images/jdk --exclude=\*.debuginfo --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
+    publishers:
+        - archive:
+            artifacts: 'out/*.tar.gz, out/build.out'
+        - email-ext:
+            reply-to: stuart.monteith@linaro.org
+            subject: Linaro OpenJDK AArch64 jdk/jdk build ${BUILD_NUMBER} ${BUILD_STATUS}
+            attach-build-log: false
+            body: |
+                OpenJDK AArch64 jdk/jdk build status is ${BUILD_STATUS}
+                Build details -  ${BUILD_URL}
+
+                Changes -
+                ${CHANGES, showPaths=true, format="  %a: %r %p \n--\"%m\"", pathFormat="\n\t- %p"}
+
+                Build output -
+                ${FILE,path="build-tail.out"}
+
+            fixed: true
+            first-failure: true
+            failure: false
+            success: false
+            recipients: 'stuart.monteith@linaro.org, aarch64-port-dev@openjdk.java.net'
diff --git a/jdkX-email-results.yaml b/jdkX-email-results.yaml
index dee5da6c12..906a743654 100644
--- a/jdkX-email-results.yaml
+++ b/jdkX-email-results.yaml
@@ -17,7 +17,7 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK JDK - Send e-mail report'
 
diff --git a/jdkX-generate-email-report.yaml b/jdkX-generate-email-report.yaml
index c76e10b366..16733696f8 100644
--- a/jdkX-generate-email-report.yaml
+++ b/jdkX-generate-email-report.yaml
@@ -33,8 +33,8 @@
         - string:
             name: SERVER_CRITICAL_JOPS_BASELINE
             default: '1015'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Generate e-mail report'
     wrappers:
         - timestamps
diff --git a/jdkX-get-deps.yaml b/jdkX-get-deps.yaml
new file mode 100644
index 0000000000..b348b4d5b0
--- /dev/null
+++ b/jdkX-get-deps.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: jdkX-get-deps
+    project-type: freestyle
+    defaults: global
+    description: |
+        Download dependencies for builds. This includes build source code, jtreg, jcstress.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK JDK - Get Dependencies'
+    wrappers:
+        - timestamps
+    builders:
+        - copyartifact:
+            project: jcstress-build
+            filter: 'tests-all/target/jcstress.jar'
+            flatten: true
+        - copyartifact:
+            project: jtreg-build
+            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
+            flatten: true
+        - copyartifact:
+            project: jdkX-update-src-tree
+            filter: 'out/jdkX.tar.gz, out/build-date.sh'
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            find $PWD -maxdepth 1
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jdkX-jcstress-test-persist-results.yaml b/jdkX-jcstress-test-persist-results.yaml
index 27260f0b20..94a8898b5a 100644
--- a/jdkX-jcstress-test-persist-results.yaml
+++ b/jdkX-jcstress-test-persist-results.yaml
@@ -8,7 +8,7 @@
           * /work/openjdk-testing/jcstress-results
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -25,18 +25,12 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Write jcstress tests results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -44,17 +38,15 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
         sequential: true
     wrappers:
         - workspace-cleanup:
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdkX-update-src-tree
@@ -63,7 +55,7 @@
             flatten: true
         - copyartifact:
             project: jdkX-jcstress-test
-            filter: 'out/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jcstress-results-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - shell: |
@@ -88,7 +80,7 @@
             fi
 
             mkdir -p ${JCSTRESS_RESULTS_DIR} ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR}
-            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar -C ${JCSTRESS_RUN_DIR}/${YEAR}/${DAY_OF_YEAR} --strip-components=1 -xzf incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jcstress-results-${BUILD_TYPE}.tar.gz
             numeric_date=$(date +'%s' --date=$(date +'%Y-%m-%d'))
             echo "Previous Results"
             cat ${RESULTS_CSV}
diff --git a/jdkX-jcstress-test-publish-results.yaml b/jdkX-jcstress-test-publish-results.yaml
index 40284072d2..0eae34f3df 100644
--- a/jdkX-jcstress-test-publish-results.yaml
+++ b/jdkX-jcstress-test-publish-results.yaml
@@ -23,8 +23,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Publish jcstress report'
     wrappers:
         - timestamps
diff --git a/jdkX-jcstress-test.yaml b/jdkX-jcstress-test.yaml
index d711083d64..a617de643a 100644
--- a/jdkX-jcstress-test.yaml
+++ b/jdkX-jcstress-test.yaml
@@ -8,7 +8,7 @@
         This project currently runs the "server" variant only due to the amount of time both tests would take to complete.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -18,8 +18,8 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Run jcstress tests'
     parameters:
         - string:
@@ -28,12 +28,6 @@
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -41,7 +35,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -49,37 +43,22 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
         - timeout:
             timeout: 900
     builders:
-        - copyartifact:
-            project: jcstress-build
-            filter: 'tests-custom/target/jcstress.jar, tests-all/target/jcstress.jar'
-            target: incoming
-            flatten: false
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdkX-build-image
-#            filter: 'out/jdkX-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
         - shell: |
             #!/bin/bash
 
             set -eu
 
             TEST_TYPE=all
+            DEPS=$HOME/workspace/jdkX-get-deps
 
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
-            JCSTRESS_JAR=${WORKSPACE}/incoming/tests-${TEST_TYPE}/target/jcstress.jar
+            JCSTRESS_JAR=$DEPS/jcstress.jar
             rm -rf jdkX*
-            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:${PATH}
             which java
             java -version
@@ -94,7 +73,7 @@
             rm -rf out
             mkdir out
 
-            out_dirname=jcstress-results-${JVM_VARIANT}-${BUILD_TYPE}
+            out_dirname=jcstress-results-${BUILD_TYPE}
 
             rm -rf ${out_dirname}
             mkdir -p ${out_dirname}
diff --git a/jdkX-jtreg-test-persist-results.yaml b/jdkX-jtreg-test-persist-results.yaml
index 08b08d51fd..f591d26d82 100644
--- a/jdkX-jtreg-test-persist-results.yaml
+++ b/jdkX-jtreg-test-persist-results.yaml
@@ -6,7 +6,7 @@
         * Writes the results to $HOME/srv/openjdkX/openjdk-jtreg-nightly-tests.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -24,18 +24,12 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Write jtreg tests results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -50,7 +44,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -58,16 +52,16 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdkX-jtreg-test
-            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - copyartifact:
             project: jdkX-build-image
-            filter: 'out/jdkX-server-${BUILD_TYPE}.tar.gz'
+            filter: 'out/jdkX-${BUILD_TYPE}.tar.gz'
             target: incoming
             flatten: true
         - shell: |
@@ -80,18 +74,18 @@
             PERSIST=$HOME/srv/openjdkX
             export JDK_VERSION=X
 
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},JVM_VARIANT=${JVM_VARIANT},label=${label}/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JTREG_CATEGORY=${JTREG_CATEGORY},label=${label}/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz
 
-            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=server,label=${label}/jdkX-server-${BUILD_TYPE}.tar.gz
+            image_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/jdkX-${BUILD_TYPE}.tar.gz
 
             : ${YEAR:=$(date +%Y)}
             : ${DAY_OF_YEAR:=$(date +%j)}
 
             basedir=$PERSIST/openjdk-jtreg-nightly-tests
             src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
-            image_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            image_dir=${basedir}/builds/${BUILD_TYPE},label=${label}/${YEAR}/${DAY_OF_YEAR}/images/jdk
 
             rm -rf  ${image_dir}
             mkdir -p ${image_dir}
diff --git a/jdkX-jtreg-test-publish-results.yaml b/jdkX-jtreg-test-publish-results.yaml
index 19db223946..8263b936fc 100644
--- a/jdkX-jtreg-test-publish-results.yaml
+++ b/jdkX-jtreg-test-publish-results.yaml
@@ -29,8 +29,8 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Publish jtreg results'
     wrappers:
         - timestamps
diff --git a/jdkX-jtreg-test.yaml b/jdkX-jtreg-test.yaml
index b3963d9f70..dd3e282363 100644
--- a/jdkX-jtreg-test.yaml
+++ b/jdkX-jtreg-test.yaml
@@ -6,7 +6,7 @@
         * Runs the jtreg tests.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-read
@@ -25,18 +25,12 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Run jtreg tests'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -51,7 +45,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -63,30 +57,8 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
-        - copyartifact:
-            project: jtreg-build
-            filter: 'jtreg-build-4.2.0-SNAPSHOT.tar.xz'
-            target: incoming
-            flatten: true
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdkX-build-image
-#            filter: 'out/jdkX-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: jdkX-update-src-tree
-            filter: 'out/jdkX.tar.gz, out/build-date.sh'
-            target: incoming
-            flatten: true
-        - copyartifact:
-            project: jcstress-build
-            filter: 'tests-all/target/jcstress.jar'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
@@ -94,21 +66,20 @@
 
             set -exu
 
-            source incoming/build-date.sh
+            DEPS=$HOME/workspace/jdkX-get-deps
+
+            source $DEPS/build-date.sh
 
             export JDK_VERSION=X
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-            IMAGE_DIR=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}
+            IMAGE_DIR=${WORKSPACE}/jdkX-${BUILD_TYPE}
             PERSIST=$HOME/srv/openjdkX
 
-            JCSTRESS=$PWD/incoming/jcstress.jar
+            JCSTRESS=$DEPS/jcstress.jar
 
-            tar xf incoming/jdkX.tar.gz
-            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            tar xf incoming/jtreg-build-4.2.0-SNAPSHOT.tar.xz
-            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}-support.tar.gz
+            tar xf $DEPS/jdkX.tar.gz
+            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz
+            tar xf $DEPS/jtreg-build-4.2.0-SNAPSHOT.tar.xz
+            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}-support.tar.gz
 
             # All the output directories and general frobbing
             # output is to match the existing layout as expected
@@ -122,15 +93,22 @@
             mkdir -p ${basedir}/{src,builds,reports}
 
             src_dir=${basedir}/src/${YEAR}/${DAY_OF_YEAR}
-            work_dir=${basedir}/builds/${JVM_VARIANT}-${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
-            report_dir=${basedir}/reports/${JVM_VARIANT}-${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
+            work_dir=${basedir}/builds/${BUILD_TYPE}/${YEAR}/${DAY_OF_YEAR}/JTwork-${JTREG_CATEGORY}
+            report_dir=${basedir}/reports/${BUILD_TYPE}/${JTREG_CATEGORY}/$(uname -m)/${YEAR}/${DAY_OF_YEAR}/JTreport
 
             mkdir -p out ${src_dir} ${work_dir} ${report_dir}
 
             mv jdkX/* ${src_dir}
 
             blacklist=${WORKSPACE}/excludes.txt
-            jdk_problem_list=${src_dir}/${JTREG_CATEGORY}/test/ProblemList.txt
+
+            # Add jtreg directory level for hotspot only.
+            jdk_problem_list=${src_dir}/test/${JTREG_CATEGORY}
+            if [ $JTREG_CATEGORY = "hotspot" ]; then
+                jdk_problem_list=${jdk_problem_list}/jtreg/ProblemList.txt
+            else
+                jdk_problem_list=${jdk_problem_list}/ProblemList.txt
+            fi
 
             if [ -e $jdk_problem_list ]; then
                 cat $jdk_problem_list > ${blacklist}
@@ -149,12 +127,12 @@
             cat ${blacklist}
             echo "---------"
 
-            export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:${PATH}
 
             # For hotspot and jdk we pass a -nativepath: option to jtreg.
             # This enables the tests needing native libraries to run.
-            NATIVEPATH=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
+            NATIVEPATH=${WORKSPACE}/jdkX-${BUILD_TYPE}-support/support/test/${JTREG_CATEGORY}/jtreg/native/lib
 
             if [ $JTREG_CATEGORY = "langtools" ]; then
                 # The nativepath option we pass must be a valid directory, or
@@ -180,35 +158,18 @@
                 TEST_SUBDIR=test/${JTREG_CATEGORY}
             fi
 
-            if [ $JVM_VARIANT = "server" ]; then
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir} \
-                  -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
-                  -vmoption:-XX:-TieredCompilation \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  $NATIVE_OPT \
-                  -timeout:8 \
-                  -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n
-            else
-                java -jar jtreg/lib/jtreg.jar \
-                  -dir:${src_dir} \
-                  -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
-                  -vmoption:-XX:+TieredCompilation \
-                  -vmoption:-XX:TieredStopAtLevel=1 \
-                  -testjdk:${IMAGE_DIR} \
-                  -exclude:${blacklist} \
-                  -conc:auto \
-                  -r:${report_dir} \
-                  -w:${work_dir} \
-                  $NATIVE_OPT \
-                  -timeout:8 \
-                  -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR} | cat -n
-            fi
-
+            java -jar jtreg/lib/jtreg.jar \
+                 -dir:${src_dir} \
+                 -vmoption:-Djdk.test.lib.artifacts.jcstress-tests-all=$JCSTRESS \
+                 -vmoption:-Xmx2G \
+                 -testjdk:${IMAGE_DIR} \
+                 -exclude:${blacklist} \
+                 -conc:20 \
+                 -r:${report_dir} \
+                 -w:${work_dir} \
+                 $NATIVE_OPT \
+                 -timeout:8 \
+                 -a -agentvm -ignore:quiet -v1 ${TEST_SUBDIR}| cat -n
 
             # Kill leftover jstatd processes.
             killall -9 jstatd
@@ -224,7 +185,7 @@
             find ${report_dir} -type f -exec perl -p -i -e "$sed_expr" {} \;
 
             mkdir -p out
-            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz builds reports
+            tar -C ${basedir} --show-transformed-names -acvf out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz builds reports
     publishers:
         - archive:
-            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
+            artifacts: 'out/jtreg-results-${JTREG_CATEGORY}-${BUILD_TYPE}.tar.gz'
diff --git a/jdkX-persist-all-results.yaml b/jdkX-persist-all-results.yaml
index 32003d1408..9742b190a4 100644
--- a/jdkX-persist-all-results.yaml
+++ b/jdkX-persist-all-results.yaml
@@ -23,7 +23,7 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK JDK - Persist all results'
     wrappers:
diff --git a/jdkX-publish-all-results.yaml b/jdkX-publish-all-results.yaml
index 702f21300d..1ff9bdc3a8 100644
--- a/jdkX-publish-all-results.yaml
+++ b/jdkX-publish-all-results.yaml
@@ -16,7 +16,7 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK JDK - Invoke all the scripts to sync results to openjdk.linaro.org'
     parameters:
diff --git a/jdkX-publish-and-report.yaml b/jdkX-publish-and-report.yaml
index a9dfd8ba18..8d28b75a23 100644
--- a/jdkX-publish-and-report.yaml
+++ b/jdkX-publish-and-report.yaml
@@ -24,7 +24,7 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
+    disabled: true
     node: master
     display-name: 'OpenJDK JDK - Publish results and send reports'
     wrappers:
diff --git a/jdkX-specjbb2015-benchmark-persist-results.yaml b/jdkX-specjbb2015-benchmark-persist-results.yaml
index 5a4121ffea..74f6fe18c8 100644
--- a/jdkX-specjbb2015-benchmark-persist-results.yaml
+++ b/jdkX-specjbb2015-benchmark-persist-results.yaml
@@ -8,7 +8,7 @@
           * If the client axis is enabled the heap size for the VM will need to be adjusted using -Xmxm
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-build
@@ -17,18 +17,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Write SPECjbb2015 results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-#                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -36,17 +30,15 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
-#        combination-filter: |
-#            JVM_VARIANT=="server"
         sequential: true
     wrappers:
         - workspace-cleanup:
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdkX-specjbb2015-benchmark
@@ -78,10 +70,10 @@
             echo "Previous Results"
             cat ${RESULTS_CSV}
             set -eux
-            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz
+            result_tarball=${WORKSPACE}/incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/specjbb-result-${BUILD_TYPE}.tar.gz
             [ -e $result_tarball ] || exit 1
             tar -C ${SPECJBB_EXPANDED_RESULTS_DIR} -xf $result_tarball
-            cp incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
+            cp incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.data.gz ${SPECJBB_EXPANDED_RESULTS_DIR}
             pushd ${SPECJBB_EXPANDED_RESULTS_DIR}
             echo "Updating ${RESULTS_CSV}"
             $SCRIPT_DIR/update-results-csv -- --verbose --output=${RESULTS_CSV}
diff --git a/jdkX-specjbb2015-benchmark-publish-results.yaml b/jdkX-specjbb2015-benchmark-publish-results.yaml
index 35dd9d6e79..567f3cfdb2 100644
--- a/jdkX-specjbb2015-benchmark-publish-results.yaml
+++ b/jdkX-specjbb2015-benchmark-publish-results.yaml
@@ -32,8 +32,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Publish SPECjbb2015 benchmark results'
     wrappers:
         - timestamps
diff --git a/jdkX-specjbb2015-benchmark.yaml b/jdkX-specjbb2015-benchmark.yaml
index aaf7491084..12a37ffb05 100644
--- a/jdkX-specjbb2015-benchmark.yaml
+++ b/jdkX-specjbb2015-benchmark.yaml
@@ -6,7 +6,7 @@
         * Runs the specjbb2015 benchmark in composite mode (i.e., single VM, single node).
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-build
@@ -15,18 +15,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Run SPECjbb2015 benchmark'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -34,7 +28,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -42,38 +36,23 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdkX-build-image
-#            filter: 'out/jdkX-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: jdk-build-specjbb2015-jdk11
-            filter: 'out/SPECjbb2015-jdk11.tar.gz'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
             set -exu
-            #
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
 
             ## Extract jdk
-            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
-            export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}
+            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz
+            export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE}
             export PATH=$JAVA_HOME/bin:$PATH
             which java
             java -version
 
             ## Extract specjbb2015 product
-            tar xf incoming/SPECjbb2015-jdk11.tar.gz
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015-jdk11.tar.gz
 
             ## Run test
 
@@ -92,15 +71,11 @@
             #   -Dspecjbb.controller.preset.duration=100 \
             #   -jar specjbb2015.jar -m composite)
 
-            if [ $JVM_VARIANT = "server" ]; then
-                (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
-            else
-                (cd $SPECJBB_PRODUCT_HOME; java -XX:TieredStopAtLevel=1 -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
-            fi
+            (cd $SPECJBB_PRODUCT_HOME; java -XX:+UseLargePages -XX:-UseBiasedLocking -Xmx12g -Xms12g -XX:+UseParallelOldGC -jar specjbb2015.jar -ikv -m composite)
 
             mkdir -p out
 
-            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${JVM_VARIANT}-${BUILD_TYPE}/")
+            datafile=$(basename $(echo $SPECJBB_PRODUCT_HOME/specjbb*.data.gz) | sed "s/\(specjbb2015\)/\1-${BUILD_TYPE}/")
 
             cp $SPECJBB_PRODUCT_HOME/specjbb*.data.gz out/$datafile
 
@@ -111,7 +86,7 @@
               -s $SPECJBB_PRODUCT_HOME/specjbb2015-C-*.data.gz \
               -l 1
 
-            tar -acf out/specjbb-result-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz result
+            tar -acf out/specjbb-result-${BUILD_TYPE}.tar.gz result
 
             rm -rf html
             mkdir html
diff --git a/jdkX-terasort-benchmark-persist-results.yaml b/jdkX-terasort-benchmark-persist-results.yaml
index 079eadf704..f26bd97586 100644
--- a/jdkX-terasort-benchmark-persist-results.yaml
+++ b/jdkX-terasort-benchmark-persist-results.yaml
@@ -6,7 +6,7 @@
         * Writes results to /work/openjdk-testing/hadoop-terasort-benchmark-results.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -16,18 +16,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Write terasort results'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -35,7 +29,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -43,11 +37,11 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
         - copyartifact:
             project: jdkX-terasort-benchmark
-            filter: 'out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv'
+            filter: 'out/terasort-results-${BUILD_TYPE}.csv'
             target: incoming
             flatten: true
         - shell: |
@@ -57,7 +51,7 @@
 
             PERSIST=$HOME/srv/openjdkX
             export BENCHMARK_RESULTS_DIR=$PERSIST/hadoop-terasort-benchmark-results
-            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},JVM_VARIANT=${JVM_VARIANT},label=${label}/*.csv
+            new_results=incoming/BUILD_TYPE=${BUILD_TYPE},label=${label}/*.csv
             prev_results=$BENCHMARK_RESULTS_DIR/results.csv
 
             # Ensure persistent directory exists.
diff --git a/jdkX-terasort-benchmark-publish-results.yaml b/jdkX-terasort-benchmark-publish-results.yaml
index b01262ad8d..28bd7dc3a8 100644
--- a/jdkX-terasort-benchmark-publish-results.yaml
+++ b/jdkX-terasort-benchmark-publish-results.yaml
@@ -32,8 +32,8 @@
         - string:
             name: PUBLISH_HOST
             default: ''
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Publish terasort benchmark results'
     wrappers:
         - workspace-cleanup:
diff --git a/jdkX-terasort-benchmark.yaml b/jdkX-terasort-benchmark.yaml
index e9979c431b..4e473ffa94 100644
--- a/jdkX-terasort-benchmark.yaml
+++ b/jdkX-terasort-benchmark.yaml
@@ -6,7 +6,7 @@
         * Runs the terasort benchmark.
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             openjdk-members:
                 - job-extended-read
@@ -16,18 +16,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Run terasort benchmark'
     axes:
         - axis:
             type: user-defined
-            name: JVM_VARIANT
-            values:
-                - server
-                - client
-        - axis:
-            type: user-defined
             name: BUILD_TYPE
             values:
                 - release
@@ -35,7 +29,7 @@
             type: slave
             name: label
             values:
-                - aarch64-06
+                - j12-qrep-01
     execution-strategy:
         sequential: true
     wrappers:
@@ -43,20 +37,8 @@
             dirmatch: false
         - timestamps
         - matrix-tie-parent:
-            node: aarch64-06
+            node: j12-qrep-01
     builders:
-# copyartifact is slow and the file is local
-# copy instead of going back and forth between master <-> slave
-#        - copyartifact:
-#            project: jdkX-build-image
-#            filter: 'out/jdkX-${JVM_VARIANT}-${BUILD_TYPE}.tar.gz'
-#            target: incoming
-#            flatten: true
-        - copyartifact:
-            project: openjdk8-hadoop-LCA14
-            filter: 'out/openjdk8-hadoop-LCA14.tar.gz'
-            target: incoming
-            flatten: true
         - shell: |
             #!/bin/bash
 
@@ -64,24 +46,20 @@
 
             NGIGABYTES=1
 
-            # client variant uses server with -XX:TieredStopAtLevel=1
-            # zero is a third possible value.
-            REAL_VARIANT=${JVM_VARIANT/client/server}
-
+            CACHE_FILES=$HOME/srv/jdk-cache
             ## Extract jdk
             rm -rf jdkX*
-            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/JVM_VARIANT/${REAL_VARIANT}/label/${NODE_NAME}/out/jdkX-${REAL_VARIANT}-${BUILD_TYPE}.tar.gz
+            tar xf ~/workspace/jdkX-build-image/BUILD_TYPE/${BUILD_TYPE}/label/${NODE_NAME}/out/jdkX-${BUILD_TYPE}.tar.gz
 
-            export JAVA_HOME=${WORKSPACE}/jdkX-${REAL_VARIANT}-${BUILD_TYPE}
+            export JAVA_HOME=${WORKSPACE}/jdkX-${BUILD_TYPE}
             export PATH=${JAVA_HOME}/bin:$PATH
 
             ## Extract Hadoop pre-builts
             rm -rf openjdk8-hadooop-LCA14
-            tar xf incoming/openjdk8-hadoop-LCA14.tar.gz
+            tar xf $CACHE_FILES/openjdk8-hadoop-LCA14.tar.gz
 
+            rm -rf incoming; mkdir -p incoming
             ## Benchmark
-            # FIXME
-            #(cd incoming; wget --progress=dot -e dotbytes=10M http://openjdk-apm1/openjdk8-build-artefacts/${NGIGABYTES}GB.tar.gz; tar xf ${NGIGABYTES}GB.tar.gz)
             (cd incoming; tar xf ~/srv/hadoop-terasort-reference-files/${NGIGABYTES}GB.tar.gz)
 
             TERAGEN_BASELINE_DIR=${WORKSPACE}/incoming
@@ -119,21 +97,14 @@
 
             trap "stop-dfs.sh; stop-yarn.sh" EXIT
 
-            # Use only C1 compiler for client runs.
-            if [ $JVM_VARIANT = "client" ]; then
-                VARIANT_OPT=-XX:TieredStopAtLevel=1
-            else
-                VARIANT_OPT=-Dharmless.property
-            fi
-
             elapsed_time_file=$(mktemp /tmp/benchmark-terasort-XXXXXX.$$)
-            HADOOP_OPTS=${VARIANT_OPT} /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
+            /usr/bin/time -o $elapsed_time_file -f "%e" terasort ${NGIGABYTES}GB ${NGIGABYTES}GB-sorted
 
             hadoop fs -rm -R ${NGIGABYTES}GB-sorted
             sed -i 's/\..*//' $elapsed_time_file
             elapsed_time=$(cat $elapsed_time_file)
             date_as_epoch=$(date --date="$(date +'%Y-%m-%d')" +%s)
-            echo "$date_as_epoch,$JVM_VARIANT,$NGIGABYTES,$elapsed_time" > out/terasort-results-${JVM_VARIANT}-${BUILD_TYPE}.csv
+            echo "$date_as_epoch,$NGIGABYTES,$elapsed_time" > out/terasort-results-${BUILD_TYPE}.csv
             rm -rf incoming/${NGIGABYTES}*
     publishers:
         - archive:
diff --git a/jdkX-update-src-tree-persist.yaml b/jdkX-update-src-tree-persist.yaml
index 88c4f69995..63234cf856 100644
--- a/jdkX-update-src-tree-persist.yaml
+++ b/jdkX-update-src-tree-persist.yaml
@@ -24,8 +24,8 @@
         - string:
             name: DAY_OF_YEAR
             default: 'default'
-    disabled: false
-    node: aarch64-06
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Write jdkX source tree'
     wrappers:
         - workspace-cleanup:
diff --git a/jdkX-update-src-tree.yaml b/jdkX-update-src-tree.yaml
index 28330d6499..e0d8bd1aa5 100644
--- a/jdkX-update-src-tree.yaml
+++ b/jdkX-update-src-tree.yaml
@@ -2,7 +2,7 @@
     name: jdkX
     scm:
         - hg:
-            url: http://hg.openjdk.java.net/jdk/hs
+            url: https://hg.openjdk.java.net/jdk/jdk
             clean: true
             subdir: jdkX
 - job:
@@ -27,13 +27,22 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
-    node: aarch64-06
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk14-.*"
+                - "jdk13-.*"
+                - "jdk11-.*"
+                - "jdk8-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
     display-name: 'OpenJDK JDK - Update jdkX source tree'
     scm:
         - jdkX
     triggers:
-        - pollscm: 'H 2 */2 * *'
+        - pollscm:
+            cron: '0 7 * * 1,3,5'
     wrappers:
         - timestamps
     builders:
diff --git a/jdkX-zgc-test.yaml b/jdkX-zgc-test.yaml
new file mode 100644
index 0000000000..9b278763df
--- /dev/null
+++ b/jdkX-zgc-test.yaml
@@ -0,0 +1,157 @@
+- job:
+    name: jdkX-zgc-test
+    project-type: matrix
+    defaults: global
+    description: |
+        * Configures and builds jdkX (ie, bin/java, bin/javac, et al) in debug mode before running SPECjbb2015.
+        * The source tarball is copied from the jdkX-update-src-tree job.<br>
+        * As we are the maintainers of ZGC on aarch64, we need to look after this.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 10
+            artifact-num-to-keep: 5
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+                - "jdk14-.*"
+                - "jdk13-.*"
+                - "jdk11-.*"
+                - "jdk8-.*"
+            block-level: 'GLOBAL'
+    disabled: true
+    node: j12-qrep-01
+    display-name: 'OpenJDK JDK - ZGC Debug Test'
+    axes:
+        - axis:
+            type: user-defined
+            name: BUILD_TYPE
+            values:
+                - fastdebug
+        - axis:
+            type: slave
+            name: label
+            values:
+                - j12-qrep-01
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - workspace-cleanup:
+            dirmatch: false
+        - timestamps
+        - matrix-tie-parent:
+            node: j12-qrep-01
+    triggers:
+        - timed: '0 20 * * 1,3,5'
+    builders:
+        - copyartifact:
+            project: jdkX-update-src-tree
+            filter: 'out/jdkX.tar.gz'
+            target: incoming
+            flatten: true
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            ccache_build_opts=--disable-ccache
+
+            rm -rf jdk* primordial-jdk* build* out
+
+            cd $HOME/srv/jdk-cache/jdk14
+            export JAVA_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${PATH}
+
+            cd ${WORKSPACE}
+
+            # Extract sources from upstream job
+            tar xf incoming/jdkX.tar.gz
+
+            shopt -s nullglob
+
+            # Configure and build.
+            mkdir -p build-stage1 build-stage2 out
+
+            two_stage_build=0
+
+            which java
+            java -version
+
+            pushd build-stage2
+              sh ../jdkX/configure --with-debug-level=${BUILD_TYPE} ${ccache_build_opts} --with-native-debug-symbols=internal
+              make images
+            popd
+
+            #tar -C build-stage2/images/jdk --transform="s!^./!$artifact_name/!" -acf out/${artifact_name}.tar.gz .
+
+            # Now run test with ZGC.
+
+            export PATH=$PWD/build-stage2/images/jdk/bin:$PATH
+
+            ## Extract specjbb2015 product
+            CACHE_FILES=$HOME/srv/jdk-cache
+            tar xf $CACHE_FILES/SPECjbb2015-jdk11.tar.gz
+
+            # Run test
+
+            SPECJBB_PRODUCT_HOME=SPECjbb2015-1.00
+
+            # This commented-out invocation is a quick test that
+            # takes about 10 minutes to complete - which can be
+            # useful when debugging.
+
+            #(cd $SPECJBB_PRODUCT_HOME; \
+            # time java \
+            #   -Dspecjbb.controller.rtcurve.duration.min=500 \
+            #   -Dspecjbb.controller.rtcurve.duration.max=1500 \
+            #   -Dspecjbb.controller.type=PRESET \
+            #   -Dspecjbb.controller.preset.ir=4000 \
+            #   -Dspecjbb.controller.preset.duration=100 \
+            #   -jar specjbb2015.jar -m composite)
+
+            (cd $SPECJBB_PRODUCT_HOME;
+             java \
+                  -XX:+UseTransparentHugePages \
+                  -XX:-UseBiasedLocking \
+                  -Xmx16g \
+                  -XX:+UnlockExperimentalVMOptions \
+                  -XX:+UseZGC \
+                  -XX:-UseBiasedLocking \
+                  -XX:+UnlockDiagnosticVMOptions \
+                  -XX:+ZVerifyForwarding \
+                  -XX:+ZVerifyMarking \
+                  -XX:+ZVerifyViews \
+                  -Dspecjbb.controller.rtcurve.duration.min=500 \
+                  -Dspecjbb.controller.rtcurve.duration.max=1500 \
+                  -Dspecjbb.controller.type=PRESET \
+                  -Dspecjbb.controller.preset.ir=40000 \
+                  -Dspecjbb.controller.preset.duration=100 \
+                  -jar specjbb2015.jar \
+                  -ikv -m composite)
+
+            # Do a sanity run of JCStress
+            DEPS=$HOME/workspace/jdkX-get-deps
+
+            JCSTRESS_JAR=$DEPS/jcstress.jar
+            java -jar ${JCSTRESS_JAR} \
+                -jvmArgs "-XX:+UnlockExperimentalVMOptions -XX:+UseZGC " \
+                -m sanity
+
+    publishers:
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
+        - html-publisher:
+            name: 'HTML Report'
+            dir: 'results'
+            files: 'index.html'
+            keep-all: true
+
diff --git a/jmh-build.yaml b/jmh-build.yaml
new file mode 100644
index 0000000000..89f5921a1d
--- /dev/null
+++ b/jmh-build.yaml
@@ -0,0 +1,132 @@
+- scm:
+    name: jmh
+    scm:
+        - hg:
+            url: https://hg.openjdk.java.net/code-tools/jmh
+            clean: true
+            browser: hgweb
+            browser-url: https://hg.openjdk.java.net/code-tools/jmh/
+            subdir: jmh
+- scm:
+    name: jmh-linaro-org
+    scm:
+        - git:
+            url: https://git.linaro.org/leg/openjdk/jmh-linaro-org
+            refspec: +refs/heads/master:refs/remotes/origin/master
+#            refspec: ${GERRIT_REFSPEC}
+            name: origin
+            branches:
+                 - refs/heads/master
+#                - ${GERRIT_BRANCH}
+            skip-tag: true
+            wipe-workspace: false
+            basedir: jmh/jmh-linaro-org
+            choosing-strategy: gerrit
+- job:
+    name: jmh-build
+    project-type: freestyle
+    defaults: global
+    description: |
+        Build jmh with jmh-linaro-org benchmarks. Builds all of jmh and runs unit
+        tests before building jmh-linaro-org.
+        benchmarks.jar is published with jmh-linaro-org benchmarks.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            openjdk-members:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            num-to-keep: 10
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: JDK_URL
+            default: 'http://openjdk.linaro.org/releases/jdk9-server-release-1708.tar.xz'
+        - string:
+            name: MAVEN_URL
+            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
+    disabled: true
+    node: aarch64-06
+    display-name: 'OpenJDK - Build jmh-linaro-org'
+    triggers:
+        # We poll the JMH Mercurial repository, and get triggered by review.linaro.org
+        - pollscm:
+# Poll once an hour. Build if JMH changes, and not just jmh-linaro-org.
+            cron: 'H * * * *'
+        - gerrit:
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: true
+                    exclude-trivial-rebase: true
+                    exclude-no-code-change: true
+                - change-merged-event
+            server-name: 'review.linaro.org'
+            override-votes: true
+            gerrit-build-successful-verified-value: 1
+            gerrit-build-failed-verified-value: -1
+            gerrit-build-successful-codereview-value: 1
+            gerrit-build-failed-codereview-value: -1
+            readable-message: true
+            successful-message: 'Build Successful'
+            failure-message: 'Build FAILED'
+            trigger-for-unreviewed-patches: true
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'leg/openjdk/jmh-linaro-org'
+                  branches:
+                    - branch-compare-type: 'ANT'
+                      branch-pattern: '**'
+    wrappers:
+        - timestamps
+    scm:
+        - jmh
+        - jmh-linaro-org
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -exu
+
+            rm -rf jdk* apache-maven-*
+
+            wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL}
+            tar -Jxf jdk*.tar.xz
+            tar -zxf apache-maven-*.tar.gz
+
+            cd jdk*/lib/security/
+            rm -f cacerts
+            ln -s /etc/ssl/certs/java/cacerts
+
+            cd ${WORKSPACE}/jdk*
+            export JAVA_HOME=${PWD}
+
+            cd ${WORKSPACE}/apache-maven-*
+            export M3_HOME=${PWD}
+
+            export PATH=${JAVA_HOME}/bin:${M3_HOME}/bin:${PATH}
+            which java
+            java -version
+            mvn -version
+
+            # Only go through complete jmh build and test on periodic builds.
+            # There is a possibility of jmh being updated when patches are pushed
+            # to gerrit, but this should be triggered by the polling soon enough
+            if [ "${GERRIT_EVENT_TYPE:-}" = ""  ]; then
+                cd ${WORKSPACE}/jmh
+                mvn -B clean install
+            else
+                cd ${WORKSPACE}/jmh/jmh-linaro-org
+                git fetch https://review.linaro.org/$GERRIT_PROJECT $GERRIT_REFSPEC && git checkout FETCH_HEAD
+            fi
+
+            # Builds the samples and jmh, without running unit tests.
+            cd ${WORKSPACE}/jmh/jmh-linaro-org
+            mvn -B clean install
+    publishers:
+        - archive:
+            artifacts: 'jmh/jmh-linaro-org/target/benchmarks.jar'
+        - email:
+            recipients: 'stuart.monteith@linaro.org'
diff --git a/jtreg-build.yaml b/jtreg-build.yaml
index 7a2be7c53a..1e26244000 100644
--- a/jtreg-build.yaml
+++ b/jtreg-build.yaml
@@ -26,7 +26,7 @@
             days-to-keep: 30
             num-to-keep:  10
             artifact-num-to-keep: 5
-    disabled: false
+    disabled: true
     node: aarch64-06
     display-name: 'OpenJDK - Build JDK Regression Test Harness (jtreg)'
     scm:
diff --git a/k8s-auxiliary.yaml b/k8s-auxiliary.yaml
deleted file mode 100644
index e462e01a94..0000000000
--- a/k8s-auxiliary.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: k8s-auxiliary
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-arm64
-    concurrent: false
-    display-name: 'Kubernetes auxiliary images build/publish'
-    scm:
-        - git:
-            url: https://github.com/yibo-cai/autoscaler.git
-            branches:
-                - origin/arm64
-            basedir: git-autoscaler
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: k8s/builders.sh
-    publishers:
-        - email:
-            recipients: 'yibo.cai@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org'
diff --git a/k8s/builders.sh b/k8s/builders.sh
deleted file mode 100755
index 264caa5f1b..0000000000
--- a/k8s/builders.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    rm -rf ${HOME}/.docker
-}
-
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
-
-# Build addon-resizer
-pushd git-autoscaler/addon-resizer
-rm -f .docker-tag
-make container ARCH=arm64
-# push to linaro/addon-resizer-arm64:2.1
-docker push $(cat .docker-tag)
-popd
diff --git a/kernel-testing-configs/generate-jjb-configs.sh b/kernel-testing-configs/generate-jjb-configs.sh
new file mode 100755
index 0000000000..4c6b4bd9d9
--- /dev/null
+++ b/kernel-testing-configs/generate-jjb-configs.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -xe
+
+if [[ -z ${KERNEL_BRANCH} || -z ${KERNEL_REPO} || -z ${EMAIL_ADDRESS} ]]; then
+	echo "Please make sure parameters are set"
+	exit 1
+fi
+
+DEVELOPER_JOB_NAME=$(echo ${EMAIL_ADDRESS} | cut -d'@' -f1)-$(sed -s "s/\//-/g" <<< ${KERNEL_BRANCH})
+
+cp templates/trigger-generic.yaml ../trigger-openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+cp templates/generic.yaml ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+
+sed -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|g" -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|g" -e "s|\${EMAIL_ADDRESS}|${EMAIL_ADDRESS}|g" -e "s|\${DEVELOPER_JOB_NAME}|${DEVELOPER_JOB_NAME}|g" -i ../trigger-openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+sed -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|g" -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|g" -e "s|\${EMAIL_ADDRESS}|${EMAIL_ADDRESS}|g" -e "s|\${DEVELOPER_JOB_NAME}|${DEVELOPER_JOB_NAME}|g" -e "s|\${QA_SERVER_PROJECT}|${DEVELOPER_JOB_NAME}|g" -i ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+
+
+if ! echo "${DUT}" | grep -q "am57xx-evm"; then
+	sed -i "/- 'am57xx-evm'/d" ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+fi
+if  ! echo "${DUT}" | grep -q "dragonboard-410c"; then
+	sed -i "/- 'dragonboard-410c'/d" ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+fi
+
+if ! echo "${DUT}" | grep -q "hikey"; then
+	sed -i "/- 'hikey'/d" ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+fi
+if ! echo "${DUT}" | grep -q "intel-core2-32"; then
+	sed -i "/- 'intel-core2-32'/d" ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+fi
+if ! echo "${DUT}" | grep -q "intel-corei7-64"; then
+	sed -i "/- 'intel-corei7-64'/d" ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+fi
+if ! echo "${DUT}" | grep -q "juno"; then
+	sed -i "/- 'juno'/d" ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+fi
+
+git add ../openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml ../  ../trigger-openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}.yaml
+git commit -m "Added new jobs for ${DEVELOPER_JOB_NAME}"
+wget https://raw.githubusercontent.com/vishalbhoj/tools/master/squad/create_project.py
+python create_project.py -p ${DEVELOPER_JOB_NAME} -g lkft -s ${EMAIL_ADDRESS}
diff --git a/kernel-testing-configs/templates/trigger-generic.yaml b/kernel-testing-configs/templates/trigger-generic.yaml
new file mode 100644
index 0000000000..ee305bbb3d
--- /dev/null
+++ b/kernel-testing-configs/templates/trigger-generic.yaml
@@ -0,0 +1,53 @@
+- job:
+    name: trigger-openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: KERNEL_BRANCH
+            default: '${KERNEL_BRANCH}'
+    disabled: false
+    node: master
+    display-name: 'Trigger for LKFT - developer CI for ${DEVELOPER_JOB_NAME}'
+    scm:
+        - git:
+            url: ${KERNEL_REPO}
+            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
+            name: origin
+            branches:
+                - origin/${KERNEL_BRANCH}
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+    triggers:
+        - pollscm:
+            cron: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            git clean -fdx
+            MAKE_KERNELVERSION=$(make kernelversion)
+            KERNEL_VERSION=$(echo ${MAKE_KERNELVERSION} | cut -f1,2 -d'.')
+            echo KERNEL_DESCRIBE=$(git describe --always) >> lkft_parameters
+            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
+            echo MAKE_KERNELVERSION=${MAKE_KERNELVERSION} >> lkft_parameters
+            echo KERNEL_VERSION=${KERNEL_VERSION} >> lkft_parameters
+            cat lkft_parameters
+    publishers:
+        - trigger-parameterized-builds:
+            - project:
+                - 'openembedded-lkft-developer-ci-${DEVELOPER_JOB_NAME}'
+              condition: SUCCESS
+              property-file: lkft_parameters
diff --git a/kernel-testing-configs/test-params/spectre64-viresh b/kernel-testing-configs/test-params/spectre64-viresh
new file mode 100644
index 0000000000..bf3924b2ce
--- /dev/null
+++ b/kernel-testing-configs/test-params/spectre64-viresh
@@ -0,0 +1,5 @@
+KERNEL_BRANCH=stable/arm64/v4.4.y/spectre
+KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git
+DUT=hikey
+EMAIL_ADDRESS=viresh.kumar@linaro.org
+
diff --git a/kernel-testing-configs/test-params/test-kernel-ci-project b/kernel-testing-configs/test-params/test-kernel-ci-project
new file mode 100644
index 0000000000..4260d444c9
--- /dev/null
+++ b/kernel-testing-configs/test-params/test-kernel-ci-project
@@ -0,0 +1,4 @@
+KERNEL_BRANCH=android-hikey-linaro-4.19
+KERNEL_REPO=https://android.googlesource.com/kernel/hikey-linaro
+DUT=hikey
+EMAIL_ADDRESS=vishal.bhoj@linaro.org
diff --git a/kernel-testing-configs/test-params/test-kernel-ci-project-4.14 b/kernel-testing-configs/test-params/test-kernel-ci-project-4.14
new file mode 100644
index 0000000000..c75137fe84
--- /dev/null
+++ b/kernel-testing-configs/test-params/test-kernel-ci-project-4.14
@@ -0,0 +1,5 @@
+KERNEL_BRANCH=android-hikey-linaro-4.14
+KERNEL_REPO=https://android.googlesource.com/kernel/hikey-linaro
+DUT=hikey
+EMAIL_ADDRESS=vishal.bhoj@linaro.org
+
diff --git a/kernel-testing-configs/test-params/test-kernel-ci-project-example b/kernel-testing-configs/test-params/test-kernel-ci-project-example
new file mode 100644
index 0000000000..43915180f1
--- /dev/null
+++ b/kernel-testing-configs/test-params/test-kernel-ci-project-example
@@ -0,0 +1,4 @@
+KERNEL_BRANCH=linux-5.0.y
+KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
+DUT=hikey
+EMAIL_ADDRESS=vishal.bhoj@linaro.org
diff --git a/kernel-testing-configs/test-params/test-kernel-ci-project-viresh b/kernel-testing-configs/test-params/test-kernel-ci-project-viresh
new file mode 100644
index 0000000000..071e263096
--- /dev/null
+++ b/kernel-testing-configs/test-params/test-kernel-ci-project-viresh
@@ -0,0 +1,5 @@
+KERNEL_BRANCH=stable/arm32/v4.4.y/spectre
+KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git
+DUT=am57xx-evm
+EMAIL_ADDRESS=vishal.bhoj@linaro.org
+
diff --git a/khilman-buildroot.yaml b/khilman-buildroot.yaml
deleted file mode 100644
index fdda6dc41d..0000000000
--- a/khilman-buildroot.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- job:
-    name: khilman-buildroot
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            khilman@kernel.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - github:
-            url: https://github.com/kernelci/buildroot/
-    disabled: true
-    node: kernelci
-    child-workspace: .
-    display-name: 'khilman - Buildroot'
-    scm:
-        - git:
-            url: https://github.com/kernelci/buildroot.git
-            refspec: +refs/heads/kernelci/latest:refs/remotes/origin/kernelci/latest
-            name: origin
-            branches:
-                - refs/heads/kernelci/latest
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - kernelci
-        - axis:
-            type: user-defined
-            name: arch
-            values:
-                - armel
-                - armeb
-                - arm64
-                - arm64be
-                - x86
-        - axis:
-            type: user-defined
-            name: frag
-            values:
-                - base
-                - tests
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            make clean
-            ./configs/frags/build ${arch} ${frag}
-        - shell: |
-            #!/bin/bash -x
-
-            ssh storage.armcloud.us mkdir -p /var/www/images/kernel-ci/images/rootfs/buildroot/${arch}/${frag}
-            scp output/images/* storage.armcloud.us:/var/www/images/kernel-ci/images/rootfs/buildroot/${arch}/${frag}/
-    publishers:
-        - email:
-            recipients: 'khilman@kernel.org'
diff --git a/khilman-kbuilder.yaml b/khilman-kbuilder.yaml
deleted file mode 100644
index e0d6e9d101..0000000000
--- a/khilman-kbuilder.yaml
+++ /dev/null
@@ -1,231 +0,0 @@
-- job:
-    name: khilman-kbuilder
-    project-type: matrix
-    defaults: global
-    parameters:
-        - string:
-            name: ARCH_LIST
-            default: 'arm'
-        - string:
-            name: DEFCONFIG_LIST
-            default: 'defconfig'
-        - string:
-            name: TREE
-            default: 'http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
-        - string:
-            name: BRANCH
-            default: 'master'
-        - string:
-            name: COMMIT_ID
-            default: ''
-        - string:
-            name: TREE_NAME
-            default: 'mainline'
-        - bool:
-            name: PUBLISH
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            khilman@kernel.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-                - job-configure
-            milo.casagrande@linaro.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 7
-            num-to-keep: 30
-        - throttle:
-            max-total: 6
-            option: project
-        - inject
-    disabled: true
-    node: x86_64
-    retry-count: 3
-    child-workspace: .
-    display-name: 'khilman - kbuilder'
-    auth-token: ${AUTH_TOKEN}
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - kernel_build_vps
-        - axis:
-            type: dynamic
-            name: arch
-            values:
-                - ARCH_LIST
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - DEFCONFIG_LIST
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: x86_64
-        - timeout:
-            timeout: 45
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-
-            # local copy of build scripts
-            if [ ! -d local ]; then
-              mkdir -p local
-              (cd local; git clone --depth=1 https://github.com/kernelci/kernelci-build.git)
-            fi
-
-            (cd local/kernelci-build; git pull)
-            export PATH=${WORKSPACE}/local/kernelci-build:${PATH}
-
-            # Ensure TREE URL is decoded
-            TREE=`python -c "import urllib, sys; print urllib.unquote(sys.argv[1])" ${TREE}`
-            BRANCH=`python -c "import urllib, sys; print urllib.unquote(sys.argv[1])" ${BRANCH}`
-
-            #
-            # Kernel tree -- clone Linus' tree and add ${TREE} as remote.  This takes advantage
-            # of all the tags in Linus' tree for more useful git-describe output.
-            #
-            MIRROR=/srv/mirrors/linux.git
-            REFSPEC=+refs/heads/${BRANCH}:refs/remotes/origin/${BRANCH}
-            if [ -e ${TREE_NAME} ]; then
-                cd ${TREE_NAME} && \
-                timeout --preserve-status -k 10s 5m git fetch --tags linus && \
-                timeout --preserve-status -k 10s 5m git fetch --tags ${TREE} ${REFSPEC}
-            else
-              git clone -o linus --reference ${MIRROR} http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ${TREE_NAME}
-              cd ${TREE_NAME} && \
-              git remote add origin ${TREE} && \
-              timeout --preserve-status -k 10s 5m git fetch origin
-            #   (cd ${TREE_NAME}; git remote add origin ${TREE}; git fetch origin ${REFSPEC})
-            fi
-            if [ $? != 0 ]; then
-              exit 1
-            fi
-
-            #rm -rf _install_
-            git clean -df
-            timeout --preserve-status -k 10s 5m git fetch origin ${REFSPEC}
-            if [ $? != 0 ]; then
-              exit 1
-            fi
-            if [ -z ${COMMIT_ID} ]; then
-              git checkout -f origin/${BRANCH}
-            else
-              git checkout -f origin/${BRANCH}
-              git branch -D local/${BRANCH}
-              git checkout -b local/${BRANCH} -f ${COMMIT_ID}
-            fi
-            if [ $? != 0 ]; then
-              exit 1
-            fi
-
-            # Ensure abbrev SHA1s are 12 chars
-            git config --global core.abbrev 12
-
-            # Only use v3.x tags in arm-soc tree
-            unset describe_args
-            [ ${TREE_NAME} = "arm-soc" ] && describe_args="--match=v\*"
-            GIT_DESCRIBE=$(eval git describe $describe_args)
-            GIT_DESCRIBE=${GIT_DESCRIBE//\//_}  # replace any '/' with '_'
-            echo GIT_DESCRIBE=${GIT_DESCRIBE} > env.properties
-            export GIT_DESCRIBE # so it overrides default done by build.py
-
-            #export CCACHE_DISABLE=true
-
-            # Convert defconfig of form "foo+bar" into "foo -c bar"
-            defconfig_translated=`echo ${defconfig} | sed 's/\+/ \-c /g'`
-
-            # Build kernel/modules and install (default: ./_install_ dir)
-            export LANG=C
-            export ARCH=${arch}
-            if [ $PUBLISH != true ]; then
-                build.py -i -c ${defconfig_translated}
-            else
-                build.py -i -p production -c ${defconfig_translated}
-            fi
-            RC=$?
-
-            # Remove the build output (important stuff in _install_ dir)
-            rm -rf build
-
-            echo "Kernel build result: ${RC}"
-            echo ${RC} > build.result
-
-            # Always return success here so pass/fail results can still be published
-            exit 0
-        - inject:
-            properties-file: ${TREE_NAME}/env.properties
-
-        - shell: |
-            #!/bin/bash
-            #
-            # This script determines overall result of jenkins job
-            #
-            exit `cat ${TREE_NAME}/build.result`
-
-            BUILD_DIR=${TREE_NAME}/_install_/${GIT_DESCRIBE}/${arch}-${defconfig}
-            BUILD_META=${BUILD_DIR}/build.meta
-
-            grep build_result: ${BUILD_META} |grep -cq PASS
-            RC=$?
-
-            exit $RC
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.getEnvironment(manager.listener)['BUILD_NUMBER']
-                def tree_name = manager.build.getEnvironment(manager.listener)['TREE_NAME']
-                def branch = manager.build.getEnvironment(manager.listener)["BRANCH"]
-                def description = manager.build.getEnvironment(manager.listener)['GIT_DESCRIBE']
-                def arch = manager.build.getEnvironment(manager.listener)['ARCH_LIST']
-                def publish = manager.build.getEnvironment(manager.listener)['PUBLISH']
-                def resultsUrl="https://kernelci.org/build/${tree_name}/kernel/${description}/"
-
-                def jobDescription = "&nbsp;ARCH: ${arch}"
-                // FIXME: resultsURL is only valid when PUBLISH = "true"
-                jobDescription = jobDescription + ",&nbsp;<a href='${resultsUrl}'>Results db</a>"
-
-                manager.build.setDisplayName("#" + build_number + "-" + tree_name + '/' + branch + "-" + description)
-                manager.build.setDescription(jobDescription)
-
-                def cause = manager.build.getAction(hudson.model.CauseAction.class).getCauses()
-                def upstreamBuild = cause[0].upstreamBuild
-                def upstreamProject = cause[0].upstreamProject
-                def jobName = upstreamProject
-                def jobConfiguration = upstreamProject
-
-                // Multi-configuration project
-                if (upstreamProject.contains("/")) {
-                  jobName = upstreamProject.split("/")[0]
-                  jobConfiguration = upstreamProject.split("/")[1]
-                }
-
-                def jobs = hudson.model.Hudson.instance.getItem(jobName).getAllJobs()
-
-                for (job in jobs) {
-                  if(job.name == jobConfiguration) {
-                    job.getLastBuild().setDisplayName("#" + build_number + "-" + tree_name + '/' + branch + "-" + description)
-                    job.getLastBuild().setDescription(jobDescription)
-                  }
-                }
-        - trigger-parameterized-builds:
-            - project: khilman-kernel-build-complete
-              property-file: ${TREE_NAME}/env.properties
-              condition: ALWAYS
-              predefined-parameters: |
-                  PUBLISH=${PUBLISH}
-                  TREE_NAME=${TREE_NAME}
-                  ARCH_LIST=${ARCH_LIST}
-                  GIT_DESCRIBE=${GIT_DESCRIBE}
diff --git a/khilman-kernel-build-complete.yaml b/khilman-kernel-build-complete.yaml
deleted file mode 100644
index 3629bd3dda..0000000000
--- a/khilman-kernel-build-complete.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-- job:
-    name: khilman-kernel-build-complete
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            kevin.hilman@linaro.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: TREE_NAME
-            default: ''
-        - string:
-            name: PUBLISH
-            default: ''
-        - string:
-            name: GIT_DESCRIBE
-            default: ''
-        - string:
-            name: ARCH_LIST
-            default: ''
-        - text:
-            name: RESULTS
-            default: 'No Results'
-    disabled: true
-    node: kci-x86_64-build-complete-01
-    display-name: 'khilman - Kernel build complete'
-    scm:
-        - git:
-            url: https://github.com/kernelci/kernelci-build.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: local/kernelci-build
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            bash -x ./local/kernelci-build/build-complete.sh
-    publishers:
-        - trigger-parameterized-builds:
-            - project: tbaker-kboot-bot
-              condition: ALWAYS
-              predefined-parameters: |
-                  URL=http://storage.kernelci.org/${TREE_NAME}/${GIT_DESCRIBE}/
-                  ARCH=${ARCH_LIST}
-            - project: mhart-kboot-bot
-              condition: ALWAYS
-              predefined-parameters: |
-                  TREE=${TREE_NAME}
-                  BRANCH=${GIT_DESCRIBE}
-                  ARCH=${ARCH_LIST}
diff --git a/khilman-trigger-flex.yaml b/khilman-trigger-flex.yaml
deleted file mode 100644
index 152c29695b..0000000000
--- a/khilman-trigger-flex.yaml
+++ /dev/null
@@ -1,420 +0,0 @@
-- job:
-    name: khilman-trigger-flex
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 7
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            khilman@kernel.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-                - job-configure
-        - throttle:
-            max-total: 1
-            option: project
-        - inject
-    disabled: true
-    node: kci-x86_64-build-complete-01
-    child-workspace: .
-    display-name: 'khilman - Trigger flex'
-    triggers:
-        - timed: 'H/60 * * * *'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - kci-x86_64-build-complete-01
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-                - arm64
-                - mips
-                - x86
-        - axis:
-            type: user-defined
-            name: TREE_BRANCH
-            values:
-                - mainline#master
-                - next#master
-                - arm-soc#for-next
-                - arm-soc#to-build
-                - stable#linux-4.9.y
-                - stable#linux-4.8.y
-                - stable#linux-4.7.y
-                - stable#linux-4.6.y
-                - stable#linux-4.5.y
-                - stable#linux-4.4.y
-                - stable#linux-4.2.y
-                - stable#linux-4.0.y
-                - stable#linux-3.19.y
-                - stable#linux-3.17.y
-                - stable#linux-3.16.y
-                - stable#linux-3.15.y
-                - stable#linux-3.14.y
-                - stable#linux-3.13.y
-                - stable#linux-3.12.y
-                - stable#linux-3.11.y
-                - stable#linux-3.10.y
-                - stable-sasha#linux-3.18.y-queue
-                - stable-sasha#linux-3.18.y
-                - stable-sasha#linux-4.1.y-queue
-                - stable-sasha#linux-4.1.y
-                - stable-rc#linux-3.14.y
-                - stable-rc#linux-4.4.y
-                - stable-rc#linux-4.6.y
-                - stable-rc#linux-4.7.y
-                - stable-rc#linux-4.8.y
-                - stable-rc#linux-4.9.y
-#                - net-next#master
-#                - android#android-4.4
-#                - android#android-4.4.y
-#                - android#android-4.9
-#                - drm-tip#drm-tip
-                - arnd#to-build
-#                - rmk#for-next
-#                - rmk#to-build
-#                - omap#for-next
-#                - khilman#to-build
-#                - qcom-lt#integration-linux-qcomlt
-#                - samsung#for-next
-#                - dlezcano#kevin-bot
-#                - tbaker#to-build
-#                - collabora#for-master
-#                - collabora#for-next
-#                - collabora#for-kernelci
-#                - rt-stable#v3.2-rt
-#                - rt-stable#v3.4-rt
-#                - rt-stable#v3.10-rt
-#                - rt-stable#v3.12-rt
-#                - tegra#for-next
-#                - anders#to-build
-#                - anders#v3.18-rt-test
-#                - anders#v4.0-rt-test
-#                - anders#v4.1-rt-test
-#                - viresh#for-kernelci
-#                - alex#kernel-ci
-#                - krzysztof#for-next
-#                - agross#for-next
-#                - broonie-regmap#for-next
-#                - broonie-regulator#for-next
-#                - broonie-sound#for-next
-#                - broonie-spi#for-next
-#                - renesas#next
-#                - renesas#devel
-#                - llvm#for-next
-#                - llvm#master
-#                - ulfh#next
-#                - ardb#arm32-efi-for-kernelci
-#                - evalenti#for-kernelci
-#                - amitk#96b-kernelci
-#                - pmwg#integ
-#                - amlogic#for-next
-#                - leg#leg-kernel
-#                - efi#next
-#                - linaro-android#linaro-android-llct
-#                - linaro-android#lsk-v4.4-android
-#                - linaro-android#lsk-v4.1-android
-#                - linaro-android#lsk-v3.18-android
-#                - lsk#for-test
-#                - lsk#linux-linaro-lsk-v3.10
-#                - lsk#linux-linaro-lsk-v3.10-test
-#                - lsk#linux-linaro-lsk-v3.10-rt
-#                - lsk#linux-linaro-lsk-v3.10-rt-test
-#                - lsk#linux-linaro-lsk-v3.14
-#                - lsk#linux-linaro-lsk-v3.14-test
-#                - lsk#linux-linaro-lsk-v3.14-rt
-#                - lsk#linux-linaro-lsk-v3.14-rt-test
-#                - lsk#linux-linaro-lsk-v3.18
-#                - lsk#linux-linaro-lsk-v3.18-test
-#                - lsk#linux-linaro-lsk-v3.18-rt
-#                - lsk#linux-linaro-lsk-v3.18-rt-test
-#                - lsk#linux-linaro-lsk-v3.18-android
-#                - lsk#linux-linaro-lsk-v3.18-android-test
-#                - lsk#linux-linaro-lsk-v3.18-eas-test
-#                - lsk#linux-linaro-lsk-v4.1
-#                - lsk#linux-linaro-lsk-v4.1-test
-#                - lsk#linux-linaro-lsk-v4.1-rt
-#                - lsk#linux-linaro-lsk-v4.1-rt-test
-#                - lsk#linux-linaro-lsk-v4.1-android
-#                - lsk#linux-linaro-lsk-v4.1-android-test
-#                - lsk#linux-linaro-lsk-v4.4
-#                - lsk#linux-linaro-lsk-v4.4-test
-#                - lsk#linux-linaro-lsk-v4.4-rt
-#                - lsk#linux-linaro-lsk-v4.4-rt-test
-#                - lsk#linux-linaro-lsk-v4.4-android
-#                - lsk#linux-linaro-lsk-v4.4-android-test
-#                - lsk#for-test
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: x86_64-01
-        - timeout:
-            timeout: 30
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-
-            REFERENCE=/srv/mirrors/linux.git
-
-            declare -A trees
-            trees=(
-                [mainline]="http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"
-                [next]="http://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git"
-                [arm-soc]="http://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git"
-                [rmk]="git://git.armlinux.org.uk/~rmk/linux-arm.git"
-                [stable]="http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git"
-                [omap]="http://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git"
-                [linux-linaro]="https://git.linaro.org/kernel/linux-linaro-tracking.git"
-                [lsk]="https://git.linaro.org/kernel/linux-linaro-stable.git"
-                [khilman]="http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux.git"
-                [stable-sasha]="http://git.kernel.org/pub/scm/linux/kernel/git/sashal/linux-stable.git"
-                [qcom-lt]="https://git.linaro.org/landing-teams/working/qualcomm/kernel.git"
-                [samsung]="http://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git"
-                [dlezcano]="https://git.linaro.org/people/daniel.lezcano/linux.git"
-                [tbaker]="https://github.com/EmbeddedAndroid/linux.git"
-                [collabora]="http://cgit.collabora.com/git/linux.git"
-                [rt-stable]="http://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux-stable-rt.git"
-                [tegra]="http://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git"
-                [anders]="https://git.linaro.org/people/anders.roxell/linux-rt.git"
-                [viresh]="http://git.kernel.org/pub/scm/linux/kernel/git/vireshk/linux.git"
-                [alex]="https://git.linaro.org/people/alex.bennee/linux.git"
-                [krzysztof]="http://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git"
-                [agross]="http://git.kernel.org/pub/scm/linux/kernel/git/agross/linux.git"
-                [broonie-regmap]="http://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git"
-                [broonie-regulator]="http://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git"
-                [broonie-sound]="http://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git"
-                [broonie-spi]="http://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git"
-                [renesas]="http://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas.git"
-                [llvm]="http://git.linuxfoundation.org/llvmlinux/kernel.git"
-                [ulfh]="http://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git"
-                [ardb]="https://git.linaro.org/people/ard.biesheuvel/linux-arm.git"
-                [evalenti]="http://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git"
-                [amitk]="https://git.linaro.org/people/amit.kucheria/kernel.git"
-                [pmwg]="https://git.linaro.org/power/linux.git"
-                [net-next]="git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next.git"
-                [amlogic]="http://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic.git"
-                [leg]="http://git.linaro.org/leg/acpi/leg-kernel.git"
-                [stable-rc]="http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git"
-                [efi]="http://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git"
-                [android]="https://android.googlesource.com/kernel/common"
-                [linaro-android]="https://android-git.linaro.org/git/kernel/linaro-android.git"
-                [drm-tip]="https://anongit.freedesktop.org/git/drm/drm-tip.git"
-                [arnd]=" http://git.kernel.org/pub/scm/linux/kernel/git/arnd/playground.git"
-            )
-
-            OFS=${IFS}
-            IFS='#'
-            arr=($TREE_BRANCH)
-            IFS=${OFS}
-
-            tree_name=${arr[0]}
-            tree_url=${trees[$tree_name]}
-            branch=${arr[1]}
-            if [[ -z ${branch} ]]; then
-              branch="master"
-            fi
-
-            if [ ! -e $tree_name ]; then
-              git clone --reference $REFERENCE $tree_url $tree_name
-            else
-              (cd $tree_name; git remote update)
-            fi
-
-            rm -f *.properties
-            cd $tree_name
-            rm -f *.properties
-            git remote update
-            git checkout -f origin/$branch
-            if [ $? != 0 ]; then
-              echo "ERROR: branch $branch doesn't exist"
-              exit 1
-            fi
-
-            GIT_DESCRIBE=$(git describe)
-            COMMIT_ID=$(git log -n1 --format=%H)
-
-            echo "${tree_name}/${branch}-${GIT_DESCRIBE}"
-
-            THIS_COMMIT=$branch-this.commit
-            LAST_COMMIT=$branch-last.commit
-            if [ ${ARCH} != "arm" ]; then
-              THIS_COMMIT=$ARCH-$branch-this.commit
-              LAST_COMMIT=$ARCH-$branch-last.commit
-            fi
-
-            if [ ! -e $LAST_COMMIT ]; then
-              echo 0 > $LAST_COMMIT
-            fi
-
-            git log -n1 --format=%H > $THIS_COMMIT
-            diff $LAST_COMMIT $THIS_COMMIT
-            if [ $? == 0 ]; then
-              echo "Nothing new in $tree_name/$branch.  Skipping"
-              exit 0
-            fi
-            cp $THIS_COMMIT $LAST_COMMIT
-
-            ARCH_LIST=${ARCH}
-
-            # defconfigs
-            DEFCONFIG_LIST="allnoconfig "
-            DEFCONFIG_LIST+=`(cd arch/${ARCH}/configs; echo *defconfig)`
-            DEFCONFIG_LIST+=" "
-
-            base_defconfig="defconfig"
-            if [ ${ARCH} = "arm" ]; then
-              base_defconfig="multi_v7_defconfig"
-            fi
-
-            # tinyconfig
-            if [ -e kernel/configs/tiny.config ]; then
-              DEFCONFIG_LIST+="tinyconfig "
-            fi
-
-            # defconfigs + fragments
-            if [ ${ARCH} = "arm" ]; then
-              DEFCONFIG_LIST+="allmodconfig "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_ARM_LPAE=y "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_CPU_BIG_ENDIAN=y "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_PROVE_LOCKING=y "
-              DEFCONFIG_LIST+="versatile_defconfig+CONFIG_OF_UNITTEST=y "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_THUMB2_KERNEL=y+CONFIG_ARM_MODULE_PLTS=y "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_SMP=n "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_EFI=y "
-              DEFCONFIG_LIST+="multi_v7_defconfig+CONFIG_EFI=y+CONFIG_ARM_LPAE=y "
-
-              # Platform specific
-              if [ -e arch/${ARCH}/configs/mvebu_v7_defconfig ]; then
-                DEFCONFIG_LIST+="mvebu_v7_defconfig+CONFIG_CPU_BIG_ENDIAN=y "
-              fi
-            fi
-
-            if [ ${ARCH} = "arm64" ]; then
-              DEFCONFIG_LIST+="defconfig+CONFIG_CPU_BIG_ENDIAN=y "
-              DEFCONFIG_LIST+="defconfig+CONFIG_OF_UNITTEST=y "
-              DEFCONFIG_LIST+="defconfig+CONFIG_RANDOMIZE_BASE=y "
-              # ACPI currently depends on EXPERT on arm64
-              DEFCONFIG_LIST+="defconfig+CONFIG_EXPERT=y+CONFIG_ACPI=y "
-              DEFCONFIG_LIST+="allmodconfig "
-
-              # Enable KASAN for non-stable until image size issues are sorted out
-              if [ ${tree_name} != "stable" ] && [ ${tree_name} != "stable-rc" ]; then
-                DEFCONFIG_LIST+="defconfig+CONFIG_KASAN=y "
-              fi
-            fi
-
-            if [ ${ARCH} = "x86" ]; then
-              DEFCONFIG_LIST+="defconfig+CONFIG_OF_UNITTEST=y "
-              DEFCONFIG_LIST+="defconfig+CONFIG_KASAN=y "
-              DEFCONFIG_LIST+="allmodconfig "
-              DEFCONFIG_LIST+="allmodconfig+CONFIG_OF=n "
-              DEFCONFIG_LIST+="i386_defconfig "
-
-              # Fragments
-              FRAGS="arch/x86/configs/kvm_guest.config"
-              for frag in ${FRAGS}; do
-                if [ -e $frag ]; then
-                  DEFCONFIG_LIST+="defconfig+$frag "
-                fi
-              done
-            fi
-
-            # Tree specific fragments: LSK + KVM fragments
-            if [ ${tree_name} = "stable" ]; then
-              # Don't do allmodconfig builds
-              DEFCONFIG_LIST=${DEFCONFIG_LIST/allmodconfig/}
-            fi
-
-            # Security testing features
-            DEFCONFIG_LIST+="$base_defconfig+CONFIG_LKDTM=y "
-
-            # Tree specific fragments: LSK + KVM fragments
-            if [ ${tree_name} = "lsk" ] || [ ${tree_name} = "anders" ]; then
-              # Don't do allmodconfig builds
-              DEFCONFIG_LIST=${DEFCONFIG_LIST/allmodconfig/}
-
-              FRAGS="linaro/configs/kvm-guest.conf"
-
-              # For -rt kernels, build with RT fragment
-              RT_FRAG=kernel/configs/preempt-rt.config
-              if [ ! -f ${RT_FRAG} ]; then
-                RT_FRAG=linaro/configs/preempt-rt.conf
-              fi
-
-              grep -q "config PREEMPT_RT_FULL" kernel/Kconfig.preempt
-              if [ $? = 0 ]; then
-                 FRAGS+=" $RT_FRAG "
-              fi
-
-              for frag in ${FRAGS}; do
-                if [ -e $frag ]; then
-                  DEFCONFIG_LIST+="$base_defconfig+$frag "
-                fi
-              done
-
-              # KVM host: only enable for LPAE-enabled kernels
-              KVM_HOST_FRAG=linaro/configs/kvm-host.conf
-              if [ -e $KVM_HOST_FRAG ]; then
-                lpae_base="multi_v7_defconfig+CONFIG_ARM_LPAE=y"
-                if [[ $DEFCONFIG_LIST == *"${lpae_base}"* ]]; then
-                    DEFCONFIG_LIST+="${lpae_base}+$KVM_HOST_FRAG "
-                fi
-              fi
-
-              # Linaro base + distro frags
-              if [ -e linaro/configs/linaro-base.conf -a -e linaro/configs/distribution.conf ]; then
-                  DEFCONFIG_LIST+="$base_defconfig+linaro/configs/linaro-base.conf+linaro/configs/distribution.conf "
-              fi
-
-              # Android/AOSP fragments: combined together
-              if [ -e android/configs ]; then
-                FRAG_A=""
-                FRAGS="android/configs/android-base.cfg android/configs/android-recommended.cfg"
-                for frag in ${FRAGS}; do
-                  if [ -e $frag ]; then
-                    FRAG_A+="+$frag"
-                  fi
-                done
-                if [ -n "$FRAG_A" ]; then
-                  DEFCONFIG_LIST+=" $base_defconfig$FRAG_A "
-                  # Also build vexpress_defconfig + Android for testing on QEMU
-                  if [ ${ARCH} = "arm" ]; then
-                    DEFCONFIG_LIST+=" vexpress_defconfig$FRAG_A "
-                  fi
-                fi
-              fi
-            fi
-
-            cat << EOF > ${WORKSPACE}/${TREE_BRANCH}-build.properties
-            ARCH_LIST=$ARCH_LIST
-            DEFCONFIG_LIST=$DEFCONFIG_LIST
-
-            TREE=$tree_url
-            TREE_NAME=$tree_name
-            BRANCH=$branch
-            COMMIT_ID=$COMMIT_ID
-            PUBLISH=true
-            EOF
-
-            cat ${WORKSPACE}/${TREE_BRANCH}-build.properties
-        - trigger-builds:
-            - project: 'khilman-kbuilder'
-              property-file: ${TREE_BRANCH}-build.properties
-        - shell: |
-            #!/bin/bash
-
-            rm -f ${TREE_BRANCH}-build.properties
diff --git a/kselftest.yaml b/kselftest.yaml
deleted file mode 100644
index 1df4c486f0..0000000000
--- a/kselftest.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- job:
-    name: kselftest
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 90
-            num-to-keep: 90
-    parameters:
-        - string:
-            name: KSELFTEST_URL
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
-        - string:
-            name: KSELFTEST_BRANCH
-            default: 'master'
-    disabled: false
-    node: master
-    display-name: 'Generate kselftest tarball (arm, arm64 and x86_64)'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-                - docker-xenial-arm64
-                - docker-xenial-armhf
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw: kselftest/builders.sh
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            deb_host_arch=$(dpkg-architecture -qDEB_HOST_ARCH)
-            case "${deb_host_arch}" in
-              amd64)
-                export ARCH=x86_64
-                ;;
-              arm64)
-                export ARCH=arm64
-                ;;
-              armhf)
-                export ARCH=arm
-                ;;
-            esac
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              tools/testing/selftests/out/ \
-              components/kernel/kselftest/${ARCH}/${BUILD_NUMBER}
diff --git a/kselftest/builders.sh b/kselftest/builders.sh
deleted file mode 100755
index 0abfb6b902..0000000000
--- a/kselftest/builders.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
-  echo "INFO: apt update error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
-fi
-
-pkg_list="git libcap-dev libcap-ng-dev libelf-dev libfuse-dev libmount-dev libpopt-dev pkg-config pxz rsync"
-deb_host_arch=$(dpkg-architecture -qDEB_HOST_ARCH)
-case "${deb_host_arch}" in
-  amd64)
-    export ARCH=x86_64
-    pkg_list+=" libnuma-dev"
-    ;;
-  arm64)
-    export ARCH=arm64
-    pkg_list+=" libnuma-dev"
-    ;;
-  armhf)
-    export ARCH=arm
-    ;;
-esac
-
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
-  echo "INFO: apt install error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
-fi
-
-KSELFTEST_URL=${KSELFTEST_URL:-"https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git"}
-KSELFTEST_BRANCH=${KSELFTEST_BRANCH:-"master"}
-WORKSPACE=${WORKSPACE:-"${PWD}"}
-
-set -x
-
-git clone -b ${KSELFTEST_BRANCH} ${KSELFTEST_URL} ${WORKSPACE}
-git_describe=$(git describe)
-echo "#${BUILD_NUMBER}-${git_describe}" > version.txt
-
-make ARCH=${ARCH} headers_install
-export INSTALL_PATH=kselftest
-make ARCH=${ARCH} -C tools/testing/selftests
-make ARCH=${ARCH} -C tools/testing/selftests install
-
-mkdir -p tools/testing/selftests/out
-cd tools/testing/selftests
-tar -I pxz -cf out/kselftest_${ARCH}_${git_describe}.tar.xz kselftest
-
-# Build information
-cat > out/HEADER.textile << EOF
-
-h4. kselftest
-
-Build description:
-* Build URL: "${BUILD_URL}":${BUILD_URL}
-* Kernel URL: ${KSELFTEST_URL}
-* Kernel branch: ${KSELFTEST_BRANCH}
-* Kernel commit: ${git_describe}
-EOF
-
-cat > out/build_config.json <<EOF
-{
-  "kernel_repo" : "${KSELFTEST_URL}",
-  "kernel_branch" : "${KSELFTEST_BRANCH}",
-  "kernel_commit_id" : "${git_describe}"
-}
-EOF
diff --git a/kvm-guest-image.yaml b/kvm-guest-image.yaml
deleted file mode 100644
index db22c8a94a..0000000000
--- a/kvm-guest-image.yaml
+++ /dev/null
@@ -1,101 +0,0 @@
-- job:
-    name: kvm-guest-image
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: true
-    display-name: 'Linaro KVM guest image build'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-arm64
-                - docker-jessie-armhf
-    triggers:
-        - timed: '@monthly'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-                sudo umount /mnt || true
-                sudo kpartx -dv kvm.raw || true
-            }
-
-            sudo apt-get update
-            sudo apt-get -y install kpartx parted pixz qemu-utils python-requests
-
-            arch=`dpkg-architecture -qDEB_HOST_ARCH`
-            case "${arch}" in
-              armhf)
-              export ROOTFS_BUILD_URL="http://releases.linaro.org/debian/images/developer-armhf/15.12/linaro-jessie-developer-20151210-10.tar.gz"
-                ;;
-              arm64)
-              export ROOTFS_BUILD_URL="http://releases.linaro.org/debian/images/developer-arm64/15.12/linaro-jessie-developer-20150325-10.tar.gz"
-                ;;
-            esac
-            wget -nc --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL} -O nano.tgz
-
-            dd if=/dev/zero of=kvm.raw bs=2048 seek=1M count=0
-            /sbin/parted --script kvm.raw mklabe gpt
-            /sbin/parted --script kvm.raw mkpart p fat32 1 50
-            /sbin/parted --script  -- kvm.raw mkpart p ext4 50 -0
-            /sbin/parted --script kvm.raw set 1 boot
-
-            for device in $(sudo kpartx -avs kvm.raw | cut -d' ' -f3); do
-              partition=$(echo ${device} | cut -d'p' -f3)
-              case "${partition}" in
-                1)
-                  sudo mkfs.vfat -F 32 /dev/mapper/${device}
-                  ;;
-                2)
-                  sudo mkfs.ext4 /dev/mapper/${device}
-                  sudo mount /dev/mapper/${device} /mnt/
-                  sudo tar xaf nano.tgz -C /mnt --strip-components=1
-                  cat << EOF | sudo tee /mnt/etc/network/interfaces.d/eth0
-            auto lo
-            iface lo inet loopback
-
-            auto eth0
-            iface eth0 inet dhcp
-            EOF
-                  sudo umount /mnt
-                  ;;
-              esac
-            done
-
-            sudo kpartx -dv kvm.raw
-            qemu-img convert -f raw -O qcow2 kvm.raw kvm.qcow2
-            time pixz kvm.qcow2
-
-            # Publish to snapshots
-            mkdir out; mv kvm.qcow2.xz out/kvm-${arch}.qcow2.xz
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            python ${HOME}/bin/linaro-cp.py --api_version 3 out ubuntu/images/kvm-guest/${BUILD_NUMBER}/${arch}
-    publishers:
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/lava-debian-armmp-armhf.yaml b/lava-debian-armmp-armhf.yaml
deleted file mode 100644
index cab4870ae4..0000000000
--- a/lava-debian-armmp-armhf.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-# Debian ARMMP armhf NFS, initramfs, modules and dtbs
-
-- job:
-    name: lava-debian-jessie-armmp-armhf
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 24
-        numToKeep: 12
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARMHF ARMMP Debian files'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-            cd out/
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y -t jessie-backports install qemu-user-static debootstrap
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/armmp-nfs.sh
-            chmod 744 ./armmp-nfs.sh
-            sudo ./armmp-nfs.sh
-            cd ..
-            cat > ${WORKSPACE}/out/debian-armmp-armhf-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-armmp-armhf build instructions
-            ===========================================
-
-            This initramfs is built using update-initramfs inside a
-            minimal Debian Jessie debootstrap chroot.
-            The contents of the chroot is then packaged up as an NFS
-            with an empty root password.
-                auto_login:
-                    login_prompt: 'login:'
-                    username: root
-
-            apt is included in the NFS, as are bash, grep, iproute2, mawk and sed.
-            The NFS uses the default init in Jessie: systemd.
-
-            The Debian ARMMP kernel is a modular build and the modules
-            need to be available in the initramfs for the kernel to be
-            able to mount the NFS. The initramfs does not have DNS
-            support.
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-armmp-armhf/
-
-            The script used by jenkins is available here:
-            https://git.linaro.org/lava-team/refactoring.git/blob/HEAD:/scripts/armmp-nfs.sh
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-armmp-armhf.yaml
-            The base system is a Debian Jessie VM.
-
-            The NFS rootfs uses a prompt of "root@jessie:"
-
-            </pre></body></html>
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/jessie/armhf/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-buster-amd64-vm.yaml b/lava-debian-buster-amd64-vm.yaml
new file mode 100644
index 0000000000..18eff83fa1
--- /dev/null
+++ b/lava-debian-buster-amd64-vm.yaml
@@ -0,0 +1,108 @@
+# Large image, expressly to be able to do lava-server tests inside
+# which needs lots of dependencies & space for postgresql.
+# able to use lava packages from Debian buster for django1.11
+# and python3.
+
+# lava reports & can check the checksum of the compressed image
+# after download.
+
+- job:
+    name: lava-debian-buster-amd64-vm
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 14
+        numToKeep: 5
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            platform-leads:
+                - job-build
+                - job-cancel
+    disabled: true
+    node: docker-stretch-amd64
+    display-name: 'LAVA - Build large amd64 Debian Buster VM'
+    wrappers:
+        - timestamps
+    builders:
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            export LANG=C
+
+            echo "deb http://mirror.bytemark.co.uk/debian stretch-backports main" > stretch-backports.list
+            sudo mv stretch-backports.list /etc/apt/sources.list.d/
+            sudo apt-get update
+            sudo apt-get install -y --no-install-recommends vmdebootstrap grub2-common
+
+            mkdir out
+            sudo vmdebootstrap \
+              --verbose \
+              --image=${WORKSPACE}/out/large-buster.img \
+              --size=3G \
+              --distribution=buster \
+              --mirror=http://mirror.bytemark.co.uk/debian \
+              --enable-dhcp \
+              --systemd-networkd \
+              --configure-apt \
+              --grub \
+              --serial-console \
+              --log=${WORKSPACE}/out/vmdebootstrap.log \
+              --log-level=debug \
+              --log-mode=0644
+
+            cat > ${WORKSPACE}/out/debian-buster-amd64-readme.html <<EOF
+            <html><body><pre>
+            lava-debian-buster-amd64-vm build instructions"
+            ===============================================
+
+            This image can be used for any tests on buster (django1.11 and
+            later).
+
+            The image uses a prompt of "root@debian:"
+            </pre>
+            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-buster-amd64-vm/">
+            https://ci.linaro.org/view/lava-ci/job/lava-debian-buster-amd64-vm/</a></p>
+
+            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-buster-amd64-vm/console">
+            https://ci.linaro.org/view/lava-ci/job/lava-debian-buster-amd64-vm/console</a></p>
+
+            <p><a href="https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-buster-amd64-vm.yaml">
+            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-buster-amd64-vm.yaml</a></p>
+
+            <p><a href="http://snapshots.linaro.org/components/lava/standard/debian/buster/amd64/${BUILD_NUMBER}">
+            http://snapshots.linaro.org/components/lava/standard/debian/buster/amd64/${BUILD_NUMBER}</a></p>
+
+
+            <pre>
+            The base system is a Debian Stretch VM with stretch-backports enabled.
+
+            echo "deb http://mirror.bytemark.co.uk/debian stretch-backports main" > stretch-backports.list
+            sudo mv stretch-backports.list /etc/apt/sources.list.d/
+            sudo apt-get update
+            sudo apt-get install -y --no-install-recommends -t stretch-backports vmdebootstrap grub2-common
+
+            See vmdebootstrap.log for the full log.
+            </pre></body></html>
+            EOF
+
+            gzip -9 ${WORKSPACE}/out/large-buster.img
+
+            md5sum ${WORKSPACE}/out/large-buster.img.gz > ${WORKSPACE}/out/large-buster.img.gz.md5sum.txt
+            sha256sum ${WORKSPACE}/out/large-buster.img.gz > ${WORKSPACE}/out/large-buster.img.gz.sha256sum.txt
+
+            # echo final location
+            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/buster/amd64/${BUILD_NUMBER}
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out components/lava/standard/debian/buster/amd64/${BUILD_NUMBER}
+    publishers:
+        - email:
+            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-buster-arm64.yaml b/lava-debian-buster-arm64.yaml
new file mode 100644
index 0000000000..aca3ae2764
--- /dev/null
+++ b/lava-debian-buster-arm64.yaml
@@ -0,0 +1,99 @@
+# Debian arm64 NFS, initramfs, modules and dtbs
+
+- job:
+    name: lava-debian-buster-arm64
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 14
+        numToKeep: 5
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            platform-leads:
+                - job-build
+                - job-cancel
+    disabled: true
+    node: docker-stretch-amd64
+    display-name: 'LAVA - Build ARM64 Debian Buster files'
+    wrappers:
+        - timestamps
+    builders:
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            mkdir out
+            cd out/
+            echo "deb http://mirror.bytemark.co.uk/debian stretch-backports main" > stretch-backports.list
+            sudo mv stretch-backports.list /etc/apt/sources.list.d/
+            sudo apt-get update
+            sudo DEBIAN_FRONTEND=noninteractive apt -q -y install qemu-user-static debootstrap python-guestfs
+            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-nfs.sh
+            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-image.sh
+            chmod 755 ./build-foreign-nfs.sh
+            chmod 755 ./build-foreign-image.sh
+            sudo ./build-foreign-nfs.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d buster
+            sudo ./build-foreign-image.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d buster
+            cd ..
+            cat > ${WORKSPACE}/out/debian-buster-arm64-readme.html <<EOF
+            <html><body><pre>
+            lava-debian-buster-arm64 build instructions
+            ========================================
+
+            This initramfs is built using update-initramfs inside a minimal
+            Debian Buster debootstrap chroot. The contents of the chroot is
+            then packaged up as an NFS with an empty root password.
+
+            apt is included in the NFS, as are bash, grep, iproute2, mawk and
+            sed. The NFS uses the default init in buster: systemd.
+
+            The Debian ARM64 kernel is a modular build and the modules
+            need to be available in the initramfs for the kernel to be
+            able to mount the NFS. The initramfs does not have DNS
+            support.
+
+            A similar chroot is created with systemd-sysv added. The chroot is
+            unpacked into an empty ext2 primary partition of an image:
+            buster-arm64.img The UUID of the partition is available as
+            buster-arm64.img.uuid.txt and should be appended to the kernel command
+            line using the root= argument when testing the image using QEMU in
+            LAVA to ensure that the correct drive is booted. The image has
+            systemd-networkd and systemd-resolved enabled to use DHCP on the
+            primary network interface.
+
+            When using the image and the UUID, ensure that you also use the
+            checksums to ensure that the UUID matches the files being
+            downloaded.
+
+            https://ci.linaro.org/view/lava-ci/job/lava-debian-buster-arm64/
+
+            The scripts used by jenkins are available here:
+            https://git.linaro.org/lava-team/refactoring.git/tree/HEAD:/scripts
+
+            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-buster-arm64.yaml
+            The base system is a Debian Buster VM.
+
+            The NFS rootfs and the image both use a prompt of "root@buster:" and
+            the same auto login details:
+                auto_login:
+                    login_prompt: 'login:'
+                    username: root
+
+            </pre></body></html>
+            EOF
+
+            # echo final location
+            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/buster/arm64/${BUILD_NUMBER}
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/buster/arm64/${BUILD_NUMBER}
+    publishers:
+        # - archive:
+        #    artifacts: 'out/*'
+        - email:
+            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-buster-armmp-armhf.yaml b/lava-debian-buster-armmp-armhf.yaml
new file mode 100644
index 0000000000..69080ceb8f
--- /dev/null
+++ b/lava-debian-buster-armmp-armhf.yaml
@@ -0,0 +1,81 @@
+# Debian Buster ARMMP armhf NFS, initramfs, modules and dtbs
+
+- job:
+    name: lava-debian-buster-armmp-armhf
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 24
+        numToKeep: 12
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            platform-leads:
+                - job-build
+                - job-cancel
+    disabled: true
+    node: docker-stretch-amd64
+    display-name: 'LAVA - Build ARMHF ARMMP Debian Buster files'
+    wrappers:
+        - timestamps
+    builders:
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            mkdir out
+            cd out/
+            echo "deb http://mirror.bytemark.co.uk/debian stretch-backports main" > stretch-backports.list
+            sudo mv stretch-backports.list /etc/apt/sources.list.d/
+            sudo apt-get update
+            sudo DEBIAN_FRONTEND=noninteractive apt -q -y install qemu-user-static debootstrap
+            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/armmp-nfs.sh
+            chmod 744 ./armmp-nfs.sh
+            sudo ./armmp-nfs.sh -d buster
+            cd ..
+            cat > ${WORKSPACE}/out/debian-buster-armmp-armhf-readme.html <<EOF
+            <html><body><pre>
+            lava-debian-buster-armmp-armhf build instructions
+            ===================================================
+
+            This initramfs is built using update-initramfs inside a
+            minimal Debian Buster debootstrap chroot.
+            The contents of the chroot is then packaged up as an NFS
+            with an empty root password.
+                auto_login:
+                    login_prompt: 'login:'
+                    username: root
+
+            apt is included in the NFS, as are bash, grep, iproute2, mawk and sed.
+            The NFS uses the default init in Buster: systemd.
+
+            The Debian ARMMP kernel is a modular build and the modules
+            need to be available in the initramfs for the kernel to be
+            able to mount the NFS. The initramfs does not have DNS
+            support.
+
+            https://ci.linaro.org/view/lava-ci/job/lava-debian-buster-armmp-armhf/
+
+            The script used by jenkins is available here:
+            https://git.linaro.org/lava-team/refactoring.git/blob/HEAD:/scripts/armmp-nfs.sh
+
+            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-buster-armmp-armhf.yaml
+            The base system is a Debian Buster VM.
+
+            The NFS rootfs uses a prompt of "root@buster:"
+
+            </pre></body></html>
+            EOF
+
+            # echo final location
+            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/buster/armhf/${BUILD_NUMBER}
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/buster/armhf/${BUILD_NUMBER}
+    publishers:
+        - email:
+            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-busybox-armhf-initramfs.yaml b/lava-debian-busybox-armhf-initramfs.yaml
deleted file mode 100644
index 5afa216023..0000000000
--- a/lava-debian-busybox-armhf-initramfs.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-# Minimal armhf initramfs
-
-- job:
-    name: lava-debian-busybox-armhf-initramfs
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARMHF minimal busybox initramfs'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/busybox-initramfs.sh
-            chmod 744 ./busybox-initramfs.sh
-            sudo ./busybox-initramfs.sh armhf
-
-            cat > ${WORKSPACE}/out/debian-busybox-armhf-initramfs-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-busybox-armhf-initramfs build instructions"
-            ================================================
-
-            This initramfs is based on busybox-static.
-            dpkg is available as a busybox applet but apt is not.
-            Other useful busybox applets include wget and ifconfig.
-            See https://packages.debian.org/jessie/busybox-static
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-busybox-armhf-initramfs/
-
-            The script used by jenkins is available here:
-            https://git.linaro.org/lava-team/refactoring.git/blob/HEAD:/scripts/busybox-initramfs.sh
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-busybox-armhf-initramfs.yaml
-            The base system is a Debian Jessie VM.
-
-            The initramfs uses a prompt of "root@busybox: #"
-
-            </pre></body></html>
-            EOF
-            mv initramfs-armhf.cpio.gz out/
-            md5sum ${WORKSPACE}/out/initramfs-armhf.cpio.gz > ${WORKSPACE}/out/initramfs-armhf.cpio.gz.md5sum.txt
-            sha256sum ${WORKSPACE}/out/initramfs-armhf.cpio.gz > ${WORKSPACE}/out/initramfs-armhf.cpio.gz.sha256sum.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out components/lava/standard/debian/busybox-initramfs/armhf/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-jessie-arm64.yaml b/lava-debian-jessie-arm64.yaml
deleted file mode 100644
index 2b4136c3fc..0000000000
--- a/lava-debian-jessie-arm64.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-# Debian arm64 NFS, initramfs, modules and dtbs
-
-- job:
-    name: lava-debian-jessie-arm64
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 24
-        numToKeep: 12
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARM64 Debian files'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-            cd out/
-            sudo apt -q update
-            sudo apt -q -y install qemu-user-static debootstrap
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-nfs.sh
-            chmod 744 ./build-foreign-nfs.sh
-            sudo ./build-foreign-nfs.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d jessie
-            cd ..
-            cat > ${WORKSPACE}/out/debian-arm64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-jessie-arm64 build instructions
-            ===========================================
-
-            This initramfs is built using update-initramfs inside a
-            minimal Debian Jessie debootstrap chroot.
-            The contents of the chroot is then packaged up as an NFS
-            with an empty root password.
-                auto_login:
-                    login_prompt: 'login:'
-                    username: root
-
-            apt is included in the NFS, as are bash, grep, iproute2, mawk and sed.
-            The NFS uses the default init in Jessie: systemd.
-
-            The Debian ARM64 kernel is a modular build and the modules
-            need to be available in the initramfs for the kernel to be
-            able to mount the NFS. The initramfs does not have DNS
-            support.
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-jessie-arm64/
-
-            The script used by jenkins is available here:
-            https://git.linaro.org/lava-team/refactoring.git/blob/HEAD:/scripts/armmp-nfs.sh
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-jessie-arm64.yaml
-            The base system is a Debian Jessie VM.
-
-            The NFS rootfs uses a prompt of "root@jessie:"
-
-            </pre></body></html>
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/jessie/arm64/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-large-stretch-amd64-vm.yaml b/lava-debian-large-stretch-amd64-vm.yaml
deleted file mode 100644
index 6d561d9cde..0000000000
--- a/lava-debian-large-stretch-amd64-vm.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-# Large image, expressly to be able to do lava-server tests inside
-# which needs lots of dependencies & space for postgresql.
-# for use testing with django1.10.
-
-# lava reports & can check the checksum of the compressed image
-# after download.
-
-- job:
-    name: lava-debian-large-stretch-amd64-vm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 90
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build large amd64 Debian Stretch VM'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export LANG=C
-            export APT_LISTCHANGES_FRONTEND=none
-            echo "deb http://mirror.bytemark.co.uk/debian stretch main" > stretch.list
-            sudo mv stretch.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends vmdebootstrap grub2-common
-            sudo apt-get clean
-
-            mkdir out
-            sudo vmdebootstrap \
-              --verbose \
-              --arch amd64 \
-              --image=${WORKSPACE}/out/large-stretch.img \
-              --size=3G \
-              --distribution=stretch \
-              --hostname debian \
-              --mirror=http://mirror.bytemark.co.uk/debian \
-              --enable-dhcp \
-              --systemd \
-              --configure-apt \
-              --grub \
-              --serial-console \
-              --log=${WORKSPACE}/out/vmdebootstrap.log \
-              --log-level=debug \
-              --log-mode=0644
-
-            gzip -9 ${WORKSPACE}/out/large-stretch.img
-
-            cat > ${WORKSPACE}/out/debian-large-stretch-amd64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-large-stretch-amd64-vm build instructions
-            =====================================================
-
-            This large image can be used for any tests on stretch (django1.10).
-
-            The image uses a prompt of "root@debian:"
-            </pre>
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-large-stretch-amd64-vm/">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-large-stretch-amd64-vm/</a></p>
-
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-large-stretch-amd64-vm/console">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-large-stretch-amd64-vm/console</a></p>
-
-            <p><a href="https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-large-stretch-amd64-vm.yaml">
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-large-stretch-amd64-vm.yaml</a></p>
-
-            <p><a href="http://snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/large/${BUILD_NUMBER}">
-            http://snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/large/${BUILD_NUMBER}</a></p>
-
-            <pre>
-            The build system is a Debian Jessie VM with stretch enabled.
-
-            echo "deb http://mirror.bytemark.co.uk/debian stretch main" > stretch.list
-            sudo mv stretch.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends vmdebootstrap grub2-common
-
-            See vmdebootstrap.log for the full log.
-            </pre></body></html>
-            EOF
-
-            md5sum ${WORKSPACE}/out/large-stretch.img.gz > ${WORKSPACE}/out/large-stretch.img.gz.md5sum.txt
-            sha256sum ${WORKSPACE}/out/large-stretch.img.gz > ${WORKSPACE}/out/large-stretch.img.gz.sha256sum.txt
-
-            # echo final location
-            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/large/${BUILD_NUMBER}
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/stretch/amd64/large/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-sid-arm64.yaml b/lava-debian-sid-arm64.yaml
deleted file mode 100644
index 9a0ca4636d..0000000000
--- a/lava-debian-sid-arm64.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# Debian arm64 NFS, initramfs, modules and dtbs
-
-- job:
-    name: lava-debian-sid-arm64
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 14
-        numToKeep: 5
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARM64 Debian unstable files'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-            cd out/
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y -t jessie-backports install qemu-user-static debootstrap
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y install python-guestfs
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-nfs.sh
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-image.sh
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/guest-img.py
-            sudo ./build-foreign-nfs.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d sid
-            sudo ./build-foreign-image.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d sid
-            cd ..
-            cat > ${WORKSPACE}/out/debian-arm64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-sid-arm64 build instructions
-            ========================================
-
-            This initramfs is built using update-initramfs inside a minimal
-            Debian Unstable debootstrap chroot. The contents of the chroot is
-            then packaged up as an NFS with an empty root password.
-
-            apt is included in the NFS, as are bash, grep, iproute2, mawk and
-            sed. The NFS uses the default init in unstable: systemd.
-
-            The Debian ARM64 kernel is a modular build and the modules
-            need to be available in the initramfs for the kernel to be
-            able to mount the NFS. The initramfs does not have DNS
-            support.
-
-            A similar chroot is created with systemd-sysv added. The chroot is
-            unpacked into an empty ext2 primary partition of an image:
-            sid-arm64.img The UUID of the partition is available as
-            sid-arm64.img.uuid.txt and should be appended to the kernel command
-            line using the root= argument when testing the image using QEMU in
-            LAVA to ensure that the correct drive is booted. The image has
-            systemd-networkd and systemd-resolved enabled to use DHCP on the
-            primary network interface.
-
-            When using the image and the UUID, ensure that you also use the
-            checksums to ensure that the UUID matches the files being
-            downloaded.
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-sid-arm64/
-
-            The scripts used by jenkins are available here:
-            https://git.linaro.org/lava-team/refactoring.git/tree/HEAD:/scripts
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-sid-arm64.yaml
-            The base system is a Debian Unstable VM.
-
-            The NFS rootfs and the image both use a prompt of "root@sid:" and
-            the same auto login details:
-                auto_login:
-                    login_prompt: 'login:'
-                    username: root
-
-            </pre></body></html>
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/sid/arm64/${BUILD_NUMBER}
-    publishers:
-        # - archive:
-        #    artifacts: 'out/*'
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-stable-amd64-vm.yaml b/lava-debian-stable-amd64-vm.yaml
deleted file mode 100644
index 0dcf06e762..0000000000
--- a/lava-debian-stable-amd64-vm.yaml
+++ /dev/null
@@ -1,106 +0,0 @@
-# Large image, expressly to be able to do lava-server tests inside
-# which needs lots of dependencies & space for postgresql.
-# for use testing with django1.7.
-
-# lava reports & can check the checksum of the compressed image
-# after download.
-
-- job:
-    name: lava-debian-stable-amd64-vm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 90
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build large amd64 Debian Jessie VM'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export LANG=C
-
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends -t jessie-backports vmdebootstrap grub2-common
-
-            mkdir out
-            sudo vmdebootstrap \
-              --verbose \
-              --image=${WORKSPACE}/out/large-stable.img \
-              --size=3G \
-              --distribution=jessie \
-              --mirror=http://mirror.bytemark.co.uk/debian \
-              --enable-dhcp \
-              --configure-apt \
-              --grub \
-              --serial-console \
-              --log=${WORKSPACE}/out/vmdebootstrap.log \
-              --log-level=debug \
-              --log-mode=0644
-
-            cat > ${WORKSPACE}/out/debian-jessie-amd64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-stable-amd64-vm build instructions"
-            ================================================
-
-            This image can be used for any tests on jessie (django1.7).
-
-            The image uses a prompt of "root@debian:"
-            </pre>
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-stable-amd64-vm/">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-stable-amd64-vm/</a></p>
-
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-stable-amd64-vm/console">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-stable-amd64-vm/console</a></p>
-
-            <p><a href="https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-stable-amd64-vm.yaml">
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-stable-amd64-vm.yaml</a></p>
-
-            <p><a href="http://snapshots.linaro.org/components/lava/standard/debian/jessie/amd64/${BUILD_NUMBER}">
-            http://snapshots.linaro.org/components/lava/standard/debian/jessie/amd64/${BUILD_NUMBER}</a></p>
-
-            <pre>
-            The base system is a Debian Jessie VM with jessie-backports enabled.
-
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends -t jessie-backports vmdebootstrap grub2-common
-
-            See vmdebootstrap.log for the full log.
-            </pre></body></html>
-            EOF
-
-            gzip -9 ${WORKSPACE}/out/large-stable.img
-
-            md5sum ${WORKSPACE}/out/large-stable.img.gz > ${WORKSPACE}/out/large-stable.img.gz.md5sum.txt
-            sha256sum ${WORKSPACE}/out/large-stable.img.gz > ${WORKSPACE}/out/large-stable.img.gz.sha256sum.txt
-
-            # echo final location
-            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/jessie/amd64/${BUILD_NUMBER}
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out components/lava/standard/debian/jessie/amd64/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/*'
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-stretch-amd64-vm.yaml b/lava-debian-stretch-amd64-vm.yaml
deleted file mode 100644
index ca829e4eb2..0000000000
--- a/lava-debian-stretch-amd64-vm.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-# Ordinary 1G image for quick, simple test jobs.
-
-# lava reports & can check the checksum of the compressed image
-# after download.
-
-- job:
-    name: lava-debian-stretch-amd64-vm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 90
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build amd64 Debian Stretch VM'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export LANG=C
-            export APT_LISTCHANGES_FRONTEND=none
-            echo "deb http://mirror.bytemark.co.uk/debian stretch main" > stretch.list
-            sudo mv stretch.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends vmdebootstrap grub2-common
-
-            mkdir out
-            sudo vmdebootstrap \
-              --verbose \
-              --arch amd64 \
-              --image=${WORKSPACE}/out/stretch.img \
-              --size=1G \
-              --distribution=stretch \
-              --hostname debian \
-              --mirror=http://mirror.bytemark.co.uk/debian \
-              --enable-dhcp \
-              --systemd \
-              --configure-apt \
-              --grub \
-              --serial-console \
-              --log=${WORKSPACE}/out/vmdebootstrap.log \
-              --log-level=debug \
-              --log-mode=0644
-
-            cat > ${WORKSPACE}/out/debian-stretch-amd64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-stretch-amd64-vm build instructions
-            ===============================================
-
-            This small image can be used for some tests on stretch. For tests
-            involving django (1.10 in stretch) or LAVA, use the large-stretch
-            image to provide enough space to install lots of dependencies.
-
-            The image uses a prompt of "root@debian:"
-            </pre>
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-stretch-amd64-vm/">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-stretch-amd64-vm/</a></p>
-
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-stretch-amd64-vm/console">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-stretch-amd64-vm/console</a></p>
-
-            <p><a href="https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-stretch-amd64-vm.yaml">
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-stretch-amd64-vm.yaml</a></p>
-
-            <p><a href="http://snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/${BUILD_NUMBER}">
-            http://snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/${BUILD_NUMBER}</a></p>
-
-            <pre>
-            The build system is a Debian Jessie VM with stretch enabled.
-
-            echo "deb http://mirror.bytemark.co.uk/debian stretch main" > stretch.list
-            sudo mv stretch.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends vmdebootstrap grub2-common
-
-            See vmdebootstrap.log for the full log.
-            </pre></body></html>
-            EOF
-
-            gzip -9 ${WORKSPACE}/out/stretch.img
-
-            md5sum ${WORKSPACE}/out/stretch.img.gz > ${WORKSPACE}/out/stretch.img.gz.md5sum.txt
-            sha256sum ${WORKSPACE}/out/stretch.img.gz > ${WORKSPACE}/out/stretch.img.gz.sha256sum.txt
-
-            # echo final location
-            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/stretch/amd64/${BUILD_NUMBER}
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/stretch/amd64/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-stretch-arm64.yaml b/lava-debian-stretch-arm64.yaml
deleted file mode 100644
index ca8c9e56aa..0000000000
--- a/lava-debian-stretch-arm64.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-# Debian arm64 NFS, initramfs, modules and dtbs
-
-- job:
-    name: lava-debian-stretch-arm64
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 14
-        numToKeep: 5
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARM64 Debian Stretch files'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-            cd out/
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y -t jessie-backports install qemu-user-static debootstrap
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y install python-guestfs
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-nfs.sh
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/build-foreign-image.sh
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/guest-img.py
-            chmod 744 ./build-foreign-nfs.sh
-            chmod 744 ./build-foreign-image.sh
-            sudo ./build-foreign-nfs.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d stretch
-            sudo ./build-foreign-image.sh -a arm64 -b /usr/bin/qemu-aarch64-static -d stretch
-            cd ..
-            cat > ${WORKSPACE}/out/debian-arm64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-stretch-arm64 build instructions
-            ========================================
-
-            This initramfs is built using update-initramfs inside a minimal
-            Debian Unstable debootstrap chroot. The contents of the chroot is
-            then packaged up as an NFS with an empty root password.
-
-            apt is included in the NFS, as are bash, grep, iproute2, mawk and
-            sed. The NFS uses the default init in unstable: systemd.
-
-            The Debian ARM64 kernel is a modular build and the modules
-            need to be available in the initramfs for the kernel to be
-            able to mount the NFS. The initramfs does not have DNS
-            support.
-
-            A similar chroot is created with systemd-sysv added. The chroot is
-            unpacked into an empty ext2 primary partition of an image:
-            stretch-arm64.img The UUID of the partition is available as
-            stretch-arm64.img.uuid.txt and should be appended to the kernel command
-            line using the root= argument when testing the image using QEMU in
-            LAVA to ensure that the correct drive is booted. The image has
-            systemd-networkd and systemd-resolved enabled to use DHCP on the
-            primary network interface.
-
-            When using the image and the UUID, ensure that you also use the
-            checksums to ensure that the UUID matches the files being
-            downloaded.
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-stretch-arm64/
-
-            The scripts used by jenkins are available here:
-            https://git.linaro.org/lava-team/refactoring.git/tree/HEAD:/scripts
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-stretch-arm64.yaml
-            The base system is a Debian Unstable VM.
-
-            The NFS rootfs and the image both use a prompt of "root@stretch:" and
-            the same auto login details:
-                auto_login:
-                    login_prompt: 'login:'
-                    username: root
-
-            </pre></body></html>
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/stretch/arm64/${BUILD_NUMBER}
-    publishers:
-        # - archive:
-        #    artifacts: 'out/*'
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-stretch-armmp-armhf.yaml b/lava-debian-stretch-armmp-armhf.yaml
deleted file mode 100644
index 7c1556b637..0000000000
--- a/lava-debian-stretch-armmp-armhf.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-# Debian ARMMP armhf NFS, initramfs, modules and dtbs
-
-- job:
-    name: lava-debian-stretch-armmp-armhf
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 24
-        numToKeep: 12
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARMHF ARMMP Debian Stretch files'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-            cd out/
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y -t jessie-backports install qemu-user-static debootstrap
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/armmp-nfs.sh
-            chmod 744 ./armmp-nfs.sh
-            sudo ./armmp-nfs.sh -d stretch
-            cd ..
-            cat > ${WORKSPACE}/out/debian-stretch-armmp-armhf-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-stretch-armmp-armhf build instructions
-            ==================================================
-
-            This initramfs is built using update-initramfs inside a
-            minimal Debian Stretch debootstrap chroot.
-            The contents of the chroot is then packaged up as an NFS
-            with an empty root password.
-                auto_login:
-                    login_prompt: 'login:'
-                    username: root
-
-            apt is included in the NFS, as are bash, grep, iproute2, mawk and sed.
-            The NFS uses the default init in Stretch: systemd.
-
-            The Debian ARMMP kernel is a modular build and the modules
-            need to be available in the initramfs for the kernel to be
-            able to mount the NFS. The initramfs does not have DNS
-            support.
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-stretch-armmp-armhf/
-
-            The script used by jenkins is available here:
-            https://git.linaro.org/lava-team/refactoring.git/blob/HEAD:/scripts/armmp-nfs.sh
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-armmp-armhf.yaml
-            The base system is a Debian Stretch VM.
-
-            The NFS rootfs uses a prompt of "root@stretch:"
-
-            </pre></body></html>
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/stretch/armhf/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-unstable-amd64-vm.yaml b/lava-debian-unstable-amd64-vm.yaml
deleted file mode 100644
index 4387d363ee..0000000000
--- a/lava-debian-unstable-amd64-vm.yaml
+++ /dev/null
@@ -1,108 +0,0 @@
-# Large image, expressly to be able to do lava-server tests inside
-# which needs lots of dependencies & space for postgresql.
-# able to use lava packages from Debian unstable for django1.10
-# and python3 testing.
-
-# lava reports & can check the checksum of the compressed image
-# after download.
-
-- job:
-    name: lava-debian-unstable-amd64-vm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 14
-        numToKeep: 5
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-stretch-amd64
-    display-name: 'LAVA - Build large amd64 Debian Sid VM'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export LANG=C
-
-            echo "deb http://mirror.bytemark.co.uk/debian stretch-backports main" > stretch-backports.list
-            sudo mv stretch-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends vmdebootstrap grub2-common
-
-            mkdir out
-            sudo vmdebootstrap \
-              --verbose \
-              --image=${WORKSPACE}/out/large-sid.img \
-              --size=3G \
-              --distribution=unstable \
-              --mirror=http://mirror.bytemark.co.uk/debian \
-              --enable-dhcp \
-              --systemd-networkd \
-              --configure-apt \
-              --grub \
-              --serial-console \
-              --log=${WORKSPACE}/out/vmdebootstrap.log \
-              --log-level=debug \
-              --log-mode=0644
-
-            cat > ${WORKSPACE}/out/debian-sid-amd64-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-unstable-amd64-vm build instructions"
-            ================================================
-
-            This image can be used for any tests on sid (django1.9 and
-            later).
-
-            The image uses a prompt of "root@debian:"
-            </pre>
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-unstable-amd64-vm/">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-unstable-amd64-vm/</a></p>
-
-            <p><a href="https://ci.linaro.org/view/lava-ci/job/lava-debian-unstable-amd64-vm/console">
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-unstable-amd64-vm/console</a></p>
-
-            <p><a href="https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-unstable-amd64-vm.yaml">
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-unstable-amd64-vm.yaml</a></p>
-
-            <p><a href="http://snapshots.linaro.org/components/lava/standard/debian/sid/amd64/${BUILD_NUMBER}">
-            http://snapshots.linaro.org/components/lava/standard/debian/sid/amd64/${BUILD_NUMBER}</a></p>
-
-
-            <pre>
-            The base system is a Debian Stretch VM with stretch-backports enabled.
-
-            echo "deb http://mirror.bytemark.co.uk/debian stretch-backports main" > stretch-backports.list
-            sudo mv stretch-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends -t jessie-backports vmdebootstrap grub2-common
-
-            See vmdebootstrap.log for the full log.
-            </pre></body></html>
-            EOF
-
-            gzip -9 ${WORKSPACE}/out/large-sid.img
-
-            md5sum ${WORKSPACE}/out/large-sid.img.gz > ${WORKSPACE}/out/large-sid.img.gz.md5sum.txt
-            sha256sum ${WORKSPACE}/out/large-sid.img.gz > ${WORKSPACE}/out/large-sid.img.gz.sha256sum.txt
-
-            # echo final location
-            echo Publishing to: http://snapshots.linaro.org/components/lava/standard/debian/sid/amd64/${BUILD_NUMBER}
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out components/lava/standard/debian/sid/amd64/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-debian-unstable-armmp-armhf.yaml b/lava-debian-unstable-armmp-armhf.yaml
deleted file mode 100644
index 2e422b0d0b..0000000000
--- a/lava-debian-unstable-armmp-armhf.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-# Debian Untable ARMMP armhf NFS, initramfs, modules and dtbs
-
-- job:
-    name: lava-debian-unstable-armmp-armhf
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 24
-        numToKeep: 12
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            platform-leads:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'LAVA - Build ARMHF ARMMP Debian Unstable files'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            mkdir out
-            cd out/
-            echo "deb http://mirror.bytemark.co.uk/debian jessie-backports main" > jessie-backports.list
-            sudo mv jessie-backports.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo DEBIAN_FRONTEND=noninteractive apt -q -y -t jessie-backports install qemu-user-static debootstrap
-            wget https://git.linaro.org/lava-team/refactoring.git/blob_plain/HEAD:/scripts/armmp-nfs.sh
-            chmod 744 ./armmp-nfs.sh
-            sudo ./armmp-nfs.sh -d unstable
-            cd ..
-            cat > ${WORKSPACE}/out/debian-unstable-armmp-armhf-readme.html <<EOF
-            <html><body><pre>
-            lava-debian-unstable-armmp-armhf build instructions
-            ===================================================
-
-            This initramfs is built using update-initramfs inside a
-            minimal Debian Unstable debootstrap chroot.
-            The contents of the chroot is then packaged up as an NFS
-            with an empty root password.
-                auto_login:
-                    login_prompt: 'login:'
-                    username: root
-
-            apt is included in the NFS, as are bash, grep, iproute2, mawk and sed.
-            The NFS uses the default init in Unstable: systemd.
-
-            The Debian ARMMP kernel is a modular build and the modules
-            need to be available in the initramfs for the kernel to be
-            able to mount the NFS. The initramfs does not have DNS
-            support.
-
-            https://ci.linaro.org/view/lava-ci/job/lava-debian-unstable-armmp-armhf/
-
-            The script used by jenkins is available here:
-            https://git.linaro.org/lava-team/refactoring.git/blob/HEAD:/scripts/armmp-nfs.sh
-
-            https://git.linaro.org/ci/job/configs.git/blob/HEAD:/lava-debian-armmp-armhf.yaml
-            The base system is a Debian Unstable VM.
-
-            The NFS rootfs uses a prompt of "root@unstable:"
-
-            </pre></body></html>
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 out components/lava/standard/debian/sid/armhf/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'neil.williams@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-dispatcher-docker-production-stretch-amd64.yaml b/lava-dispatcher-docker-production-stretch-amd64.yaml
deleted file mode 100644
index 9580d2aa3a..0000000000
--- a/lava-dispatcher-docker-production-stretch-amd64.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- job:
-    name: lava-dispatcher-docker
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build-amd64
-    display-name: 'LAVA Dispatcher Production Docker images'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/dockerfiles.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-    triggers:
-        - pollurl:
-            cron: '@daily'
-            urls:
-              - url: 'http://images.validation.linaro.org/production-repo/services-trace.txt'
-            check-content:
-              - simple: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-                rm -rf ${HOME}/.docker
-            }
-
-            mkdir -p ${HOME}/.docker
-            sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-            chmod 0600 ${HOME}/.docker/config.json
-
-            # Build
-            pushd dockerfiles/lava/dispatcher/production/stretch-amd64
-            rm -f .docker-tag
-            ./build.sh
-            # push to linaro/lava-dispatcher-production-stretch-amd64:2018.2-1
-            docker push $(cat .docker-tag)
-            popd
-    publishers:
-        - email:
-            recipients: 'senthil.kumaran@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org'
diff --git a/lava-dispatcher-docker/builders.sh b/lava-dispatcher-docker/builders.sh
new file mode 100755
index 0000000000..1f06648ced
--- /dev/null
+++ b/lava-dispatcher-docker/builders.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+  rm -rf ${HOME}/.docker
+}
+
+mkdir -p ${HOME}/.docker
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+chmod 0600 ${HOME}/.docker/config.json
+
+# Build
+pushd lava/dispatcher
+rm -f .docker-tag
+./build.sh -r ${REPOSITORY} -d stretch -a amd64
+# push to linaro/lava-dispatcher-${REPOSITORY}-stretch-amd64:${docker_tag}
+docker push $(cat .docker-tag)
+popd
diff --git a/lava-dispatcher.yaml b/lava-dispatcher.yaml
deleted file mode 100644
index 340be88314..0000000000
--- a/lava-dispatcher.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-- job:
-    name: lava-dispatcher
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: lavabot
-    display-name: 'PEP8 and Unit Test CI Job for lava-dispatcher'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            trigger-for-unreviewed-patches: true
-            readable-message: false
-            successful-message: 'PEP8 and Units Tests Successful'
-            start-message: 'PEP8 and Units Tests Started'
-            failure-message: 'PEP8 and Units Tests Failed'
-            custom-url: '${BUILD_URL}/console'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'lava/lava-dispatcher'
-                  branches:
-                    - branch-compare-type: 'PLAIN'
-                      branch-pattern: 'master'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-            cd /
-            rm -rf ${WORKSPACE}
-            mkdir -p ${WORKSPACE}
-            cd ${WORKSPACE}
-            git clone -b ${GERRIT_BRANCH} https://git.linaro.org/${GERRIT_PROJECT} lava-checkout
-            cd lava-checkout
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            set +x
-            git checkout -q FETCH_HEAD
-            git log -n3
-            set -e
-            echo
-            echo "Running test for python2 and 3"
-            echo
-            ./ci-run -a
-            echo
-            echo "Running package test build"
-            echo
-            /usr/share/lava-server/debian-dev-build.sh -p lava-dispatcher
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
diff --git a/lava-lab-sanity-check.yaml b/lava-lab-sanity-check.yaml
index cd3164a9cf..793cd3f2ce 100644
--- a/lava-lab-sanity-check.yaml
+++ b/lava-lab-sanity-check.yaml
@@ -13,6 +13,17 @@
     disabled: false
     node: build
     display-name: 'LAVA lab sanity check'
+    scm:
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: lava-lab
     triggers:
         - gerrit:
             server-name: 'review.linaro.org'
@@ -22,7 +33,8 @@
             readable-message: true
             successful-message: 'Sanity Check Successful'
             start-message: 'Sanity Check Started'
-            failure-message: 'Sanity Check Failed'
+            # failure-message: 'Sanity Check Failed'
+            failure-message-file: selfcheck.log
             trigger-for-unreviewed-patches: true
             projects:
                 - project-compare-type: 'PLAIN'
@@ -34,26 +46,39 @@
         - timestamps
     builders:
         - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - shell: |
             #!/bin/bash
 
-            rm -rf ${WORKSPACE}/*
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+            set -e
 
-            git clone -b ${GERRIT_BRANCH} --depth 3 https://git.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
+            rm ${WORKSPACE}/selfcheck.log | true
+            echo ""
+            echo "########################################################################"
+            echo "    Gerrit Environment"
+            env |grep '^GERRIT'
+            echo "########################################################################"
 
-            # run check-devices.py
-            set -e
-            git clone --depth 1 https://git.linaro.org/lava/lava-server.git ${WORKSPACE}/lava-server
-            RUNS=`find . -name devices -type d | xargs dirname`
-            for RUN in ${RUNS}; do
-                # skips staging - check that manually.
-                if [ -d ${RUN}/device-types ]; then
-                    ${WORKSPACE}/lava-server/share/check-devices.py  --device-types ${RUN}/device-types --devices ${RUN}/devices
-                fi
-            done
+            cd lava-lab/
+            ./test-all.sh | tee ${WORKSPACE}/selfcheck.log
+
+            exit_code=0
+            # check for health check errors
+            if (grep invalid ${WORKSPACE}/selfcheck.log); then
+                exit_code=1
+                echo "Health checks failed"
+            fi
+
+            # check for device dict errors
+            if (grep -v environment ${WORKSPACE}/selfcheck.log | grep ERROR); then
+                exit_code=1
+                echo "Device dicts failed"
+            fi
+            exit ${exit_code}
         - build-name-setter:
             name: 'version.txt'
             file: true
diff --git a/lava-server.yaml b/lava-server.yaml
deleted file mode 100644
index b061102058..0000000000
--- a/lava-server.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-- job:
-    name: lava-server
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: lavabot
-    display-name: 'PEP8 and Unit Test CI Job for lava-server'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            trigger-for-unreviewed-patches: true
-            readable-message: false
-            successful-message: 'PEP8 and Units Tests Successful'
-            start-message: 'PEP8 and Units Tests Started'
-            failure-message: 'PEP8 and Units Tests Failed'
-            custom-url: '${BUILD_URL}/console'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'lava/lava-server'
-                  branches:
-                    - branch-compare-type: 'PLAIN'
-                      branch-pattern: 'master'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-            cd /
-            rm -rf ${WORKSPACE}
-            mkdir -p ${WORKSPACE}
-            cd ${WORKSPACE}
-            git clone -b ${GERRIT_BRANCH} https://git.linaro.org/${GERRIT_PROJECT} lava-checkout
-            cd lava-checkout
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            set +x
-            git checkout -q FETCH_HEAD
-            git log -n3
-
-            ./ci-run
-            echo
-            echo "Running package test build"
-            echo
-            /usr/share/lava-server/debian-dev-build.sh -p lava-server
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
diff --git a/lava-tool.yaml b/lava-tool.yaml
deleted file mode 100644
index 2a1c05a262..0000000000
--- a/lava-tool.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- job:
-    name: lava-tool
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: lavabot
-    display-name: 'PEP8 and Unit Test CI Job for lava-tool'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            trigger-for-unreviewed-patches: true
-            readable-message: false
-            successful-message: 'PEP8 and Units Tests Successful'
-            start-message: 'PEP8 and Units Tests Started'
-            failure-message: 'PEP8 and Units Tests Failed'
-            custom-url: '${BUILD_URL}/console'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'lava/lava-tool'
-                  branches:
-                    - branch-compare-type: 'PLAIN'
-                      branch-pattern: 'master'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-            cd /
-            rm -rf ${WORKSPACE}
-            mkdir -p ${WORKSPACE}
-            cd ${WORKSPACE}
-            git clone -b ${GERRIT_BRANCH} https://git.linaro.org/${GERRIT_PROJECT} lava-checkout
-            cd lava-checkout
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            set +x
-            git checkout -q FETCH_HEAD
-            git log -n3
-            find . -name '*.pyc' -delete
-            rm -rf ./lava_tool.egg-info
-
-            ./ci-run
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
diff --git a/ldcg-bigdata-apache-arrow/build.sh b/ldcg-bigdata-apache-arrow/build.sh
new file mode 100644
index 0000000000..6b8465466e
--- /dev/null
+++ b/ldcg-bigdata-apache-arrow/build.sh
@@ -0,0 +1,32 @@
+#!/bin/sh
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -rf ${HOME}/.docker
+}
+
+mkdir -p ${HOME}/.docker
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+chmod 0600 ${HOME}/.docker/config.json
+
+rm -rf ${WORKSPACE}/*
+
+git clone --depth 1 https://github.com/apache/arrow.git
+
+cd arrow/dev/tasks/linux-packages/
+
+# change ownership of resulting packages to buildslave user so we can remove
+# them without sudo use. "apt/build.sh" is called in a container as root user
+echo "chown $(id -u buildslave):$(id -g buildslave) -R /host/repositories" >> apt/build.sh
+
+rake version:update
+APT_TARGETS=debian-buster rake apt:build
+
+mkdir -p ${WORKSPACE}/out
+cp -a apache-arrow/apt/repositories/* ${WORKSPACE}/out/
+echo "DEPLOY_DIR_IMAGE=${WORKSPACE}/out" >  ${WORKSPACE}/publish_parameters
+echo "PUB_DEST=reference-platform/components/bigdata/apache-arrow/${BUILD_NUMBER}" >>  ${WORKSPACE}/publish_parameters
diff --git a/ldcg-bigdata-apache-drill.yaml b/ldcg-bigdata-apache-drill.yaml
new file mode 100644
index 0000000000..8bf19de810
--- /dev/null
+++ b/ldcg-bigdata-apache-drill.yaml
@@ -0,0 +1,43 @@
+- job:
+    name: ldcg-bigdata-apache-drill
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: docker-stretch-arm64-ldcg
+    display-name: 'LDCG BigData Apache Drill'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-bigdata-apache-drill/build.sh
+        - shell: |
+            #!/bin/bash
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --link-latest \
+              out reference-platform/components/bigdata/apache-drill/${BUILD_NUMBER}
+
+            rm -rf out
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org marcin.juszkiewicz@linaro.org ganesh.raju@linaro.org'
diff --git a/ldcg-bigdata-apache-drill/build.sh b/ldcg-bigdata-apache-drill/build.sh
new file mode 100644
index 0000000000..3b82c2c9ad
--- /dev/null
+++ b/ldcg-bigdata-apache-drill/build.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+echo "deb http://obs.linaro.org/ERP:/18.06/Debian_9 ./" | sudo tee /etc/apt/sources.list.d/erp-18.06.list
+echo "deb http://obs.linaro.org/ERP:/18.12/Debian_9 ./" | sudo tee /etc/apt/sources.list.d/erp-18.12.list
+
+sudo apt -q=2 update
+sudo apt -q=2 upgrade -y
+sudo apt -q=2 install -y --no-install-recommends maven git openjdk-8-jdk-headless rpm
+
+# Whole history is required
+git clone https://git.linaro.org/leg/bigdata/drill.git
+
+cd drill
+
+mvn clean -X package -Pdeb -Prpm -DskipTests
+
+mkdir -p ${WORKSPACE}/out
+cp -a distribution/target/apache-drill-*/*.deb ${WORKSPACE}/out/
+cp -a distribution/target/rpm/apache-drill/RPMS/noarch/*.rpm ${WORKSPACE}/out/
+
+sudo chown -R buildslave:buildslave ${WORKSPACE}/out
diff --git a/ldcg-container-pytorch.yaml b/ldcg-container-pytorch.yaml
new file mode 100644
index 0000000000..2013d17f15
--- /dev/null
+++ b/ldcg-container-pytorch.yaml
@@ -0,0 +1,36 @@
+- job:
+    name: ldcg-container-pytorch
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    disabled: true
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'LDCG Pytorch containers'
+    wrappers:
+        - timestamps
+        - copy-to-slave:
+            includes:
+                - config.json
+            relative-to: 'somewhereElse'
+        - credentials-binding:
+            - text:
+                credential-id: DOCKER_AUTH
+                variable: DOCKER_AUTH
+    builders:
+        - shell:
+            !include-raw: ldcg-python-pytorch-vision/build-containers.sh
+    publishers:
+        - email:
+            recipients: 'paul.isaacs@linaro.org marcin.juszkiewicz@linaro.org'
diff --git a/ldcg-onednn-benchmarks.yaml b/ldcg-onednn-benchmarks.yaml
new file mode 100644
index 0000000000..18afa9c1ae
--- /dev/null
+++ b/ldcg-onednn-benchmarks.yaml
@@ -0,0 +1,62 @@
+- job:
+    name: ldcg-onednn-benchmarks
+    display-name: 'OneDNN - CI Benchmark'
+    project-type: freestyle
+    defaults: global
+    description: |
+        Updates source and builds OneDNN and ACL frequently for benchmark testing.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://github.com/oneapi-src/oneDNN.git
+    disabled: false
+    node: d05bench
+    concurent: false
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: ldcg-onednn-benchmarks/build-onednn-acl.sh
+        - shell:
+            !include-raw: ldcg-onednn-benchmarks/test-onednn.sh
+        - shell: |
+            #!/bin/bash -ex
+
+            if [ ! -d "${WORKSPACE}" ]; then
+              set -x
+              WORKSPACE=$(pwd)
+            else
+              set -ex
+            fi
+
+            if [ -f "${WORKSPACE}"/format-tests.sh ]; then
+                rm -r "${WORKSPACE}"/format-tests.sh
+            fi
+
+            wget https://git.linaro.org/ci/job/configs.git/plain/ldcg-onednn-benchmarks/format-tests.sh
+
+            sh format-tests.sh
+
+            curl \
+                --header "Auth-Token: $QA_REPORTS_TOKEN" \
+                --form tests=@"${WORKSPACE}"/oneDNN-results/final_full-oneDNN-results.json \
+                https://qa-reports.linaro.org/api/submit/ldcg/onednn/"${BUILD_NUMBER}"/d05
+
+    publisher:
+        - email:
+            recipients: 'theodore.grey@linaro.org andrew.goodbody@linaro.org'
diff --git a/ldcg-onednn-benchmarks/build-onednn-acl.sh b/ldcg-onednn-benchmarks/build-onednn-acl.sh
new file mode 100644
index 0000000000..149f51b2e3
--- /dev/null
+++ b/ldcg-onednn-benchmarks/build-onednn-acl.sh
@@ -0,0 +1,32 @@
+#!/bin/bash -ex
+
+if [ ! -d "${WORKSPACE}" ]; then
+    set -x
+    WORKSPACE=$(pwd)
+else
+    set -ex
+fi
+
+if [ -d "${WORKSPACE}"/ComputeLibrary ]; then
+    rm -rf "${WORKSPACE}"/ComputeLibrary
+fi
+
+if [ -d "${WORKSPACE}"/oneDNN ]; then
+    rm -rf "${WORKSPACE}"/oneDNN
+fi
+
+git clone https://github.com/ARM-software/ComputeLibrary.git
+git clone https://github.com/oneapi-src/oneDNN.git
+
+export PATH=/usr/local/bin:$PATH
+
+#build ACL
+cd ${WORKSPACE}/ComputeLibrary
+scons Werror=0 -j$(nproc) debug=0 neon=1 opencl=0 os=linux arch=arm64-v8a build=native install_dir=${WORKSPACE}/ComputeLibrary/acl
+
+#build oneDNN with acl support
+cd ${WORKSPACE}/oneDNN
+cmake -DDNL_AARCH64_USE_ACL=ON -DCMAKE_INSTALL_PREFIX=/usr/local -DCMAKE_CXX_COMPILER=/usr/local/bin/g++ -DCMAKE_C_COMPILER=/usr/local/bin/gcc
+make -j$(nproc)
+
+export ACL_ROOT_DIR=${WORKSPACE}/ComputeLibrary/acl
diff --git a/ldcg-onednn-benchmarks/convert-onednn-test-to-result.py b/ldcg-onednn-benchmarks/convert-onednn-test-to-result.py
new file mode 100644
index 0000000000..e7d4ec88cf
--- /dev/null
+++ b/ldcg-onednn-benchmarks/convert-onednn-test-to-result.py
@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+import sys
+
+testname = sys.argv[1] #takes testname as input
+workspace = sys.argv[2] #takes WORKSPACE root dir as input
+
+
+#opens the textfile corresponding to the testname from the tmp directory and saves it to pippo
+with open(workspace + "/oneDNN-results/" + testname + "-output.txt", 'r') as handle:
+    pippo = handle.readlines()
+
+#reads through each line of the testname and checks for PASS/FAIL results proving that the test has been completed correctly. If they exist then it adds them to a res_{testname}.txt file in SQUAD format.
+with open(workspace + "/oneDNN-results/res_" + testname + "-output.txt", 'w+') as whandle:
+    TestSuccess = False
+    TestFailed = False
+    for i in range(0,len(pippo)-2):
+        line = pippo[i]
+        line = line[2:]
+        if 'FAILED' in pippo[i]:
+            TestSuccess = True
+            TestFailed = True
+            break
+        elif 'PASSED' in pippo[i]:
+            if TestSuccess == False:
+                TestSuccess = True
+
+    #if no PASS/FAIL results only writes "{testname} : fail" to the result.
+    if TestSuccess == False or TestFailed == True:
+        whandle.write("\"" + testname + "\"" + ": " + "\"" + "fail" + "\"")
+    elif TestSuccess == True:
+        whandle.write("\"" + testname + "\"" + ": " + "\"" + "pass" + "\"") 
diff --git a/ldcg-onednn-benchmarks/format-for-json.py b/ldcg-onednn-benchmarks/format-for-json.py
new file mode 100644
index 0000000000..6720efbed0
--- /dev/null
+++ b/ldcg-onednn-benchmarks/format-for-json.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python3
+
+import sys
+
+resultsfile = sys.argv[1]
+workspace = sys.argv[2]
+
+with open(workspace + '/' +  resultsfile, 'r') as handle:
+    pippo = handle.readlines()
+
+with open(workspace + "/final_" + resultsfile, 'w+') as whandle:
+    for i in range(0, len(pippo)):
+        line = pippo[i]
+        if i != 0 and i != (len(pippo)-2) and i != len(pippo)-1:
+            whandle.write(line[:len(line)-1] +  ',' + '\n')
+        else:
+            whandle.write(line)
diff --git a/ldcg-onednn-benchmarks/format-tests.sh b/ldcg-onednn-benchmarks/format-tests.sh
new file mode 100644
index 0000000000..8f79feed0b
--- /dev/null
+++ b/ldcg-onednn-benchmarks/format-tests.sh
@@ -0,0 +1,92 @@
+#!/bin/bash -ex
+
+if [ ! -d "${WORKSPACE}" ]; then
+  set -x
+  WORKSPACE=$(pwd)
+else
+        set -ex
+fi
+
+if [ -f "${WORKSPACE}"/convert-onednn-test-to-result.py ]; then
+  rm -r "${WORKSPACE}"/convert-onednn-test-to-result.py
+fi
+
+if [ -f "${WORKSPACE}"/format-for-json.py ]; then
+  rm -r "${WORKSPACE}"/format-for-json.py
+fi
+
+wget https://git.linaro.org/ci/job/configs.git/plain/ldcg-onednn-benchmarks/convert-onednn-test-to-result.py
+wget https://git.linaro.org/ci/job/configs.git/plain/ldcg-onednn-benchmarks/format-for-json.py
+
+python3 convert-onednn-test-to-result.py binary "${WORKSPACE}"
+#python3 convert-onednn-test-to-result.py brgemm "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py bnorm "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py concat "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py conv "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py deconv "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py eltwise "${WORKSPACE}"
+#python3 convert-onednn-test-to-result.py graph "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py eltwise "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py ip "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py lnorm "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py lrn "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py matmul "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py pool "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py prelu "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py reduction "${WORKSPACE}"
+#python3 convert-onednn-test-to-result.py reorder "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py resampling "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py rnn "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py shuffle "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py softmax "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py sum "${WORKSPACE}"
+python3 convert-onednn-test-to-result.py zeropad "${WORKSPACE}"
+
+echo { >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_binary-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+#cat "${WORKSPACE}"/oneDNN-results/res_brgemm-output.txt >> oneDNN-results/full-oneDNN-results.json
+#echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_bnorm-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_concat-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_conv-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_deconv-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_eltwise-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+#cat "${WORKSPACE}"/oneDNN-results/res_graph-output.txt >> oneDNN-results/full-oneDNN-results.json
+#echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_ip-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_lnorm-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_lrn-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_matmul-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_pool-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_prelu-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_reduction-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+#cat "${WORKSPACE}"/oneDNN-results/res_reorder-output.txt >> oneDNN-results/full-oneDNN-results.json
+#echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_resampling-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_rnn-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_shuffle-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_softmax-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_sum-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+cat "${WORKSPACE}"/oneDNN-results/res_zeropad-output.txt >> oneDNN-results/full-oneDNN-results.json
+echo >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+echo } >> "${WORKSPACE}"/oneDNN-results/full-oneDNN-results.json
+
+python3 "${WORKSPACE}"/format-for-json.py full-oneDNN-results.json "${WORKSPACE}"/oneDNN-results
diff --git a/ldcg-onednn-benchmarks/test-onednn.sh b/ldcg-onednn-benchmarks/test-onednn.sh
new file mode 100644
index 0000000000..016a8bad74
--- /dev/null
+++ b/ldcg-onednn-benchmarks/test-onednn.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -ex
+
+if [ ! -d "${WORKSPACE}" ]; then
+    set -x
+    WORKSPACE=$(pwd)
+else
+    set -ex
+fi
+
+
+if [ -d "${WORKSPACE}"/oneDNN-results ]; then
+    rm -r "${WORKSPACE}"/oneDNN-results
+fi
+
+mkdir "${WORKSPACE}"/oneDNN-results
+
+cd "${WORKSPACE}"/oneDNN/tests/benchdnn
+
+./benchdnn --binary --batch=inputs/binary/shapes_ci | tee "${WORKSPACE}"/oneDNN-results/binary-output.txt
+#./benchdnn --brgemm --batch=inputs/brgemm/shapes_2d | tee "${WORKSPACE}"/oneDNN-results/brgemm-output.txt
+./benchdnn --bnorm --batch=inputs/bnorm/shapes_resnet_50 | tee "${WORKSPACE}"/oneDNN-results/bnorm-output.txt
+./benchdnn --concat --batch=inputs/concat/test_concat_all | tee "${WORKSPACE}"/oneDNN-results/concat-output.txt
+./benchdnn --conv --cfg=f32 --dir=FWD_B --batch=inputs/conv/set_conv_all | tee "${WORKSPACE}"/oneDNN-results/conv-output.txt
+./benchdnn --deconv --cfg=f32 --dir=FWD_B --batch=inputs/conv/set_conv_all | tee "${WORKSPACE}"/oneDNN-results/deconv-output.txt
+./benchdnn --eltwise --batch=inputs/eltwise/shapes_ci | tee "${WORKSPACE}"/oneDNN-results/eltwise-output.txt
+#./benchdnn --mode=P --graph --case=./tests/benchdnn/inputs/graph/pattern/f32/conv_post_ops_fusion.json | tee "${WORKSPACE}"/oneDNN-results/graph-output.txt
+./benchdnn --ip --batch=inputs/ip/shapes_ci | tee "${WORKSPACE}"/oneDNN-results/ip-output.txt
+./benchdnn --lnorm --batch=shapes_ci | tee "${WORKSPACE}"/oneDNN-results/lnorm-output.txt
+./benchdnn --lrn --batch=inputs/lrn/shapes_ci | tee "${WORKSPACE}"/oneDNN-results/lrn-output.txt
+./benchdnn --matmul --batch=inputs/matmul/shapes_2d | tee "${WORKSPACE}"/oneDNN-results/matmul-output.txt
+./benchdnn --pool --batch=inputs/pool/shapes_2d | tee "${WORKSPACE}"/oneDNN-results/pool-output.txt
+./benchdnn --prelu --batch=inputs/prelu/shapes_ci | tee "${WORKSPACE}"/oneDNN-results/prelu-output.txt
+./benchdnn --reduction --batch=inputs/reduction/shapes_ci | tee "${WORKSPACE}"/oneDNN-results/reduction-output.txt
+#./benchdnn --reorder --batch=inputs/reorder/test_reorder_all | tee "${WORKSPACE}"/oneDNN-results/reorder-output.txt
+./benchdnn --resampling --batch=inputs/resampling/shapes_2d | tee "${WORKSPACE}"/oneDNN-results/resampling-output.txt
+./benchdnn --rnn --batch=inputs/rnn/shapes_training | tee "${WORKSPACE}"/oneDNN-results/rnn-output.txt
+./benchdnn --shuffle --batch=inputs/shuffle/test_shuffle_all | tee "${WORKSPACE}"/oneDNN-results/shuffle-output.txt
+./benchdnn --softmax --batch=shapes_ci | tee "${WORKSPACE}"/oneDNN-results/softmax-output.txt
+./benchdnn --sum --batch=inputs/sum/test_sum_all | tee "${WORKSPACE}"/oneDNN-results/sum-output.txt
+./benchdnn --zeropad --batch=inputs/zeropad/test_zeropad_ci | tee "${WORKSPACE}"/oneDNN-results/zeropad-output.txt
diff --git a/ldcg-python-cache.yaml b/ldcg-python-cache.yaml
new file mode 100644
index 0000000000..4801778f0a
--- /dev/null
+++ b/ldcg-python-cache.yaml
@@ -0,0 +1,44 @@
+- job:
+    name: ldcg-python-cache
+    project-type: matrix
+    defaults: global
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - docker-centos8-arm64-ldcg
+                - docker-buster-arm64-ldcg
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - string:
+            name: PYTHON_PACKAGES
+            default: 'grpcio numpy==1.18.* h5py'
+            description: 'space separates names of Python wheels to build'
+        - string:
+            name: EXTRA_DEPENDENCIES_CENTOS
+            default: ''
+            description: 'space separates names of extra package dependencies to install (space separated)'
+        - string:
+            name: EXTRA_DEPENDENCIES_DEBIAN
+            default: ''
+            description: 'space separates names of extra package dependencies to install (space separated)'
+    disabled: true
+    display-name: 'Build some Python package wheels'
+    wrappers:
+        - timestamps
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org'
diff --git a/ldcg-python-manylinux-cache.yaml b/ldcg-python-manylinux-cache.yaml
new file mode 100644
index 0000000000..49ff24482a
--- /dev/null
+++ b/ldcg-python-manylinux-cache.yaml
@@ -0,0 +1,48 @@
+- job:
+    name: ldcg-python-manylinux-cache
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - string:
+            name: PYTHON_PACKAGES
+            default: ''
+            description: 'space separated names of Python wheels to build'
+        - string:
+            name: EXTRA_DEPENDENCIES_CENTOS
+            default: ''
+            description: 'space separated names of extra package dependencies to install (CentOS 7)'
+        - string:
+            name: EXTRA_PYTHON_PACKAGES
+            default: ''
+            description: 'space separated names of extra Python wheels to install before build starts'
+    disabled: false
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'Build some Python package wheels'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-manylinux-cache/build.sh
+        - shell:
+            !include-raw: ldcg-python-manylinux-cache/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org'
diff --git a/ldcg-python-manylinux-cache/build-manylinux2014-wheels.sh b/ldcg-python-manylinux-cache/build-manylinux2014-wheels.sh
new file mode 100644
index 0000000000..e22c112ef1
--- /dev/null
+++ b/ldcg-python-manylinux-cache/build-manylinux2014-wheels.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+set -xe
+
+source "$(dirname $0)/vars.sh"
+
+# some packages require deps from EPEL
+yum install -y epel-release
+
+if ! [ -z $EXTRA_DEPENDENCIES_CENTOS ]; then
+    # if one of dependencies is missing or wrong then exit
+    yum install -y ${EXTRA_DEPENDENCIES_CENTOS} || exit
+fi
+
+cd /tmp/workspace
+
+# remove wheels and wheelhouse/ from previous jobs
+# we do it here as they are root:root
+rm -rf wheel* *.whl
+
+# let use our own cache
+# TODO(hrw): enable after populating it with manylinux2014 files
+export PIP_EXTRA_INDEX_URL="https://snapshots.linaro.org/ldcg/python-cache/"
+
+# make use of all CPU cores for some builds
+export NPY_NUM_BUILD_JOBS="$(nproc)"
+export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$(nproc)"
+
+# create virtualenv for each Python version
+# and update pip as we want 19+
+for py in /opt/python/cp3[67891]*
+do
+    pyver=`basename $py`
+    $py/bin/python -mvenv /tmp/$pyver
+    source /tmp/$pyver/bin/activate
+    pip install -U pip
+    pip install wheel ${EXTRA_PYTHON_PACKAGES}
+    deactivate
+done
+
+for pkg in $PYTHON_PACKAGES
+do
+    for py in /opt/python/cp3[67891]*
+    do
+        pyver=`basename $py`
+        source /tmp/$pyver/bin/activate
+        pkgname=$(python3 -c "import re;print(re.split(r'([<=>~]*)=', '${pkg}')[0])")
+        pip wheel $pkg || true
+        auditwheel repair $(ls -ct1 ${pkgname}*whl |head -n1) || true
+        deactivate
+    done
+done
diff --git a/ldcg-python-manylinux-cache/build.sh b/ldcg-python-manylinux-cache/build.sh
new file mode 100644
index 0000000000..a400662574
--- /dev/null
+++ b/ldcg-python-manylinux-cache/build.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -xe
+
+cd $WORKSPACE
+
+# remove generated vars and build script
+rm -f *.sh
+
+wget https://git.linaro.org/ci/job/configs.git/plain/ldcg-python-manylinux-cache/build-manylinux2014-wheels.sh
+
+echo "PYTHON_PACKAGES=\"${PYTHON_PACKAGES}\"" >> vars.sh
+echo "EXTRA_DEPENDENCIES_CENTOS=\"${EXTRA_DEPENDENCIES_CENTOS}\"" >> vars.sh
+echo "EXTRA_PYTHON_PACKAGES=\"${EXTRA_PYTHON_PACKAGES}\"" >> vars.sh
+
+# 00:01:17.010 /usr/local/bin/manylinux-entrypoint: line 8: /tmp/wheels/build-manylinux2014-wheels.sh: Permission denied
+chmod 755 build-manylinux2014-wheels.sh
+
+docker run --rm -u root -v $PWD:/tmp/workspace quay.io/pypa/manylinux2014_aarch64 /tmp/workspace/build-manylinux2014-wheels.sh
+
+# sort out wheel files for publishing
+
+COPY_FROM=${WORKSPACE}/wheels/
+
+for pkg in wheelhouse/*.whl
+do
+  pkgdir=$(echo `basename $pkg`|cut -d'-' -f1 | tr '[:upper:]_' '[:lower:]-')
+  pkgfile=$(basename $pkg)
+
+  # do we have this package in cache already?
+  status=$(curl --head --silent https://snapshots.linaro.org/ldcg/python-cache/${pkgdir}/${pkgfile} | head -n 1)
+
+  if $(echo $status | grep -q 404); then
+    mkdir -p "${COPY_FROM}/${pkgdir}"
+    cp $pkg  "${COPY_FROM}/${pkgdir}/"
+  fi
+done
diff --git a/ldcg-python-manylinux-cache/publishers.sh b/ldcg-python-manylinux-cache/publishers.sh
new file mode 100644
index 0000000000..f7665dbd1a
--- /dev/null
+++ b/ldcg-python-manylinux-cache/publishers.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+COPY_FROM=${WORKSPACE}/wheels/
+PUBLISH_TO=ldcg/python-cache/
+
+set -ex
+
+ls -alR $COPY_FROM
+
+# Publish wheel files
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+time python3 ${HOME}/bin/linaro-cp.py \
+  $COPY_FROM \
+  $PUBLISH_TO
+
+set +x
+
+echo "Python wheels: https://snapshots.linaro.org/${PUBLISH_TO}"
diff --git a/ldcg-python-manylinux-tensorflow-io.yaml b/ldcg-python-manylinux-tensorflow-io.yaml
new file mode 100644
index 0000000000..86befd38a2
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow-io.yaml
@@ -0,0 +1,48 @@
+- job:
+    name: ldcg-python-manylinux-tensorflow-io
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - bool:
+            name: build0
+            default: false
+            description: 'Build 0.32 release'
+        - bool:
+            name: buildgit
+            default: false
+            description: 'Build git HEAD'
+        - bool:
+            name: auditwheels
+            default: true
+            description: 'Run auditwheel on built wheels'
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'Tensorflow IO Python package (manylinux2014)'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/build-tfio.sh
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org andrew.goodbody@linaro.org yong.tang@hotmail.com'
diff --git a/ldcg-python-manylinux-tensorflow-nightly.yaml b/ldcg-python-manylinux-tensorflow-nightly.yaml
new file mode 100644
index 0000000000..f47a5f6eda
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow-nightly.yaml
@@ -0,0 +1,50 @@
+- job:
+    name: ldcg-python-manylinux-tensorflow-nightly
+    project-type: freestyle
+    defaults: global
+    triggers:
+        - timed: '@daily'
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - bool:
+            name: useclang
+            default: false
+            description: 'Use clang to build instead of gcc'
+        - bool:
+            name: buildgit
+            default: true
+            description: 'Build git HEAD'
+        - bool:
+            name: buildonednn
+            default: false
+            description: 'Build with oneDNN/ACL'
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'Tensorflow Python package (manylinux2014 nightly)'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/build.sh
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org andrew.goodbody@linaro.org ldcg-ai-ml@op-lists.linaro.org'
diff --git a/ldcg-python-manylinux-tensorflow-onednn-nightly.yaml b/ldcg-python-manylinux-tensorflow-onednn-nightly.yaml
new file mode 100644
index 0000000000..b6b0d08b52
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow-onednn-nightly.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: ldcg-python-manylinux-tensorflow-onednn-nightly
+    project-type: freestyle
+    defaults: global
+    triggers:
+        - timed: '10 0 * * *'
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - bool:
+            name: useclang
+            default: true
+            description: 'Use clang to build instead of gcc'
+        - bool:
+            name: buildgit
+            default: true
+            description: 'Build git HEAD'
+        - bool:
+            name: buildonednn
+            default: true
+            description: 'Build with oneDNN/ACL'
+        - bool:
+            name: buildonednnopt
+            default: true
+            description: 'Set TF_ENABLE_ONEDNN_OPT=1'
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'Tensorflow oneDNN Python package (manylinux2014 nightly)'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/build.sh
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org andrew.goodbody@linaro.org ldcg-ai-ml@op-lists.linaro.org'
diff --git a/ldcg-python-manylinux-tensorflow-text.yaml b/ldcg-python-manylinux-tensorflow-text.yaml
new file mode 100644
index 0000000000..93e5cd6f85
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow-text.yaml
@@ -0,0 +1,48 @@
+- job:
+    name: ldcg-python-manylinux-tensorflow-text
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - bool:
+            name: build0
+            default: false
+            description: 'Build 2.13 release'
+        - bool:
+            name: buildgit
+            default: false
+            description: 'Build git HEAD'
+        - bool:
+            name: auditwheels
+            default: true
+            description: 'Run auditwheel on built wheels'
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'Tensorflow Text Python package (manylinux2014)'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/build-tf-text.sh
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org andrew.goodbody@linaro.org'
diff --git a/ldcg-python-manylinux-tensorflow.yaml b/ldcg-python-manylinux-tensorflow.yaml
new file mode 100644
index 0000000000..8a7d480302
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow.yaml
@@ -0,0 +1,80 @@
+- job:
+    name: ldcg-python-manylinux-tensorflow
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - bool:
+            name: useclang
+            default: false
+            description: 'Use clang to build instead of gcc'
+        - bool:
+            name: buildgit
+            default: false
+            description: 'Build git HEAD'
+        - bool:
+            name: buildonednn
+            default: false
+            description: 'Build with oneDNN/ACL'
+        - bool:
+            name: buildonednnopt
+            default: false
+            description: 'Set TF_ENABLE_ONEDNN_OPT=1'
+        - bool:
+            name: prebuild
+            default: false
+            description: 'Pre-build a release before it is tagged using commit hash'
+        - string:
+            name: prebuild_hash
+            default: ''
+            description: 'Commit hash to be used for pre-build of release'
+        - bool:
+            name: build216
+            default: false
+            description: 'Build 2.16.x version'
+        - bool:
+            name: build215
+            default: false
+            description: 'Build 2.15.x version'
+        - bool:
+            name: build214
+            default: false
+            description: 'Build 2.14.x version'
+        - bool:
+            name: build213
+            default: false
+            description: 'Build 2.13.x version'
+        - bool:
+            name: build212
+            default: false
+            description: 'Build 2.12.x version'
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'Tensorflow Python package (manylinux2014)'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/build.sh
+        - shell:
+            !include-raw: ldcg-python-manylinux-tensorflow/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org andrew.goodbody@linaro.org'
diff --git a/ldcg-python-manylinux-tensorflow/Dockerfile b/ldcg-python-manylinux-tensorflow/Dockerfile
new file mode 100644
index 0000000000..d2803e2137
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/Dockerfile
@@ -0,0 +1,13 @@
+ARG tag_prefix=latest
+FROM linaro/tensorflow-arm64-build:${tag_prefix}-multipython
+
+ARG py_major_minor_version='3.10'
+
+ENV TF_PYTHON_VERSION=${py_major_minor_version}
+ENV PYTHON_BIN_PATH=/usr/bin/python${TF_PYTHON_VERSION}
+
+RUN ln -s ${PYTHON_BIN_PATH} /usr/local/bin/python && \
+    ln -s ${PYTHON_BIN_PATH} /usr/local/bin/python3
+
+COPY upper-constraints.txt /
+RUN ${PYTHON_BIN_PATH} -m pip install -c /upper-constraints.txt -r /upper-constraints.txt
diff --git a/ldcg-python-manylinux-tensorflow/ansible/.config/ansible-lint.yml b/ldcg-python-manylinux-tensorflow/ansible/.config/ansible-lint.yml
new file mode 100644
index 0000000000..fcbba6f5e6
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/.config/ansible-lint.yml
@@ -0,0 +1,5 @@
+---
+
+skip_list:
+  - name[template]
+  - yaml[line-length]
diff --git a/ldcg-python-manylinux-tensorflow/ansible/ansible.cfg b/ldcg-python-manylinux-tensorflow/ansible/ansible.cfg
new file mode 100644
index 0000000000..28cbb08b00
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/ansible.cfg
@@ -0,0 +1,14 @@
+[defaults]
+interpreter_python: auto
+
+# Use the YAML callback plugin.
+stdout_callback = yaml
+
+# Use the stdout_callback when running ad-hoc commands.
+bin_ansible_callbacks = True
+
+# profile tasks
+callbacks_enabled = profile_tasks
+
+roles_path = roles:/etc/ansible/roles
+retry_files_enabled = False
diff --git a/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-dual-abi.yml b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-dual-abi.yml
new file mode 100644
index 0000000000..8a21ee7c80
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-dual-abi.yml
@@ -0,0 +1,36 @@
+---
+- name: Build TensorFlow in Dual ABI container
+  hosts: localhost
+  vars_files:
+    ../vars/vars.yml
+
+  tasks:
+    - name: Cleanup after previous build
+      ansible.builtin.file:
+        path: "{{ build_dir }}/{{ item }}"
+        state: absent
+      loop:
+        - disk-cache
+        - wheels
+        - ml_wheels
+        - tensorflow
+
+    - name: Create cache dirs
+      ansible.builtin.file:
+        path: "{{ build_dir }}/{{ item }}"
+        state: directory
+        mode: 0777
+      loop:
+        - disk-cache
+        - bazel-cache
+        - wheels
+        - ml_wheels
+
+    - name: Go through each TensorFlow version
+      ansible.builtin.include_role:
+        name: tensorflow
+        tasks_from: loop.yml
+      loop: "{{ versions | dict2items }}"
+      loop_control:
+        loop_var: tf_ver
+      when: tf_ver.key in to_be_built
diff --git a/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-io.yml b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-io.yml
new file mode 100644
index 0000000000..5ae976f54d
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-io.yml
@@ -0,0 +1,47 @@
+---
+- name: Build TensorFlow IO
+  hosts: localhost
+  vars_files:
+    ../vars/vars-tfio.yml
+
+  tasks:
+    - name: Create output wheels directory
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}"
+        state: directory
+        mode: 0755
+
+    - name: Go through each TensorFlow IO version
+      ansible.builtin.include_role:
+        name: tensorflow_io
+        tasks_from: manylinux-build.yml
+      loop: "{{ tfio_versions | dict2items }}"
+      loop_control:
+        loop_var: tfio_ver
+      when: tfio_ver.key in to_be_built
+
+    - name: Prepare wheels for publishing  # noqa no-changed-when
+      ansible.builtin.shell:
+        cmd: |
+          set -xe
+          for pkg in *.whl
+          do
+            pkgdir=$(echo `basename $pkg`|cut -d'-' -f1 | tr '[:upper:]_' '[:lower:]-')
+            mkdir -p "{{ wheels_dir }}/$pkgdir"
+            mv $pkg  "{{ wheels_dir }}/$pkgdir"
+          done
+        chdir: "{{ wheels_dir }}"
+        executable: "/bin/bash"
+
+    - name: Copy wheels for cache upload
+      ansible.builtin.copy:
+        src: "{{ wheels_dir }}"
+        dest: "{{ build_dir }}/cache_upload"
+        mode: 0644
+
+    - name: Prepare wheels for cache
+      ansible.builtin.include_role:
+        name: linaro
+        tasks_from: publish-wheels-cache.yml
+      vars:
+        wheels_dir: "{{ build_dir }}/cache_upload"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-text-dual-abi.yml b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-text-dual-abi.yml
new file mode 100644
index 0000000000..03296d8645
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tf-text-dual-abi.yml
@@ -0,0 +1,45 @@
+---
+- name: Build TensorFlow Text in Dual ABI container
+  hosts: localhost
+  vars_files:
+    ../vars/vars-tf-text.yml
+
+  tasks:
+    - name: Remove previous build wheels
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}"
+        force: true
+        state: absent
+
+    - name: Create output wheels directory
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}"
+        state: directory
+        mode: 0755
+
+    - name: Go through each TensorFlow Text version
+      ansible.builtin.include_role:
+        name: tensorflow_text
+        tasks_from: manylinux-build.yml
+      loop: "{{ tf_text_versions | dict2items }}"
+      loop_control:
+        loop_var: tf_text_ver
+      when: tf_text_ver.key in to_be_built
+
+    - name: Remove file not needed to be published
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}/upper-constraints.txt"
+        state: absent
+
+    - name: Prepare wheels for publishing  # noqa no-changed-when
+      ansible.builtin.shell:
+        cmd: |
+          set -xe
+          for pkg in *.whl
+          do
+            pkgdir=$(echo `basename $pkg`|cut -d'-' -f1 | tr '[:upper:]_' '[:lower:]-')
+            mkdir -p "{{ wheels_dir }}/$pkgdir"
+            mv $pkg  "{{ wheels_dir }}/$pkgdir"
+          done
+        chdir: "{{ wheels_dir }}"
+        executable: "/bin/bash"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tfio-dual-abi.yml b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tfio-dual-abi.yml
new file mode 100644
index 0000000000..8267cc5cb4
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/playbooks/build-tfio-dual-abi.yml
@@ -0,0 +1,49 @@
+---
+- name: Build TensorFlow IO in Dual ABI container
+  hosts: localhost
+  vars_files:
+    ../vars/vars-tfio.yml
+
+  tasks:
+    - name: Set dual abi variable
+      ansible.builtin.set_fact:
+        dual_abi: true
+
+    - name: Remove previous build wheels
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}"
+        force: true
+        state: absent
+
+    - name: Create output wheels directory
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}"
+        state: directory
+        mode: 0755
+
+    - name: Go through each TensorFlow IO version
+      ansible.builtin.include_role:
+        name: tensorflow_io
+        tasks_from: manylinux-build.yml
+      loop: "{{ tfio_versions | dict2items }}"
+      loop_control:
+        loop_var: tfio_ver
+      when: tfio_ver.key in to_be_built
+
+    - name: Remove file not needed to be published
+      ansible.builtin.file:
+        path: "{{ wheels_dir }}/upper-constraints.txt"
+        state: absent
+
+    - name: Prepare wheels for publishing  # noqa no-changed-when
+      ansible.builtin.shell:
+        cmd: |
+          set -xe
+          for pkg in *.whl
+          do
+            pkgdir=$(echo `basename $pkg`|cut -d'-' -f1 | tr '[:upper:]_' '[:lower:]-')
+            mkdir -p "{{ wheels_dir }}/$pkgdir"
+            mv $pkg  "{{ wheels_dir }}/$pkgdir"
+          done
+        chdir: "{{ wheels_dir }}"
+        executable: "/bin/bash"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/build.yml
new file mode 100644
index 0000000000..b9bd8514b1
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/build.yml
@@ -0,0 +1,39 @@
+---
+- name: Fetch bazel {{ bazel_version }} source
+  ansible.builtin.get_url:
+    url: "https://github.com/bazelbuild/bazel/releases/download/{{ bazel_version }}/bazel-{{ bazel_version }}-dist.zip"
+    dest: "{{ build_dir }}"
+    mode: 0600
+
+- name: Create directory to build bazel {{ bazel_version }}
+  ansible.builtin.file:
+    path: "{{ build_dir }}/bazel-{{ bazel_version }}/"
+    state: directory
+    mode: 0700
+
+- name: Unpack bazel {{ bazel_version }} source
+  ansible.builtin.unarchive:
+    src: "{{ build_dir }}/bazel-{{ bazel_version }}-dist.zip"
+    dest: "{{ build_dir }}/bazel-{{ bazel_version }}"
+    remote_src: true
+    creates: "{{ build_dir }}/bazel-{{ bazel_version }}/compile.sh"
+
+- name: Build bazel {{ bazel_version }}
+  ansible.builtin.shell:
+    cmd: |
+      set -xe
+      export BAZEL_LINKLIBS=-lstdc++
+      export BAZEL_LINKOPTS=
+      EXTRA_BAZEL_ARGS='--host_javabase=@local_jdk//:jdk' ./compile.sh
+    chdir: "{{ build_dir }}/bazel-{{ bazel_version }}/"
+    creates: "{{ build_dir }}/bazel-{{ bazel_version }}/output/bazel"
+    executable: /bin/bash
+
+- name: Install bazel {{ bazel_version }}
+  become: true
+  ansible.builtin.copy:
+    src: "{{ build_dir }}/bazel-{{ bazel_version }}/output/bazel"
+    dest: /usr/local/bin/bazel
+    mode: 0755
+    force: true
+    remote_src: true
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/deps.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/deps.yml
new file mode 100644
index 0000000000..b159c6424a
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/deps.yml
@@ -0,0 +1,13 @@
+---
+- name: Install bazel build requirements
+  become: true
+  ansible.builtin.package:
+    name:
+      - cmake
+      - gcc-c++
+      - java-11-openjdk-devel
+      - python3
+      - unzip
+      - which
+      - zip
+    state: present
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/fetch-binary.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/fetch-binary.yml
new file mode 100644
index 0000000000..389712d4fb
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/fetch-binary.yml
@@ -0,0 +1,12 @@
+---
+- name: Determine architecture for bazelisk download
+  ansible.builtin.set_fact:
+    build_arch: "{{ 'amd64' if ansible_architecture == 'x86_64' else 'arm64' }}"
+
+- name: Fetch Bazelisk {{ bazelisk_version }} binary from Github
+  become: true
+  ansible.builtin.get_url:
+    url: "https://github.com/bazelbuild/bazelisk/releases/download/{{ bazelisk_version }}/bazelisk-linux-{{ build_arch }}"
+    dest: /usr/local/bin/bazel
+    mode: 0755
+    force: true
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/main.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/main.yml
new file mode 100644
index 0000000000..1119451083
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/main.yml
@@ -0,0 +1,14 @@
+---
+- name: Handle dependencies
+  ansible.builtin.include_tasks:
+    file: deps.yml
+
+- name: Build Bazel
+  ansible.builtin.include_tasks:
+    file: build.yml
+  when: bazel_version != "bazelisk"
+
+- name: Fetch Bazel binary
+  ansible.builtin.include_tasks:
+    file: fetch-binary.yml
+  when: bazel_version == "bazelisk"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/stop.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/stop.yml
new file mode 100644
index 0000000000..9c9f4795c9
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/bazel/tasks/stop.yml
@@ -0,0 +1,4 @@
+---
+- name: Stop bazel server  # noqa no-changed-when
+  ansible.builtin.command:
+    cmd: bazel shutdown
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/ldcg_manylinux_tensorflow/tasks/init.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/ldcg_manylinux_tensorflow/tasks/init.yml
new file mode 100644
index 0000000000..c1003f77bd
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/ldcg_manylinux_tensorflow/tasks/init.yml
@@ -0,0 +1,24 @@
+---
+- name: Install TensorFlow build dependencies
+  ansible.builtin.include_role:
+    name: tensorflow
+    tasks_from: deps.yml
+
+- name: Install build dependencies for Python wheels
+  ansible.builtin.include_role:
+    name: python
+    tasks_from: deps.yml
+
+- name: Create buildslave user inside container
+  ansible.builtin.user:
+    name: buildslave
+    uid: 1001
+    create_home: false
+
+- name: Create directory to build wheels
+  ansible.builtin.file:
+    path: "{{ wheels_dir }}"
+    state: directory
+    owner: buildslave
+    group: buildslave
+    mode: 0755
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/ldcg_manylinux_tensorflow/tasks/publish.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/ldcg_manylinux_tensorflow/tasks/publish.yml
new file mode 100644
index 0000000000..1931391f8a
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/ldcg_manylinux_tensorflow/tasks/publish.yml
@@ -0,0 +1,28 @@
+---
+- name: Run repair on wheels
+  ansible.builtin.include_role:
+    name: linaro
+    tasks_from: auditwheel-repair.yml
+
+- name: Prepare wheels for publishing
+  ansible.builtin.include_role:
+    name: linaro
+    tasks_from: publish-wheels.yml
+
+- name: Prepare wheels for cache upload
+  when: tensorflow_version != 'git' and not prebuild_release
+  block:
+    - name: Copy wheels for cache upload
+      ansible.builtin.copy:
+        src: "{{ wheels_dir }}"
+        dest: "{{ build_dir }}/cache_upload"
+        owner: "buildslave"
+        group: "buildslave"
+        mode: 0644
+
+    - name: Prepare wheels for cache
+      ansible.builtin.include_role:
+        name: linaro
+        tasks_from: publish-wheels-cache.yml
+      vars:
+        wheels_dir: "{{ build_dir }}/cache_upload"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/auditwheel-repair.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/auditwheel-repair.yml
new file mode 100644
index 0000000000..ddae2eaa9f
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/auditwheel-repair.yml
@@ -0,0 +1,16 @@
+---
+- name: Run auditwheel repair on wheels  # noqa no-changed-when
+  ansible.builtin.command:
+    cmd: "auditwheel repair -w {{ wheels_dir }} {{ item }}"
+    chdir: "{{ wheels_dir }}"
+  with_fileglob:
+    - "{{ wheels_dir }}/tensorflow*.whl"
+    - "{{ wheels_dir }}/h5py-3.2*.whl"
+
+- name: Drop non-manylinux wheels
+  ansible.builtin.file:
+    path: "{{ item }}"
+    state: absent
+  with_fileglob:
+    - "{{ wheels_dir }}/tensorflow*linux_aarch64.whl"
+    - "{{ wheels_dir }}/h5py-3.2*linux_aarch64.whl"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/publish-wheels-cache.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/publish-wheels-cache.yml
new file mode 100644
index 0000000000..aee7f80f91
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/publish-wheels-cache.yml
@@ -0,0 +1,17 @@
+---
+- name: Prepare wheels for publishing in our cache  # noqa no-changed-when
+  ansible.builtin.shell:
+    cmd: |
+      set -xe
+      for pkg in */*.whl
+      do
+        # do we have this package on server already?
+        status=$(curl --head --silent https://snapshots.linaro.org/ldcg/python-cache/${pkg} | head -n 1)
+        if $(echo $status | grep -q 404); then
+          echo "uploading $pkg"
+        else
+          rm -rf "{{ wheels_dir }}/$pkg"
+        fi
+      done
+    chdir: "{{ wheels_dir }}"
+    executable: "/bin/bash"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/publish-wheels.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/publish-wheels.yml
new file mode 100644
index 0000000000..ffc818d198
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/linaro/tasks/publish-wheels.yml
@@ -0,0 +1,14 @@
+---
+- name: Prepare wheels for publishing  # noqa no-changed-when
+  ansible.builtin.shell:
+    cmd: |
+      set -xe
+      for pkg in *.whl
+      do
+        pkgdir=$(echo `basename $pkg`|cut -d'-' -f1 | tr '[:upper:]_' '[:lower:]-')
+        mkdir -p "{{ wheels_dir }}/$pkgdir"
+        mv $pkg  "{{ wheels_dir }}/$pkgdir"
+      done
+      chown -R buildslave:buildslave *
+    chdir: "{{ wheels_dir }}"
+    executable: "/bin/bash"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/deps.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/deps.yml
new file mode 100644
index 0000000000..3a73bc8e75
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/deps.yml
@@ -0,0 +1,22 @@
+---
+- name: Enable EPEL
+  become: true
+  ansible.builtin.package:
+    name:
+      - epel-release
+
+- name: Install h5py build requirements
+  become: true
+  ansible.builtin.package:
+    name:
+      - hdf5-devel
+    state: present
+
+- name: Install numpy build requirements
+  become: true
+  ansible.builtin.package:
+    name:
+      - gcc-gfortran
+      - openblas-devel
+      - lapack-devel
+    state: present
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/virtualenv.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/virtualenv.yml
new file mode 100644
index 0000000000..819885cb2d
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/virtualenv.yml
@@ -0,0 +1,26 @@
+---
+- name: Set virtualenv path
+  ansible.builtin.set_fact:
+    virtualenv_path: "{{ build_dir }}/venv-{{ py_ver }}"
+
+- name: Create virtualenv directory
+  ansible.builtin.file:
+    path: "{{ virtualenv_path }}"
+    state: directory
+    owner: buildslave
+    group: buildslave
+    mode: 0755
+
+- name: Create Python {{ py_ver }} virtualenv
+  become: true
+  become_user: "buildslave"
+  become_method: su
+  ansible.builtin.pip:
+    virtualenv: "{{ virtualenv_path }}"
+    virtualenv_command: "/opt/python/{{ py_ver }}/bin/python3 -mvenv"
+    extra_args: "--extra-index-url {{ pip_extra_index_url }} -c '{{ wheels_dir }}/upper-constraints.txt'"
+    name:
+      - pip
+      - pkgconfig
+      - Cython
+      - wheel
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/wheel.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/wheel.yml
new file mode 100644
index 0000000000..7210c984e2
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/python/tasks/wheel.yml
@@ -0,0 +1,40 @@
+---
+- name: Build wheels of Python package {{ wheel_name }}  # noqa no-changed-when
+  become: true
+  become_user: "buildslave"
+  become_method: su
+  ansible.builtin.shell:
+    cmd: |
+      source {{ virtualenv_path }}/bin/activate
+      pip3 wheel -w '{{ wheels_dir }}' \
+        --no-binary h5py \
+        --extra-index-url {{ pip_extra_index_url }} \
+        -c "{{ wheels_dir }}/upper-constraints.txt" \
+        "{{ wheel_name }}"
+    executable: /bin/bash
+  environment:
+    NPY_NUM_BUILD_JOBS: "{{ ansible_processor_vcpus }}"
+    GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS: "{{ ansible_processor_vcpus }}"
+
+- name: Get list of wheel files matching {{ wheel_name }}
+  ansible.builtin.find:
+    path: "{{ wheels_dir }}"
+    patterns: 
+      - "{{ wheel_name | regex_replace('.=.*', '') }}*py3*.whl"
+      - "{{ wheel_name | regex_replace('.=.*', '') }}*{{ py_ver }}*.whl"
+    file_type: file
+  register: wheel_files
+
+- name: Get filename of latest {{ wheel_name }} wheel
+  ansible.builtin.set_fact:
+    wheel_file: "{{ wheel_files.files | sort(attribute='mtime') | last }}"
+
+- name: Install {{ wheel_file.path | basename }} Python package
+  become: true
+  become_user: "buildslave"
+  become_method: su
+  ansible.builtin.pip:
+    name: "{{ wheel_file.path }}"
+    virtualenv: "{{ virtualenv_path }}"
+    virtualenv_python: "/opt/python/{{ py_ver }}/bin/python3"
+    extra_args: "--extra-index-url {{ pip_extra_index_url }} -c '{{ wheels_dir }}/upper-constraints.txt'"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/files/check-tf.py b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/files/check-tf.py
new file mode 100644
index 0000000000..4bcd1c75a2
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/files/check-tf.py
@@ -0,0 +1,29 @@
+import tensorflow as tf
+
+tf.compat.v1.enable_eager_execution()
+
+mnist = tf.keras.datasets.mnist
+
+(x_train, y_train), (x_test, y_test) = mnist.load_data()
+x_train, x_test = x_train / 255.0, x_test / 255.0
+
+model = tf.keras.models.Sequential([
+  tf.keras.layers.Flatten(input_shape=(28, 28)),
+  tf.keras.layers.Dense(128, activation='relu'),
+  tf.keras.layers.Dropout(0.2),
+  tf.keras.layers.Dense(10)
+])
+
+predictions = model(x_train[:1]).numpy()
+
+tf.nn.softmax(predictions).numpy()
+
+loss_fn = tf.keras.losses.SparseCategoricalCrossentropy(from_logits=True)
+loss_fn(y_train[:1], predictions).numpy()
+
+model.compile(optimizer='adam',
+              loss=loss_fn,
+              metrics=['accuracy'])
+
+model.fit(x_train, y_train, epochs=5)
+model.evaluate(x_test,  y_test, verbose=2)
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/deps.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/deps.yml
new file mode 100644
index 0000000000..0e619aa58a
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/deps.yml
@@ -0,0 +1,7 @@
+---
+- name: Install TensorFlow build requirements
+  become: true
+  ansible.builtin.package:
+    name:
+      - git
+      - patch
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/fetch.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/fetch.yml
new file mode 100644
index 0000000000..6ea0e8bf76
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/fetch.yml
@@ -0,0 +1,74 @@
+---
+- name: Fetch TensorFlow source archive
+  when: tensorflow_version != 'git' and not prebuild_release
+  block:
+    - name: Fetch TensorFlow{{ variant_name }} {{ tensorflow_version }} source
+      ansible.builtin.get_url:
+        url: "https://github.com/tensorflow/tensorflow/archive/v{{ tensorflow_version }}.tar.gz"
+        dest: "{{ build_dir }}/tensorflow-{{ tensorflow_version }}.tar.gz"
+        mode: 0600
+
+    - name: Unpack TensorFlow{{ variant_name }} {{ tensorflow_version }} source
+      ansible.builtin.unarchive:
+        src: "{{ build_dir }}/tensorflow-{{ tensorflow_version }}.tar.gz"
+        dest: "{{ build_dir }}/"
+        remote_src: true
+
+    - name: Rename source dir for oneDNN build
+      ansible.builtin.command: "mv {{ build_dir }}/tensorflow-{{ tensorflow_version }} {{ tensorflow_build_dir }}"
+      args:
+        creates: "{{ tensorflow_build_dir }}"
+        removes: "{{ build_dir }}/tensorflow-{{ tensorflow_version }}"
+      when: onednn_build
+
+- name: Fetch TensorFlow{{ variant_name }} from git
+  when: tensorflow_version == 'git'
+  ansible.builtin.git:
+    repo: "https://github.com/tensorflow/tensorflow.git"  # noqa latest[git]
+    dest: "{{ tensorflow_build_dir }}/"
+    depth: 1
+    recursive: true
+    force: true
+
+- name: Fetch TensorFlow{{ variant_name }} from git at commit {{ prebuild_hash }}
+  when: prebuild_release
+  ansible.builtin.git:
+    repo: "https://github.com/tensorflow/tensorflow.git"
+    dest: "{{ tensorflow_build_dir }}/"
+    version: "{{ prebuild_hash }}"
+    depth: 1
+    recursive: true
+    force: true
+
+- name: Prepare TensorFlow source from git
+  when: tensorflow_version == 'git' or prebuild_release
+  block:
+    - name: Set world write access to source
+      ansible.builtin.file:
+        path: "{{ tensorflow_build_dir }}/"
+        state: directory
+        mode: 0777
+
+    - name: Get oneline version of git log for this checkout  # noqa no-changed-when
+      ansible.builtin.command:
+        cmd: "git log --pretty=oneline -1"
+        chdir: "{{ tensorflow_build_dir }}/"
+      register: git_log
+
+    - name: Show git log
+      ansible.builtin.debug:
+        var: git_log.stdout
+
+    - name: Record git commit hash to variable
+      ansible.builtin.set_fact:
+        git_commit: "{{ git_log.stdout | regex_search('^[0-9a-f]+') }}"
+
+    - name: Save git commit hash to file
+      ansible.builtin.template:
+        src: "git_commit_hash.j2"
+        dest: "{{ wheels_dir }}/git_commit_hash"
+        owner: buildslave
+        group: buildslave
+        mode: 0444
+        force: true
+
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/loop.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/loop.yml
new file mode 100644
index 0000000000..e9ba473675
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/loop.yml
@@ -0,0 +1,30 @@
+---
+- name: Set TensorFlow and other package versions
+  ansible.builtin.set_fact:
+    tensorflow_version: "{{ tf_ver.value.tensorflow_version }}"
+    bazel_version: "{{ tf_ver.value.bazel_version }}"
+    onednn_ut_exclude: '{{ "-" + tf_ver.value.onednn_ut_exclude | join(" -") if onednn_enable_opt and tf_ver.value.onednn_ut_exclude else "" }}'
+    clang_ut_exclude: '{{ "-" + tf_ver.value.unit_tests_clang_exclude | join(" -") if clang_build and tf_ver.value.unit_tests_clang_exclude else "" }}'
+    gcc_ut_exclude: '{{ "-" + tf_ver.value.unit_tests_gcc_exclude | join(" -") if not clang_build and tf_ver.value.unit_tests_gcc_exclude else "" }}'
+    image_prefix: "{{ tf_ver.value.image_prefix }}"
+
+- name: Set build dir for TensorFlow{{ variant_name }} {{ tensorflow_version }}
+  ansible.builtin.set_fact:
+    tensorflow_build_dir: "{{ build_dir }}/tensorflow{{ variant_name }}-{{ tensorflow_version }}"
+
+- name: Remove TensorFlow{{ variant_name }} {{ tensorflow_version }} sources from previous build
+  ansible.builtin.file:
+    path: "{{ tensorflow_build_dir }}/"
+    state: absent
+
+- name: Fetch TensorFlow
+  ansible.builtin.include_tasks:
+    file: fetch.yml
+
+- name: Build TensorFlow for each Python version (dual abi)
+  ansible.builtin.include_role:
+    name: tensorflow_in_container
+    tasks_from: dual-abi-build.yml
+  loop: "{{ tf_ver.value.python_versions }}"
+  loop_control:
+    loop_var: py_ver
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/patch_tree.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/patch_tree.yml
new file mode 100644
index 0000000000..74cbaefc7a
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/tasks/patch_tree.yml
@@ -0,0 +1,13 @@
+---
+- name: Create linklibs shell script
+  ansible.builtin.template:
+    src: linklibs.sh.j2
+    dest: "{{ tensorflow_build_dir }}/linklibs.sh"
+    mode: 0600
+
+- name: Use nightly package requirements
+  ansible.builtin.lineinfile:
+    path: "{{ tensorflow_build_dir }}/tensorflow/tools/pip_package/setup.py"
+    regexp: '^  return nightly'
+    line: '  return nightly'
+  when: tensorflow_version == 'git'
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/README_ut.md.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/README_ut.md.j2
new file mode 100644
index 0000000000..290f7f5564
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/README_ut.md.j2
@@ -0,0 +1,16 @@
+The below filter tags were used to build and select unit tests
+```
+{{ tf_ver.value.unit_tests_filter_flags }}
+```
+
+The following unit test section(s) were run on this release
+```
+\\tensorflow\...
+```
+
+The following unit tests and sections were excluded from being run. This may
+have been due to build issues, or are a known failure.
+```
+{{ tf_ver.value.unit_tests_exclude | join("\n") }}
+{{ tf_ver.value.onednn_ut_exclude | join("\n") if onednn_enable_opt else "" }}
+```
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/git_commit_hash.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/git_commit_hash.j2
new file mode 100644
index 0000000000..b33e4a65fc
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/git_commit_hash.j2
@@ -0,0 +1 @@
+{{ git_commit }}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/linklibs.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/linklibs.sh.j2
new file mode 100644
index 0000000000..6d54b8a9a7
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/linklibs.sh.j2
@@ -0,0 +1 @@
+{{ (tensorflow_version < "2.8.0") | ternary('export BAZEL_LINKLIBS=-lstdc++\nexport BAZEL_LINKOPTS=', '') }}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/python_bin_path b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/python_bin_path
new file mode 100644
index 0000000000..05cdc27d98
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/python_bin_path
@@ -0,0 +1 @@
+export PYTHON_BIN_PATH="{{ virtualenv_path }}/bin/python3"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/tf_configure.bazelrc b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/tf_configure.bazelrc
new file mode 100644
index 0000000000..a81fcdf702
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow/templates/tf_configure.bazelrc
@@ -0,0 +1,10 @@
+build --action_env PYTHON_BIN_PATH="{{ virtualenv_path }}/bin/python3"
+build --action_env PYTHON_LIB_PATH="{{ virtualenv_sp.stdout }}"
+build --python_path="{{ virtualenv_path }}/bin/python3"
+build:opt --copt=-Wno-sign-compare
+build:opt --host_copt=-Wno-sign-compare
+test --test_size_filters=small,medium
+test:v1 --test_tag_filters=-benchmark-test,-no_oss,-gpu,-oss_serial
+test:v1 --build_tag_filters=-benchmark-test,-no_oss,-gpu
+test:v2 --test_tag_filters=-benchmark-test,-no_oss,-gpu,-oss_serial,-v1only
+test:v2 --build_tag_filters=-benchmark-test,-no_oss,-gpu,-v1only
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/tasks/dual-abi-build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/tasks/dual-abi-build.yml
new file mode 100644
index 0000000000..9aa1c12669
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/tasks/dual-abi-build.yml
@@ -0,0 +1,236 @@
+---
+- name: Reset checkout to clean state  # noqa command-instead-of-module
+  ansible.builtin.shell:
+    cmd: "git clean -dfx; git reset --hard"
+    chdir: "{{ tensorflow_build_dir }}/"
+  when: tensorflow_version == 'git'
+
+- name: (Python {{ py_ver }}) fetch TensorFlow source archive
+  when: tensorflow_version != 'git'
+  block:
+    - name: Remove TensorFlow{{ variant_name }} {{ tensorflow_version }} sources from previous build
+      ansible.builtin.file:
+        path: "{{ tensorflow_build_dir }}/"
+        state: absent
+
+    - name: Fetch TensorFlow
+      ansible.builtin.include_role:
+        name: tensorflow
+        tasks_from: fetch.yml
+
+- name: (Python {{ py_ver }}) patch TensorFlow tree
+  ansible.builtin.include_role:
+    name: tensorflow
+    tasks_from: patch_tree.yml
+
+- name: (Python {{ py_ver }}) copy upper constraints for hermetic builds
+  local_action:
+    module: ansible.builtin.template
+    src: "hermetic-upper-constraints.txt"
+    dest: "{{ build_dir }}/configs/ldcg-python-manylinux-tensorflow/upper-constraints.txt"
+    mode: 0644  # needs to be readable in container as well
+    force: true
+
+- name: (Python {{ py_ver }}) build Python versioned container
+  community.docker.docker_image:
+    name: "multipython-py{{ py_ver }}-{{ image_prefix }}"
+    build:
+      path: "{{ build_dir }}/configs/ldcg-python-manylinux-tensorflow/"
+      args:
+        tag_prefix: "{{ image_prefix }}"
+        py_major_minor_version: "{{ py_ver }}"
+    source: build
+    force_source: true
+
+- name: (Python {{ py_ver }}) start build container
+  community.docker.docker_container:
+    name: "tf-py{{ py_ver }}"
+    image: "multipython-py{{ py_ver }}-{{ image_prefix }}"
+    state: started
+    restart: true
+    volumes:
+      - "{{ tensorflow_build_dir }}:/tf/tensorflow"
+      - "{{ build_dir }}/wheels:/tf/pkg"
+      - "{{ build_dir }}/disk-cache:/tf/cache"
+      - "{{ build_dir }}/bazel-cache:/tf/bazel-cache"
+    detach: true
+    user: buildslave
+    working_dir: "/tf/tensorflow"
+    network_mode: host
+    command: "sleep infinity"
+    timeout: 6000
+
+- name: (Python {{ py_ver }}) create buildslave bazel cache dir
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: |
+      install -d -m0777 .cache/bazel/_bazel_buildslave
+    chdir: "/home/buildslave/"
+
+- name: (Python {{ py_ver }}) create link for bazel cache
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: |
+      ln -sf /tf/bazel-cache bazel/_bazel_buildslave/cache
+    chdir: "/home/buildslave/.cache/"
+
+- name: (Python {{ py_ver }}) create link for bazelisk cache
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: |
+      ln -sf /tf/bazel-cache bazelisk
+    chdir: "/home/buildslave/.cache/"
+
+- name: (Python {{ py_ver }}) create link for pip cache
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: |
+      ln -sf /tf/cache pip
+    chdir: "/home/buildslave/.cache/"
+
+- name: (Python {{ py_ver }}) collect list of installed Python packages for build
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: "/usr/local/bin/python3 -m pip list -v"
+    chdir: "/tf/tensorflow"
+  register: pip_list_output
+
+- name: Show list of installed Python packages for build
+  ansible.builtin.debug:
+    var: pip_list_output.stdout
+
+- name: (Python {{ py_ver }}) build TensorFlow{{ variant_name }} {{ tensorflow_version }}
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: >
+      bazel --bazelrc=/usertools/{{ bazelrc_file }} build
+            --config=sigbuild_local_cache
+            {{ "--config=mkl_aarch64_threadpool" if onednn_build }}
+            {{ "--test_env=TF_ENABLE_ONEDNN_OPTS=1" if onednn_enable_opt }}
+            {{ "--repo_env=WHEEL_NAME=tensorflow_aarch64" if not tf_ver.value.old_pip_package }}
+            -- //tensorflow/tools/pip_package:{{ "build_pip_package" if tf_ver.value.old_pip_package else "wheel" }}
+    chdir: "/tf/tensorflow"
+
+- name: (Python {{ py_ver }}) build Python package
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: |
+      ./bazel-bin/tensorflow/tools/pip_package/build_pip_package \
+            --project_name tensorflow_aarch64 /tf/pkg
+    chdir: "/tf/tensorflow"
+  when: tf_ver.value.old_pip_package
+
+- name: (Python {{ py_ver }}) Copy built wheel
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: |
+      find ./bazel-bin/tensorflow/tools/pip_package -iname '*.whl' -exec cp '{}' /tf/pkg ';'
+    chdir: "/tf/tensorflow"
+  when: not tf_ver.value.old_pip_package
+
+- name: (Python {{ py_ver }}) Run TensorFlow testsuite
+  when: tf_ver.value.run_unit_tests
+  block:
+    - name: (Python {{ py_ver }}) cleanup Bazel install directory
+      community.docker.docker_container_exec:
+        container: "tf-py{{ py_ver }}"
+        command: "rm -rf bazel/_bazel_buildslave/install"
+        chdir: "/home/buildslave/.cache/"
+
+    - name: (Python {{ py_ver }}) create script to run tests
+      ansible.builtin.template:
+        src: "run-tests.sh.j2"
+        dest: "{{ tensorflow_build_dir }}/run-tests.sh"
+        mode: 0755
+        force: true
+
+    - name: (Python {{ py_ver }}) run TensorFlow{{ variant_name }} {{ tensorflow_version }} tests
+      community.docker.docker_container_exec:
+        container: "tf-py{{ py_ver }}"
+        command: "bash run-tests.sh"
+        chdir: "/tf/tensorflow"
+      register: test_output
+      ignore_errors: true
+
+    - name: (Python {{ py_ver }}) collect list of installed Python packages
+      community.docker.docker_container_exec:
+        container: "tf-py{{ py_ver }}"
+        command: "/usr/local/bin/python3 -m pip list -v"
+        chdir: "/tf/tensorflow"
+      register: pip_output
+
+    - name: (Python {{ py_ver }}) save list of installed Python packages
+      ansible.builtin.template:
+        src: "pip-stdout.j2"
+        dest: "{{ wheels_dir }}/log-pip-py{{ py_ver }}.txt"
+        mode: 0444
+
+    - name: (Python {{ py_ver }}) save tests output to file
+      ansible.builtin.template:
+        src: "log-stdout.j2"
+        dest: "{{ wheels_dir }}/log-tests-py{{ py_ver }}.txt"
+        mode: 0444
+
+    - name: (Python {{ py_ver }}) save tests stderr output to file
+      ansible.builtin.template:
+        src: "log-stderr.j2"
+        dest: "{{ wheels_dir }}/log-tests-py{{ py_ver }}-stderr.txt"
+        mode: 0444
+
+    - name: (Python {{ py_ver }}) Extract number of tests run
+      ansible.builtin.set_fact:
+        ut_tests_line: "{{ test_output.stdout | regex_search('^Executed [0-9]+ out of [0-9]+ tests: [0-9]+ tests pass.*', multiline=True) }}"
+
+    - name: (Python {{ py_ver }}) Show number of tests run
+      ansible.builtin.debug:
+        var: ut_tests_line
+
+    - name: (Python {{ py_ver }}) Extract failed tests
+      ansible.builtin.set_fact:
+        tests_failed: "{{ test_output.stderr | regex_findall('FAILED: .*', multiline=True) }}"
+        # log-tests-py3.8-stderr.txt:FAILED: //tensorflow/tools/api/tests:api_compatibility_test (Summary)
+        tests_flaky: "{{ test_output.stdout | regex_findall('.*FLAKY.*', multiline=True) }}"
+        # log-tests-py3.9.txt://tensorflow/python/data/experimental/kernel_tests/service:worker_tags_test FLAKY, failed in 2 out of 34 in 900.3s
+
+    - name: (Python {{ py_ver }}) Show which tests are flaky
+      ansible.builtin.debug:
+        var: tests_flaky
+
+    - name: (Python {{ py_ver }}) Show which tests failed
+      ansible.builtin.debug:
+        var: tests_failed
+
+- name: (Python {{ py_ver }}) Convert wheel to manylinux2014 compatible one
+  community.docker.docker_container_exec:
+    container: "tf-py{{ py_ver }}"
+    command: "/usertools/rename_and_verify_wheels.sh"
+    chdir: "/tf/tensorflow"
+
+- name: (Python {{ py_ver }}) Get list of wheel files
+  ansible.builtin.find:
+    path: "{{ wheels_dir }}"
+    patterns: "tensorflow*.whl"
+    file_type: file
+  register: wheel_files
+
+- name: (Python {{ py_ver }}) Get filename of latest wheel
+  ansible.builtin.set_fact:
+    wheel_file: "{{ wheel_files.files | sort(attribute='mtime') | last }}"
+
+- name: (Python {{ py_ver }}) move manylinux2014 wheel outside
+  ansible.builtin.copy:
+    src: "{{ wheel_file.path }}"
+    dest: "{{ build_dir }}/ml_wheels/"
+    mode: 0444
+
+- name: (Python {{ py_ver }}) Remove manylinux2014 wheel
+  ansible.builtin.file:
+    path: "{{ wheel_file.path }}"
+    state: absent
+
+- name: (Python {{ py_ver }}) stop build container
+  community.docker.docker_container:
+    name: "tf-py{{ py_ver }}"
+    image: "linaro/tensorflow-arm64-build:latest-python{{ py_ver }}"
+    state: absent
+    timeout: 6000
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/hermetic-upper-constraints.txt b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/hermetic-upper-constraints.txt
new file mode 100644
index 0000000000..c77866ab73
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/hermetic-upper-constraints.txt
@@ -0,0 +1,3 @@
+Cython>=0.29
+pip>=21
+
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/log-stderr.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/log-stderr.j2
new file mode 100644
index 0000000000..413d124911
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/log-stderr.j2
@@ -0,0 +1 @@
+{{ test_output.stderr }}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/log-stdout.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/log-stdout.j2
new file mode 100644
index 0000000000..a945d00e0f
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/log-stdout.j2
@@ -0,0 +1 @@
+{{ test_output.stdout }}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/pip-stdout.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/pip-stdout.j2
new file mode 100644
index 0000000000..376563f28e
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/pip-stdout.j2
@@ -0,0 +1 @@
+{{ pip_output.stdout }}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/run-tests.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/run-tests.sh.j2
new file mode 100644
index 0000000000..1d04ff326b
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_in_container/templates/run-tests.sh.j2
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+source tensorflow/tools/ci_build/build_scripts/DEFAULT_TEST_TARGETS.sh
+
+start-stop-daemon -b -n portserver.py -a /usr/local/bin/python3 -S -- /usr/local/bin/portserver.py
+
+bazel --bazelrc=/usertools/{{ bazelrc_file }} test \
+      --config=sigbuild_local_cache \
+      {% if onednn_build %} --config=mkl_aarch64_threadpool {% endif %} \
+      {% if onednn_enable_opt %} --test_env=TF_ENABLE_ONEDNN_OPTS=1 {% endif %} \
+      --test_env=PORTSERVER_ADDRESS=@unittest-portserver \
+      --cache_test_results=no \
+      --test_timeout=500,900,3000,-1 \
+      --config=pycpp_filters \
+      --build_tests_only \
+      -- ${DEFAULT_BAZEL_TARGETS} \
+      -{{ tf_ver.value.unit_tests_exclude | join(" -") }} \
+      {{ onednn_ut_exclude }} \
+      {{ clang_ut_exclude }} \
+      {{ gcc_ut_exclude }}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/files/upper-constraints.txt b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/files/upper-constraints.txt
new file mode 100644
index 0000000000..43f2bd8dd1
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/files/upper-constraints.txt
@@ -0,0 +1,2 @@
+pip>=21
+wheel ~= 0.35
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/build_wheel.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/build_wheel.yml
new file mode 100644
index 0000000000..d971b54e43
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/build_wheel.yml
@@ -0,0 +1,9 @@
+---
+- name: Build TensorFlow IO wheels for Python {{ python_version }}  # noqa no-changed-when
+  ansible.builtin.shell:
+    cmd: |
+      /opt/python/{{ python_version }}/bin/python setup.py --data bazel-bin -q bdist_wheel
+      rm -rf build
+      /opt/python/{{ python_version }}/bin/python setup.py --data bazel-bin -q bdist_wheel --project tensorflow-io-gcs-filesystem
+    chdir: "{{ build_dir }}/io-{{ tensorflow_io_version }}/"
+    executable: /bin/bash
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/fetch.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/fetch.yml
new file mode 100644
index 0000000000..6447aea8b7
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/fetch.yml
@@ -0,0 +1,32 @@
+---
+- name: Fetch and unpack TensorFlow IO source archive
+  when: tensorflow_io_version != 'git'
+  block:
+    - name: Fetch TensorFlow IO {{ tensorflow_io_version }} source
+      ansible.builtin.get_url:
+        url: "https://github.com/tensorflow/io/archive/refs/tags/v{{ tensorflow_io_version }}.tar.gz"
+        dest: "{{ build_dir }}/io-{{ tensorflow_io_version }}.tar.gz"
+        mode: 0600
+
+    - name: Unpack TensorFlow IO {{ tensorflow_io_version }} source
+      ansible.builtin.unarchive:
+        src: "{{ build_dir }}/io-{{ tensorflow_io_version }}.tar.gz"
+        dest: "{{ build_dir }}/"
+        remote_src: true
+
+- name: Fetch TensorFlow IO from git
+  ansible.builtin.git:
+    repo: "https://github.com/tensorflow/io.git"  # noqa latest[git]
+    dest: "{{ build_dir }}/io-{{ tensorflow_io_version }}/"
+    depth: 1
+    recursive: true
+    force: true
+    version: "{{ tensorflow_io_git_version }}"
+  when: tensorflow_io_version == 'git'
+
+  # https://github.com/tensorflow/io/issues/1510
+- name: Make libwebp buildable with gcc 10
+  ansible.builtin.lineinfile:
+    regexp: "^.*WEBP_EXTERN.*$"
+    state: absent
+    path: "{{ build_dir }}/io-{{ tensorflow_io_version }}/third_party/libwebp.BUILD"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/gcc4-abi-build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/gcc4-abi-build.yml
new file mode 100644
index 0000000000..a75123544c
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/gcc4-abi-build.yml
@@ -0,0 +1,63 @@
+---
+- name: Build Bazel
+  ansible.builtin.include_role:
+    name: bazel
+  vars:
+    bazel_version: "{{ tfio_ver.value.bazel_version }}"
+
+- name: Create {{ py_ver }} virtualenv
+  ansible.builtin.include_role:
+    name: python
+    tasks_from: virtualenv.yml
+
+- name: Install TensorFlow {{ tensorflow_version }}
+  ansible.builtin.pip:
+    name: "tensorflow_aarch64=={{ tensorflow_version }}"
+    virtualenv: "{{ virtualenv_path }}"
+    virtualenv_python: "/opt/python/{{ py_ver }}/bin/python3"
+    extra_args: "--extra-index-url {{ pip_extra_index_url }}"
+
+- name: Build TensorFlow IO {{ tensorflow_io_version }} for {{ py_ver }}  # noqa no-changed-when
+  ansible.builtin.shell:
+    cmd: |
+      set -xe
+      source {{ virtualenv_path }}/bin/activate
+
+      python3 tools/build/configure.py
+      export BAZEL_OPTIMIZATION="-j {{ ansible_processor_vcpus }}"
+      bazel build   ${BAZEL_OPTIMIZATION}   -- //tensorflow_io/...  //tensorflow_io_gcs_filesystem/...
+
+      mkdir -p build
+      cp -r bazel-bin/tensorflow_io                 build/tensorflow_io
+      cp -r bazel-bin/tensorflow_io_gcs_filesystem  build/tensorflow_io_gcs_filesystem
+    chdir: "{{ build_dir }}/io-{{ tensorflow_io_version }}/"
+    executable: /bin/bash
+
+- name: Stop bazel server
+  ansible.builtin.include_role:
+    name: bazel
+    tasks_from: stop.yml
+
+- name: Go through each Python version
+  ansible.builtin.include_role:
+    name: tensorflow_io
+    tasks_from: build_wheel.yml
+  loop: "{{ tfio_ver.value.python_versions }}"
+  loop_control:
+    loop_var: python_version
+
+- name: Audit TensorFlow IO wheels
+  ansible.builtin.shell:
+    cmd: |
+      for wheel in dist/*.whl
+      do
+        LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ virtualenv_path }}/lib/python3.8/site-packages/tensorflow ./tools/build/auditwheel repair -w "{{ wheels_dir }}" "$wheel"
+      done
+    chdir: "{{ build_dir }}/io-{{ tensorflow_io_version }}/"
+    executable: /bin/bash
+  when: run_audit
+
+- name: Copy un-audited wheels into place
+  ansible.builtin.shell:
+    cmd: "cp {{ build_dir }}/io-{{ tensorflow_io_version }}/dist/tensorflow*.whl {{ wheels_dir }}"
+  when: not run_audit
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/manylinux-build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/manylinux-build.yml
new file mode 100644
index 0000000000..023487e727
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io/tasks/manylinux-build.yml
@@ -0,0 +1,42 @@
+---
+- name: Set version variables
+  ansible.builtin.set_fact:
+    tensorflow_io_version: "{{ tfio_ver.value.tensorflow_io_version }}"
+    tensorflow_version: "{{ tfio_ver.value.tensorflow_version }}"
+    image_prefix: "{{ tfio_ver.value.image_prefix }}"
+
+- name: Set git version variables
+  ansible.builtin.set_fact:
+    tensorflow_io_git_version: "{{ tfio_ver.value.tensorflow_io_git_version }}"
+  when: tensorflow_io_version == 'git'
+
+- name: Remove TensorFlow IO {{ tensorflow_io_version }} sources from previous build
+  ansible.builtin.file:
+    path: "{{ build_dir }}/io-{{ tensorflow_io_version }}/"
+    state: absent
+
+- name: Fetch and unpack TensorFlow IO source archive
+  ansible.builtin.include_tasks:
+    file: fetch.yml
+
+- name: Copy upper constraints
+  ansible.builtin.template:
+    src: "files/upper-constraints.txt"
+    dest: "{{ wheels_dir }}/upper-constraints.txt"
+    mode: 0644
+    force: true
+
+- name: Set py_ver to version needed for binary build - {{ tfio_ver.value.build_py_ver }}
+  ansible.builtin.set_fact:
+    py_ver: "{{ tfio_ver.value.build_py_ver }}"
+
+- name: Run TensorFlow IO build in manylinux2014 container
+  ansible.builtin.include_tasks:
+    file: gcc4-abi-build.yml
+  when: not dual_abi
+
+- name: Build TensorFlow IO in Dual ABI enabled container
+  ansible.builtin.include_role:
+    name: tensorflow_io_in_container
+    tasks_from: dual-abi-build.yml
+  when: dual_abi
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/build_wheel.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/build_wheel.yml
new file mode 100644
index 0000000000..f30649facd
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/build_wheel.yml
@@ -0,0 +1,13 @@
+---
+- name: Create wheel build script from template
+  ansible.builtin.template:
+    src: "build_tfio_wheels.sh.j2"
+    dest: "{{ build_dir }}/scripts/build_tfio_wheels.sh"
+    mode: "755"
+    force: true
+
+- name: Build TensorFlow IO wheels for Python {{ python_version }}  # noqa no-changed-when
+  community.docker.docker_container_exec:
+    container: "tfio-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/build_tfio_wheels.sh
+    chdir: "/tmp/workspace"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/dual-abi-build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/dual-abi-build.yml
new file mode 100644
index 0000000000..162b05b239
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/dual-abi-build.yml
@@ -0,0 +1,93 @@
+---
+- name: Create build scripts directory
+  ansible.builtin.file:
+    path: "{{ build_dir }}/scripts"
+    state: directory
+    mode: "755"
+
+- name: Create build scripts from templates
+  ansible.builtin.template:
+    src: "{{ item.name }}"
+    dest: "{{ build_dir }}/scripts/{{ item.target }}"
+    mode: "755"
+    force: true
+  loop:
+    - { name: 'build_tfio_binaries.sh.j2', target: 'build_tfio_binaries.sh' }
+    - { name: 'audit_tfio_wheels.sh.j2', target: 'audit_tfio_wheels.sh' }
+
+- name: Start TensorFlow IO build container
+  community.docker.docker_container:
+    name: "tfio-multipython"
+    image: "linaro/tensorflow-arm64-build:{{ image_prefix }}-multipython"
+    pull: true
+    state: started
+    restart: true
+    volumes:
+      - "{{ build_dir }}:/tmp/workspace"
+    detach: true
+    user: buildslave
+    working_dir: "/tmp/workspace"
+    network_mode: host
+    command: "sleep infinity"
+    timeout: 600
+
+- name: Create initial build venv
+  ansible.builtin.include_tasks:
+    file: virtualenv.yml
+
+- name: Build TensorFlow IO {{ tensorflow_io_version }} for {{ py_ver }}  # noqa no-changed-when
+  community.docker.docker_container_exec:
+    container: "tfio-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/build_tfio_binaries.sh
+    chdir: "/tmp/workspace"
+
+- name: Go through each Python version
+  ansible.builtin.include_tasks:
+    file: build_wheel.yml
+  loop: "{{ tfio_ver.value.python_versions }}"
+  loop_control:
+    loop_var: python_version
+
+- name: Copy un-audited wheels into place
+  community.docker.docker_container_exec:
+    container: "tfio-multipython"
+    command: bash -c "cp /tmp/workspace/io-{{ tensorflow_io_version }}/dist/tensorflow*.whl /tmp/workspace/wheels/"
+  when: not run_audit
+
+- name: Stop build container
+  community.docker.docker_container:
+    name: "tfio-multipython"
+    image: "linaro/tensorflow-arm64-build:{{ image_prefix }}-multipython"
+    state: absent
+    timeout: 600
+
+- name: Audit TensorFlow IO wheels in manylinux2014_aarch64 container
+  when: run_audit
+  block:
+    - name: Start TensorFlow IO manylinux2014 audit container
+      community.docker.docker_container:
+        name: "tfio-audit"
+        image: "quay.io/pypa/manylinux2014_aarch64"
+        pull: true
+        state: started
+        restart: true
+        volumes:
+          - "{{ build_dir }}:/tmp/workspace"
+        detach: true
+        working_dir: "/tmp/workspace"
+        network_mode: host
+        command: "sleep infinity"
+        timeout: 600
+
+    - name: Audit TensorFlow IO wheels
+      community.docker.docker_container_exec:
+        container: "tfio-audit"
+        command: /bin/bash -c /tmp/workspace/scripts/audit_tfio_wheels.sh
+        chdir: "/tmp/workspace/io-{{ tensorflow_io_version }}"
+
+    - name: Stop audit container
+      community.docker.docker_container:
+        name: "tfio-audit"
+        image: "quay.io/pypa/manylinux2014_aarch64"
+        state: absent
+        timeout: 600
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/virtualenv.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/virtualenv.yml
new file mode 100644
index 0000000000..9e5d58312e
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/tasks/virtualenv.yml
@@ -0,0 +1,20 @@
+---
+- name: Create virtualenv scripts from templates
+  ansible.builtin.template:
+    src: "{{ item.name }}"
+    dest: "{{ build_dir }}/scripts/{{ item.target }}"
+    mode: "755"
+    force: true
+  loop:
+    - { name: 'init_venv.sh.j2', target: 'init_venv.sh' }
+    - { name: 'install_venv.sh.j2', target: 'install_venv.sh' }
+
+- name: Create python-{{ py_ver }} venv
+  community.docker.docker_container_exec:
+    container: "tfio-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/init_venv.sh
+
+- name: Populate python-{{ py_ver }} venv
+  community.docker.docker_container_exec:
+    container: "tfio-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/install_venv.sh
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/audit_tfio_wheels.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/audit_tfio_wheels.sh.j2
new file mode 100644
index 0000000000..466078817e
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/audit_tfio_wheels.sh.j2
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+for wheel in dist/*.whl
+do
+  ./tools/build/auditwheel repair -w ../wheels $wheel
+done
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/build_tfio_binaries.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/build_tfio_binaries.sh.j2
new file mode 100644
index 0000000000..bdc441c209
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/build_tfio_binaries.sh.j2
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -xe
+source ./venv-{{ py_ver }}/bin/activate
+python3 -m pip install --extra-index-url {{ pip_extra_index_url }} \
+    tensorflow_aarch64=={{ tensorflow_version }}
+cd /tmp/workspace/io-{{ tensorflow_io_version }}
+python3 tools/build/configure.py
+bazel build -j {{ ansible_processor_vcpus }} \
+    --crosstool_top=//third_party/toolchains/gcc10_manylinux2014_aarch64:toolchain \
+    -- //tensorflow_io/...  //tensorflow_io_gcs_filesystem/...
+#mkdir -p build
+#cp -r bazel-bin/tensorflow_io                 build/tensorflow_io
+#cp -r bazel-bin/tensorflow_io_gcs_filesystem  build/tensorflow_io_gcs_filesystem
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/build_tfio_wheels.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/build_tfio_wheels.sh.j2
new file mode 100644
index 0000000000..44b5ee0b89
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/build_tfio_wheels.sh.j2
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -xe
+cd /tmp/workspace/io-{{ tensorflow_io_version }}
+/usr/bin/python{{ python_version }} setup.py --data bazel-bin -q bdist_wheel
+rm -rf build
+/usr/bin/python{{ python_version }} setup.py --data bazel-bin -q bdist_wheel --project tensorflow-io-gcs-filesystem
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/init_venv.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/init_venv.sh.j2
new file mode 100644
index 0000000000..fdf7804b9a
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/init_venv.sh.j2
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/usr/bin/python{{ py_ver }} -m venv venv-{{ py_ver }}
+source venv-{{ py_ver }}/bin/activate
+python3 -m pip install --upgrade pip setuptools
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/install_venv.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/install_venv.sh.j2
new file mode 100644
index 0000000000..c5b6671887
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_io_in_container/templates/install_venv.sh.j2
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+echo Will install needed PyPi packages
+source venv-{{ py_ver }}/bin/activate
+python3 -m pip install pkgconfig Cython wheel
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/files/upper-constraints.txt b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/files/upper-constraints.txt
new file mode 100644
index 0000000000..43f2bd8dd1
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/files/upper-constraints.txt
@@ -0,0 +1,2 @@
+pip>=21
+wheel ~= 0.35
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/build_wheel.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/build_wheel.yml
new file mode 100644
index 0000000000..e667fc42fa
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/build_wheel.yml
@@ -0,0 +1,17 @@
+---
+- name: Create virtualenv for Python {{ python_version }}
+  ansible.builtin.include_tasks:
+    file: virtualenv.yml
+
+- name: Create wheel build script from template
+  ansible.builtin.template:
+    src: "build_tf_text_wheels.sh.j2"
+    dest: "{{ build_dir }}/scripts/build_tf_text_wheels.sh"
+    mode: "755"
+    force: true
+
+- name: Build TensorFlow Text wheels for Python {{ python_version }}  # noqa no-changed-when
+  community.docker.docker_container_exec:
+    container: "tf-text-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/build_tf_text_wheels.sh
+    chdir: "/tmp/workspace"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/dual-abi-build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/dual-abi-build.yml
new file mode 100644
index 0000000000..97a6c71e27
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/dual-abi-build.yml
@@ -0,0 +1,74 @@
+---
+- name: Create build scripts directory
+  ansible.builtin.file:
+    path: "{{ build_dir }}/scripts"
+    state: directory
+    mode: "755"
+
+- name: Create build scripts from templates
+  ansible.builtin.template:
+    src: "audit_tf_text_wheels.sh.j2"
+    dest: "{{ build_dir }}/scripts/audit_tf_text_wheels.sh"
+    mode: "755"
+    force: true
+
+- name: Start TensorFlow Text build container
+  community.docker.docker_container:
+    name: "tf-text-multipython"
+    image: "linaro/tensorflow-arm64-build:{{ image_prefix }}-multipython"
+    pull: true
+    state: started
+    restart: true
+    volumes:
+      - "{{ build_dir }}:/tmp/workspace"
+    detach: true
+    user: buildslave
+    working_dir: "/tmp/workspace"
+    network_mode: host
+    command: "sleep infinity"
+    timeout: 600
+
+- name: Go through each Python version
+  ansible.builtin.include_tasks:
+    file: build_wheel.yml
+  loop: "{{ tf_text_ver.value.python_versions }}"
+  loop_control:
+    loop_var: python_version
+
+- name: Stop build container
+  community.docker.docker_container:
+    name: "tf-text-multipython"
+    image: "linaro/tensorflow-arm64-build:{{ image_prefix }}-multipython"
+    state: absent
+    timeout: 600
+
+- name: Audit TensorFlow Text wheels in manylinux2014_aarch64 container
+  when: run_audit
+  block:
+    - name: Start TensorFlow IO manylinux2014 audit container
+      community.docker.docker_container:
+        name: "tf-text-audit"
+        image: "quay.io/pypa/manylinux2014_aarch64"
+        pull: true
+        state: started
+        restart: true
+        volumes:
+          - "{{ build_dir }}:/tmp/workspace"
+        detach: true
+        working_dir: "/tmp/workspace"
+        network_mode: host
+        command: "sleep infinity"
+        timeout: 600
+
+    - name: Audit TensorFlow Text wheels
+      community.docker.docker_container_exec:
+        container: "tf-text-audit"
+        command: /bin/bash -c /tmp/workspace/scripts/audit_tf_text_wheels.sh
+        chdir: "/tmp/workspace/text-{{ tensorflow_text_version }}"
+
+    - name: Stop audit container
+      community.docker.docker_container:
+        name: "tf-text-audit"
+        image: "quay.io/pypa/manylinux2014_aarch64"
+        state: absent
+        timeout: 600
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/fetch.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/fetch.yml
new file mode 100644
index 0000000000..5eb36969ca
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/fetch.yml
@@ -0,0 +1,32 @@
+---
+- name: Fetch and unpack TensorFlow Text source archive
+  when: tensorflow_text_version != 'git'
+  block:
+    - name: Fetch TensorFlow Text {{ tensorflow_text_version }} source
+      ansible.builtin.get_url:
+        url: "https://github.com/tensorflow/text/archive/refs/tags/v{{ tensorflow_text_version }}.tar.gz"
+        dest: "{{ build_dir }}/text-{{ tensorflow_text_version }}.tar.gz"
+        mode: 0600
+
+    - name: Unpack TensorFlow Text {{ tensorflow_text_version }} source
+      ansible.builtin.unarchive:
+        src: "{{ build_dir }}/text-{{ tensorflow_text_version }}.tar.gz"
+        dest: "{{ build_dir }}/"
+        remote_src: true
+
+- name: Fetch TensorFlow Text from git
+  ansible.builtin.git:
+    repo: "https://github.com/tensorflow/text.git"  # noqa latest[git]
+    dest: "{{ build_dir }}/text-{{ tensorflow_text_version }}/"
+    depth: 1
+    recursive: true
+    force: true
+    version: "{{ tensorflow_text_git_version }}"
+  when: tensorflow_text_version == 'git'
+
+- name: Patch the source to work
+  ansible.builtin.lineinfile:
+    path:  "{{ build_dir }}/text-{{ tensorflow_text_version }}/oss_scripts/prepare_tf_dep.sh"
+    regexp: '^(.*)(Browse the repository)(.*)$'
+    line: '\1permalink\3'
+    backrefs: true
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/manylinux-build.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/manylinux-build.yml
new file mode 100644
index 0000000000..46968aca2b
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/manylinux-build.yml
@@ -0,0 +1,31 @@
+---
+- name: Set version variables
+  ansible.builtin.set_fact:
+    tensorflow_text_version: "{{ tf_text_ver.value.tensorflow_text_version }}"
+    tensorflow_version: "{{ tf_text_ver.value.tensorflow_version }}"
+    image_prefix: "{{ tf_text_ver.value.image_prefix }}"
+
+- name: Set git version variables
+  ansible.builtin.set_fact:
+    tensorflow_text_git_version: "{{ tf_text_ver.value.tensorflow_text_git_version }}"
+  when: tensorflow_text_version == 'git'
+
+- name: Remove TensorFlow Text {{ tensorflow_text_version }} sources from previous build
+  ansible.builtin.file:
+    path: "{{ build_dir }}/text-{{ tensorflow_text_version }}/"
+    state: absent
+
+- name: Fetch and unpack TensorFlow Text source archive
+  ansible.builtin.include_tasks:
+    file: fetch.yml
+
+- name: Copy upper constraints
+  ansible.builtin.template:
+    src: "files/upper-constraints.txt"
+    dest: "{{ wheels_dir }}/upper-constraints.txt"
+    mode: 0644
+    force: true
+
+- name: Build TensorFlow Text in Dual ABI enabled container
+  ansible.builtin.include_tasks:
+    file: dual-abi-build.yml
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/virtualenv.yml b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/virtualenv.yml
new file mode 100644
index 0000000000..443f01dc41
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/tasks/virtualenv.yml
@@ -0,0 +1,20 @@
+---
+- name: Create virtualenv scripts from templates
+  ansible.builtin.template:
+    src: "{{ item.name }}"
+    dest: "{{ build_dir }}/scripts/{{ item.target }}"
+    mode: "755"
+    force: true
+  loop:
+    - { name: 'init_venv.sh.j2', target: 'init_venv.sh' }
+    - { name: 'install_venv.sh.j2', target: 'install_venv.sh' }
+
+- name: Create python-{{ python_version }} venv
+  community.docker.docker_container_exec:
+    container: "tf-text-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/init_venv.sh
+
+- name: Populate python-{{ python_version }} venv
+  community.docker.docker_container_exec:
+    container: "tf-text-multipython"
+    command: /bin/bash -c /tmp/workspace/scripts/install_venv.sh
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/audit_tf_text_wheels.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/audit_tf_text_wheels.sh.j2
new file mode 100644
index 0000000000..79f3c50ae5
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/audit_tf_text_wheels.sh.j2
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -e
+
+TF_SHARED_LIBRARY_NAME=$(grep -r TF_SHARED_LIBRARY_NAME .bazelrc | awk -F= '{print$2}')
+
+POLICY_JSON=$(find / -name manylinux-policy.json)
+
+sed -i "s/libresolv.so.2\"/libresolv.so.2\", $TF_SHARED_LIBRARY_NAME/g" $POLICY_JSON
+
+for wheel in dist/*linux_aarch64.whl
+do
+  auditwheel repair -w ../wheels $wheel
+done
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/build_tf_text_wheels.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/build_tf_text_wheels.sh.j2
new file mode 100644
index 0000000000..5e05f986ec
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/build_tf_text_wheels.sh.j2
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -xe
+cd /tmp/workspace/text-{{ tensorflow_text_version }}
+source /tmp/workspace/venv-{{ python_version }}/bin/activate
+./oss_scripts/configure.sh
+./oss_scripts/prepare_tf_dep.sh
+bazel build --enable_runfiles --crosstool_top="@ml2014_aarch64_config_aarch64//crosstool:toolchain" oss_scripts/pip_package:build_pip_package
+mkdir -p dist
+bazel-bin/oss_scripts/pip_package/build_pip_package dist
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/init_venv.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/init_venv.sh.j2
new file mode 100644
index 0000000000..f1e304fbc3
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/init_venv.sh.j2
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+/usr/bin/python{{ python_version }} -m venv venv-{{ python_version }}
+source venv-{{ python_version }}/bin/activate
+python3 -m pip install --upgrade pip setuptools
diff --git a/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/install_venv.sh.j2 b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/install_venv.sh.j2
new file mode 100644
index 0000000000..3cd56976eb
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/roles/tensorflow_text/templates/install_venv.sh.j2
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+echo Will install needed PyPi packages
+source venv-{{ python_version }}/bin/activate
+python3 -m pip install wheel
+python3 -m pip install {% if tensorflow_text_version != 'git' %} tensorflow=={{ tensorflow_version }} {% else %} tf-nightly {% endif %}
diff --git a/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tf-text.yml b/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tf-text.yml
new file mode 100644
index 0000000000..79902c952f
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tf-text.yml
@@ -0,0 +1,31 @@
+---
+pip_extra_index_url: "https://snapshots.linaro.org/ldcg/python-cache/"
+build_dir: "/tmp/workspace"
+wheels_dir: "/tmp/workspace/wheels/"
+run_audit: true
+bazelisk_version: "v1.12.0"
+tf_text_versions:
+  "2.16":
+    tensorflow_text_version: "2.16.1"
+    tensorflow_version: "2.16.*"
+    bazel_version: "bazelisk"
+    image_prefix: "2.16"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+  "git":
+    tensorflow_text_version: "git"
+    tensorflow_text_git_version: "HEAD"  # can be set to tags like "v0.24.0" or git commit id
+    tensorflow_version: "2.16.1"
+    bazel_version: "bazelisk"
+    image_prefix: "latest"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+to_be_built:
+#   - "2.16"
+#   - "git"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tfio.yml b/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tfio.yml
new file mode 100644
index 0000000000..548d72f59a
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tfio.yml
@@ -0,0 +1,32 @@
+---
+pip_extra_index_url: "https://snapshots.linaro.org/ldcg/python-cache/"
+build_dir: "/tmp/workspace"
+wheels_dir: "/tmp/workspace/wheels/"
+run_audit: true
+bazelisk_version: "v1.12.0"
+tfio_versions:
+  "0.36":
+    tensorflow_io_version: "0.36.0"
+    tensorflow_version: "2.15.*"
+    bazel_version: "bazelisk"
+    build_py_ver: "3.9"
+    image_prefix: "2.15"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+  "git":
+    tensorflow_io_version: "git"
+    tensorflow_io_git_version: "HEAD"  # can be set to tags like "v0.24.0" or git commit id
+    tensorflow_version: "2.15.0"
+    bazel_version: "bazelisk"
+    build_py_ver: "3.9"
+    image_prefix: "2.16"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+to_be_built:
+#   - "0.36"
+#   - "git"
diff --git a/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml b/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
new file mode 100644
index 0000000000..769c33ec37
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
@@ -0,0 +1,91 @@
+---
+pip_extra_index_url: "https://snapshots.linaro.org/ldcg/python-cache/"
+build_dir: "/tmp/workspace"
+wheels_dir: "/tmp/workspace/wheels/"
+clang_build: false
+onednn_build: false
+onednn_enable_opt: false
+prebuild_release: false
+prebuild_hash: ""
+bazelrc_file: "{{ 'aarch64_clang.bazelrc' if clang_build else 'aarch64.bazelrc' }}"
+extra_options: "{{ '--config=mkl_aarch64_threadpool' if onednn_build else '' }}"
+extra_test_options: "{{ '--test_env=TF_ENABLE_ONEDNN_OPTS=0' if onednn_build else '' }}"
+variant_name: "{{ '-oneDNN-ACL' if onednn_build else '' }}"
+bazelisk_version: "v1.12.0"
+versions:
+  "2.16":
+    tensorflow_version: "2.16.1"
+    bazel_version: "bazelisk"
+    old_pip_package: true
+    image_prefix: "2.16"
+    run_unit_tests: true
+    run_serial_unit_tests: true
+    onednn_ut_exclude: ""
+    unit_tests_exclude:
+       - "//tensorflow/lite/..."
+    unit_tests_gcc_exclude:
+       - "//tensorflow/compiler/mlir/lite/debug:debug_test"
+       - "//tensorflow/compiler/mlir/quantization/tensorflow/debugging:mlir_dump_test"
+    unit_tests_clang_exclude:
+      - "//tensorflow/core/kernels/image:resize_bicubic_op_test"
+    serial_unit_tests_exclude: ""
+    unit_tests_filter_flags: "NOT_USED"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+  "2.15":
+    tensorflow_version: "2.15.1"
+    bazel_version: "bazelisk"
+    old_pip_package: true
+    image_prefix: "2.15"
+    run_unit_tests: true
+    run_serial_unit_tests: true
+    onednn_ut_exclude:
+       - "//tensorflow/core/grappler/optimizers:auto_mixed_precision_test"
+       - "//tensorflow/core/grappler/optimizers:remapper_test"
+    unit_tests_exclude:
+       - "//tensorflow/lite/..."
+       - "//tensorflow/tools/api/tests:api_compatibility_test"
+    unit_tests_gcc_exclude:
+       - "//tensorflow/compiler/mlir/lite/debug:debug_test"
+    unit_tests_clang_exclude:
+      - "//tensorflow/compiler/mlir/lite/quantization/lite:quantize_model_test"
+      - "//tensorflow/compiler/mlir/lite/quantization/lite:quantize_weights_test"
+      - "//tensorflow/compiler/mlir/lite/sparsity:sparsify_model_test"
+      - "//tensorflow/core/kernels/image:resize_bicubic_op_test"
+    serial_unit_tests_exclude: ""
+    unit_tests_filter_flags: "NOT_USED"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+  "git":
+    tensorflow_version: "git"
+    bazel_version: "bazelisk"
+    old_pip_package: false
+    image_prefix: "latest"
+    run_unit_tests: true
+    run_serial_unit_tests: true
+    onednn_ut_exclude: ""
+    unit_tests_exclude:
+       - "//tensorflow/lite/..."
+    unit_tests_gcc_exclude: ""
+    unit_tests_clang_exclude:
+      - "//tensorflow/core/kernels/image:resize_bicubic_op_test"
+    serial_unit_tests_exclude: ""
+    unit_tests_filter_flags: "NOT_USED"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+      - "3.12"
+to_be_built:
+#   - "2.12"
+#   - "2.13"
+#   - "2.14"
+#   - "2.15"
+#   - "git"
+
+# Python versions are from tensorflow-git/tensorflow/tools/pip_package/setup.py file
diff --git a/ldcg-python-manylinux-tensorflow/build-manylinux2014-wheels.sh b/ldcg-python-manylinux-tensorflow/build-manylinux2014-wheels.sh
new file mode 100644
index 0000000000..2c85328bae
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/build-manylinux2014-wheels.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -xe
+
+# Ansible is noarch so we can just grab it from x86-64 repo
+yum install -y centos-release-ansible-29
+yum install -y ansible
+
+cd /tmp/workspace
+
+# remove tensorflow source, wheels and venvs from previous jobs
+# we do it here as they are root:root
+rm -rf wheels *.whl cache* venv-* tensorflow-* || true
+
+cd configs/ldcg-python-manylinux-tensorflow/ansible
+
+ansible-playbook playbooks/build-tf.yml
diff --git a/ldcg-python-manylinux-tensorflow/build-tf-text.sh b/ldcg-python-manylinux-tensorflow/build-tf-text.sh
new file mode 100644
index 0000000000..83d644a51e
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/build-tf-text.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -xe
+
+cd $WORKSPACE
+
+rm -rf *.sh configs
+
+git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+
+if [ "$build0" = "true" ]; then
+    echo '  - "2.16"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tf-text.yml
+fi
+if [ "$buildgit" = "true" ]; then
+    echo '  - "git"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tf-text.yml
+fi
+if [ "$auditwheels" = "false" ]; then
+    sed -i -e '/run_audit/s/true/false/' configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tf-text.yml
+fi
+
+ansible-galaxy collection install community.docker
+
+cd configs/ldcg-python-manylinux-tensorflow/ansible/
+sed -i -e"s+/tmp/workspace+${WORKSPACE}+g" vars/vars-tf-text.yml
+
+ansible-playbook playbooks/build-tf-text-dual-abi.yml
diff --git a/ldcg-python-manylinux-tensorflow/build-tfio-manylinux2014-wheels.sh b/ldcg-python-manylinux-tensorflow/build-tfio-manylinux2014-wheels.sh
new file mode 100644
index 0000000000..d85ae43c0d
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/build-tfio-manylinux2014-wheels.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -xe
+
+# Ansible is noarch so we can just grab it from x86-64 repo
+yum install -y centos-release-ansible-29
+yum install -y ansible
+
+cd /tmp/workspace
+
+# remove wheels and venvs from previous jobs
+# we do it here as they are root:root
+rm -rf wheels *.whl cache* venv-*
+
+cd configs/ldcg-python-manylinux-tensorflow/ansible
+
+ansible-playbook playbooks/build-tf-io.yml
diff --git a/ldcg-python-manylinux-tensorflow/build-tfio.sh b/ldcg-python-manylinux-tensorflow/build-tfio.sh
new file mode 100644
index 0000000000..0e7ccddf40
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/build-tfio.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -xe
+
+cd $WORKSPACE
+
+rm -rf *.sh configs
+
+git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+
+if [ "$build0" = "true" ]; then
+    echo '  - "0.36"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tfio.yml
+fi
+if [ "$buildgit" = "true" ]; then
+    echo '  - "git"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tfio.yml
+fi
+if [ "$auditwheels" = "false" ]; then
+    sed -i -e '/run_audit/s/true/false/' configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars-tfio.yml
+fi
+
+ansible-galaxy collection install community.docker
+
+cd configs/ldcg-python-manylinux-tensorflow/ansible/
+sed -i -e"s+/tmp/workspace+${WORKSPACE}+g" vars/vars-tfio.yml
+
+ansible-playbook playbooks/build-tfio-dual-abi.yml
diff --git a/ldcg-python-manylinux-tensorflow/build.sh b/ldcg-python-manylinux-tensorflow/build.sh
new file mode 100644
index 0000000000..4e88a086d6
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/build.sh
@@ -0,0 +1,61 @@
+#!/bin/bash
+
+set -xe
+
+cd $WORKSPACE
+
+rm -rf *.sh configs wheels cache_upload
+
+mkdir wheels cache_upload
+
+git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+
+cd configs; git log --pretty=oneline -1; cd ..
+
+if [ "$build212" = "true" ]; then
+    echo '  - "2.12"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$build213" = "true" ]; then
+    echo '  - "2.13"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$build214" = "true" ]; then
+    echo '  - "2.14"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$build215" = "true" ]; then
+    echo '  - "2.15"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$build216" = "true" ]; then
+    echo '  - "2.16"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$buildgit" = "true" ]; then
+    echo '  - "git"' >> configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$buildonednn" = "true" ]; then
+    sed -i -e '/onednn_build/s/false/true/' configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$buildonednnopt" = "true" ]; then
+    sed -i -e '/onednn_enable_opt/s/false/true/' -e '/extra_test_options/s/0/1/' configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$prebuild" = "true" ]; then
+    sed -i -e '/prebuild_release/s/false/true/' configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+    sed -i -e "/prebuild_hash/s/\"\"/\"${prebuild_hash}\"/" configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+if [ "$useclang" = "true" ]; then
+    sed -i -e '/clang_build/s/false/true/' configs/ldcg-python-manylinux-tensorflow/ansible/vars/vars.yml
+fi
+
+ansible-galaxy collection install community.docker
+
+cd configs/ldcg-python-manylinux-tensorflow/ansible/
+sed -i -e"s+/tmp/workspace+${WORKSPACE}+g" vars/vars.yml
+
+ansible-playbook playbooks/build-tf-dual-abi.yml
+
+# To be in sync with upstream we keep wheels outside of wheels/ while we
+# loop on Python versions. Now let move them back so publishing script
+# would not require changes.
+cd $WORKSPACE
+mv ml_wheels/tensorflow_aarch64-*.whl wheels/
+
+# drop files we do not want/need to publish
+rm wheels/audit.txt wheels/profile.json.gz
diff --git a/ldcg-python-manylinux-tensorflow/publishers.sh b/ldcg-python-manylinux-tensorflow/publishers.sh
new file mode 100644
index 0000000000..ae19b34add
--- /dev/null
+++ b/ldcg-python-manylinux-tensorflow/publishers.sh
@@ -0,0 +1,62 @@
+#!/bin/bash
+
+# First publish wheels to cache
+
+COPY_FROM=${WORKSPACE}/cache_upload/
+PUBLISH_TO=ldcg/python-cache/
+
+set -ex
+
+# Publish wheel files
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+
+# Cache upload is not required for nightly build
+if [ -e $COPY_FROM ]
+then
+
+  ls -alR $COPY_FROM
+
+  time python3 ${HOME}/bin/linaro-cp.py \
+    $COPY_FROM \
+    $PUBLISH_TO || true
+
+  echo "Python wheels cached: https://snapshots.linaro.org/${PUBLISH_TO}"
+fi
+
+# Now is time to upload tensorflow
+
+SHORT_JOB_NAME=$(echo $JOB_NAME | cut -d'/' -f1)
+
+case $SHORT_JOB_NAME in
+
+  "ldcg-python-manylinux-tensorflow-nightly")
+    OUTPUT_PATH="ldcg/python/tensorflow-manylinux-nightly/$(date -u +%Y%m%d)-${BUILD_NUMBER}/"
+    ;;
+
+  "ldcg-python-manylinux-tensorflow-onednn-nightly")
+    OUTPUT_PATH="ldcg/python/tensorflow-onednn-manylinux-nightly/$(date -u +%Y%m%d)-${BUILD_NUMBER}/"
+    ;;
+
+  "ldcg-python-manylinux-tensorflow")
+    OUTPUT_PATH="ldcg/python/tensorflow-manylinux/${BUILD_NUMBER}/"
+    ;;
+
+  "ldcg-python-manylinux-tensorflow-io")
+    OUTPUT_PATH="ldcg/python/tensorflow-io-manylinux/${BUILD_NUMBER}/"
+    ;;
+
+  "ldcg-python-manylinux-tensorflow-text")
+    OUTPUT_PATH="ldcg/python/tensorflow-text-manylinux/${BUILD_NUMBER}/"
+    ;;
+
+esac
+
+ls -alR ${WORKSPACE}/wheels
+
+time python3 ${HOME}/bin/linaro-cp.py \
+  --link-latest \
+  ${WORKSPACE}/wheels \
+  $OUTPUT_PATH || true
+
+echo "Python wheels: https://snapshots.linaro.org/$OUTPUT_PATH"
diff --git a/ldcg-python-openxla.yaml b/ldcg-python-openxla.yaml
new file mode 100644
index 0000000000..db79d7766f
--- /dev/null
+++ b/ldcg-python-openxla.yaml
@@ -0,0 +1,40 @@
+- job:
+    name: ldcg-python-openxla
+    project-type: freestyle
+    defaults: global
+    triggers:
+        - timed: '0 6 * * *'
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - bool:
+            name: useclang
+            default: true
+            description: 'Use clang to build instead of gcc'
+        - bool:
+            name: buildgit
+            default: true
+            description: 'Build git HEAD'
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'OpenXLA unit tests'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: ldcg-python-openxla/build.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org andrew.goodbody@linaro.org'
diff --git a/ldcg-python-openxla/Dockerfile b/ldcg-python-openxla/Dockerfile
new file mode 100644
index 0000000000..f821258e09
--- /dev/null
+++ b/ldcg-python-openxla/Dockerfile
@@ -0,0 +1,15 @@
+ARG tag_prefix=latest
+FROM linaro/tensorflow-arm64-build:${tag_prefix}-multipython
+
+ARG py_major_minor_version='3.10'
+
+ENV PYTHON_BIN_PATH=/usr/bin/python${py_major_minor_version}
+
+RUN ln -s ${PYTHON_BIN_PATH} /usr/local/bin/python && \
+    ln -s ${PYTHON_BIN_PATH} /usr/local/bin/python3
+
+COPY upper-constraints.txt /
+RUN ${PYTHON_BIN_PATH} -m pip install -c /upper-constraints.txt -r /upper-constraints.txt
+
+RUN mkdir -p /tf/xla
+RUN chown buildslave:buildslave /tf/xla
diff --git a/ldcg-python-openxla/ansible/ansible.cfg b/ldcg-python-openxla/ansible/ansible.cfg
new file mode 100644
index 0000000000..28cbb08b00
--- /dev/null
+++ b/ldcg-python-openxla/ansible/ansible.cfg
@@ -0,0 +1,14 @@
+[defaults]
+interpreter_python: auto
+
+# Use the YAML callback plugin.
+stdout_callback = yaml
+
+# Use the stdout_callback when running ad-hoc commands.
+bin_ansible_callbacks = True
+
+# profile tasks
+callbacks_enabled = profile_tasks
+
+roles_path = roles:/etc/ansible/roles
+retry_files_enabled = False
diff --git a/ldcg-python-openxla/ansible/playbooks/test-openxla.yml b/ldcg-python-openxla/ansible/playbooks/test-openxla.yml
new file mode 100644
index 0000000000..a3c61b70e5
--- /dev/null
+++ b/ldcg-python-openxla/ansible/playbooks/test-openxla.yml
@@ -0,0 +1,30 @@
+---
+- name: Run unit tests on OpenXLA
+  hosts: localhost
+  vars_files:
+    ../vars/vars.yml
+
+  tasks:
+    - name: Cleanup after previous build
+      ansible.builtin.file:
+        path: "{{ build_dir }}/{{ item }}"
+        state: absent
+      loop:
+        - xla
+
+    - name: Create cache dirs
+      ansible.builtin.file:
+        path: "{{ build_dir }}/{{ item }}"
+        state: directory
+        mode: 0777
+      loop:
+        - bazel-cache
+
+    - name: Go through each OpenXLA version
+      ansible.builtin.include_role:
+        name: xla
+        tasks_from: loop.yml
+      loop: "{{ versions | dict2items }}"
+      loop_control:
+        loop_var: xla_ver
+      when: xla_ver.key in to_be_built
diff --git a/ldcg-python-openxla/ansible/roles/xla/tasks/fetch.yml b/ldcg-python-openxla/ansible/roles/xla/tasks/fetch.yml
new file mode 100644
index 0000000000..f9042a86af
--- /dev/null
+++ b/ldcg-python-openxla/ansible/roles/xla/tasks/fetch.yml
@@ -0,0 +1,28 @@
+---
+- name: Fetch OpenXLA from git
+  when: openxla_version == 'git'
+  ansible.builtin.git:
+    repo: "https://github.com/openxla/xla.git"  # noqa latest[git]
+    dest: "{{ xla_build_dir }}/"
+    depth: 1
+    recursive: true
+    force: true
+
+- name: Prepare OpenXLA source from git
+  when: openxla_version == 'git'
+  block:
+    - name: Set world write access to source
+      ansible.builtin.file:
+        path: "{{ xla_build_dir }}/"
+        state: directory
+        mode: 0777
+
+    - name: Get oneline version of git log for this checkout  # noqa no-changed-when
+      ansible.builtin.command:
+        cmd: "git log --pretty=oneline -1"
+        chdir: "{{ xla_build_dir }}/"
+      register: git_log
+
+    - name: Show git log
+      ansible.builtin.debug:
+        var: git_log.stdout
diff --git a/ldcg-python-openxla/ansible/roles/xla/tasks/loop.yml b/ldcg-python-openxla/ansible/roles/xla/tasks/loop.yml
new file mode 100644
index 0000000000..b4ea6a60af
--- /dev/null
+++ b/ldcg-python-openxla/ansible/roles/xla/tasks/loop.yml
@@ -0,0 +1,28 @@
+---
+- name: Set xla and other package versions
+  ansible.builtin.set_fact:
+    openxla_version: "{{ xla_ver.value.openxla_version }}"
+    numpy_version: "{{ xla_ver.value.numpy_version }}"
+    protobuf_version: "{{ xla_ver.value.protobuf_version }}"
+    bazel_version: "{{ xla_ver.value.bazel_version }}"
+    image_prefix: "{{ xla_ver.value.image_prefix }}"
+
+- name: Set build dir for OpenXLA {{ openxla_version }}
+  ansible.builtin.set_fact:
+    xla_build_dir: "{{ build_dir }}/xla-{{ openxla_version }}"
+
+- name: Remove OpenXLA {{ openxla_version }} sources from previous build
+  ansible.builtin.file:
+    path: "{{ xla_build_dir }}/"
+    state: absent
+
+- name: Fetch OpenXLA
+  ansible.builtin.include_tasks:
+    file: fetch.yml
+
+- name: Build OpenXLA for each Python version
+  ansible.builtin.include_tasks:
+    file: test.yml
+  loop: "{{ xla_ver.value.python_versions }}"
+  loop_control:
+    loop_var: py_ver
diff --git a/ldcg-python-openxla/ansible/roles/xla/tasks/test.yml b/ldcg-python-openxla/ansible/roles/xla/tasks/test.yml
new file mode 100644
index 0000000000..865d25b6bb
--- /dev/null
+++ b/ldcg-python-openxla/ansible/roles/xla/tasks/test.yml
@@ -0,0 +1,136 @@
+---
+- name: Reset checkout to clean state  # noqa command-instead-of-module
+  ansible.builtin.shell:
+    cmd: "git clean -dfx; git reset --hard"
+    chdir: "{{ xla_build_dir }}/"
+  when: openxla_version == 'git'
+
+- name: Configure default OpenXLA settings
+  ansible.builtin.template:
+    src: "tf_configure.bazelrc"
+    dest: "{{ xla_build_dir }}/.tf_configure.bazelrc"
+    mode: 0400
+    force: true
+
+- name: (Python {{ py_ver }}) copy upper constraints
+  local_action:
+    module: ansible.builtin.template
+    src: "upper-constraints.txt"
+    dest: "{{ build_dir }}/configs/ldcg-python-openxla/upper-constraints.txt"
+    mode: 0644  # needs to be readable in container as well
+    force: true
+
+- name: (Python {{ py_ver }}) build Python versioned container
+  community.docker.docker_image:
+    name: "xla-multipython-py{{ py_ver }}-{{ image_prefix }}"
+    build:
+      path: "{{ build_dir }}/configs/ldcg-python-openxla/"
+      args:
+        tag_prefix: "{{ image_prefix }}"
+        py_major_minor_version: "{{ py_ver }}"
+    source: build
+    force_source: true
+
+- name: (Python {{ py_ver }}) start build container
+  community.docker.docker_container:
+    name: "xla-py{{ py_ver }}"
+    image: "xla-multipython-py{{ py_ver }}-{{ image_prefix }}"
+    state: started
+    restart: true
+    volumes:
+      - "{{ xla_build_dir }}:/tf/xla"
+      - "{{ build_dir }}/bazel-cache:/tf/bazel-cache"
+    detach: true
+    user: buildslave
+    working_dir: "/tf/xla"
+    network_mode: host
+    command: "sleep infinity"
+    timeout: 6000
+
+- name: (Python {{ py_ver }}) create buildslave bazel cache dir
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: |
+      install -d -m0777 .cache/bazel/_bazel_buildslave
+    chdir: "/home/buildslave/"
+
+- name: (Python {{ py_ver }}) create link for bazel cache
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: |
+      ln -sf /tf/bazel-cache bazel/_bazel_buildslave/cache
+    chdir: "/home/buildslave/.cache/"
+
+- name: (Python {{ py_ver }}) create link for bazelisk cache
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: |
+      ln -sf /tf/bazel-cache bazelisk
+    chdir: "/home/buildslave/.cache/"
+
+- name: (Python {{ py_ver }}) create link for pip cache
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: |
+      ln -sf /tf/cache pip
+    chdir: "/home/buildslave/.cache/"
+
+- name: (Python {{ py_ver }}) collect list of installed Python packages for build
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: "/usr/local/bin/python3 -m pip list -v"
+    chdir: "/tf/xla"
+  register: pip_list_output
+
+- name: Show list of installed Python packages for build
+  ansible.builtin.debug:
+    var: pip_list_output.stdout
+
+- name: (Python {{ py_ver }}) build OpenXLA {{ openxla_version }}
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: "bazel build -- //xla/..."
+    chdir: "/tf/xla"
+
+- name: (Python {{ py_ver }}) create script to run tests
+  ansible.builtin.template:
+    src: "run-tests.sh.j2"
+    dest: "{{ xla_build_dir }}/run-tests.sh"
+    mode: 0755
+    force: true
+
+- name: (Python {{ py_ver }}) run OpenXLA {{ openxla_version }} tests
+  community.docker.docker_container_exec:
+    container: "xla-py{{ py_ver }}"
+    command: "bash run-tests.sh"
+    chdir: "/tf/xla"
+  register: test_output
+  ignore_errors: true
+
+- name: (Python {{ py_ver }}) Extract number of tests run
+  ansible.builtin.set_fact:
+    ut_tests_line: "{{ test_output.stdout | regex_search('^Executed [0-9]+ out of [0-9]+ tests: [0-9]+ tests pass.*', multiline=True) }}"
+
+- name: (Python {{ py_ver }}) Show number of tests run
+  ansible.builtin.debug:
+    var: ut_tests_line
+
+- name: (Python {{ py_ver }}) Extract failed tests
+  ansible.builtin.set_fact:
+    tests_failed: "{{ test_output.stderr | regex_findall('FAIL: .*', multiline=True) }}"
+    tests_flaky: "{{ test_output.stdout | regex_findall('.*FLAKY.*', multiline=True) }}"
+
+- name: (Python {{ py_ver }}) Show which tests are flaky
+  ansible.builtin.debug:
+    var: tests_flaky
+
+- name: (Python {{ py_ver }}) Show which tests failed
+  ansible.builtin.debug:
+    var: tests_failed
+
+- name: (Python {{ py_ver }}) stop build container
+  community.docker.docker_container:
+    name: "xla-py{{ py_ver }}"
+    image: "xla-multipython-py{{ py_ver }}-{{ image_prefix }}"
+    state: absent
+    timeout: 6000
diff --git a/ldcg-python-openxla/ansible/roles/xla/templates/run-tests.sh.j2 b/ldcg-python-openxla/ansible/roles/xla/templates/run-tests.sh.j2
new file mode 100644
index 0000000000..4441d56750
--- /dev/null
+++ b/ldcg-python-openxla/ansible/roles/xla/templates/run-tests.sh.j2
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+bazel test \
+      --cache_test_results=no \
+      --test_timeout=-1,-1,2000,-1 \
+      --build_tests_only \
+      --verbose_failures=true --test_output=errors \
+      --test_tag_filters={{ xla_ver.value.unit_tests_filter_flags }} \
+      --build_tag_filters={{ xla_ver.value.unit_tests_filter_flags }} \
+      --spawn_strategy=sandboxed \
+      -- //xla/...
diff --git a/ldcg-python-openxla/ansible/roles/xla/templates/tf_configure.bazelrc b/ldcg-python-openxla/ansible/roles/xla/templates/tf_configure.bazelrc
new file mode 100644
index 0000000000..d585bfa300
--- /dev/null
+++ b/ldcg-python-openxla/ansible/roles/xla/templates/tf_configure.bazelrc
@@ -0,0 +1,12 @@
+build --config=nonccl
+{% if clang_build %}
+build --crosstool_top="@ml2014_clang_aarch64_config_aarch64//crosstool:toolchain"
+build --linkopt="-fuse-ld=lld"
+build --copt=-Wno-gnu-offsetof-extensions
+{% else %}
+build --crosstool_top="@ml2014_aarch64_config_aarch64//crosstool:toolchain"
+{% endif %}
+build:opt --copt=-Wno-sign-compare
+build:opt --host_copt=-Wno-sign-compare
+test --test_size_filters=small,medium
+build --build_tag_filters=-benchmark-test,-no_oss,-oss_excluded,-gpu
diff --git a/ldcg-python-openxla/ansible/roles/xla/templates/upper-constraints.txt b/ldcg-python-openxla/ansible/roles/xla/templates/upper-constraints.txt
new file mode 100644
index 0000000000..02f12e926a
--- /dev/null
+++ b/ldcg-python-openxla/ansible/roles/xla/templates/upper-constraints.txt
@@ -0,0 +1,7 @@
+Cython>=0.29
+pip>=21
+
+numpy {{ numpy_version }}
+protobuf {{ protobuf_version }}
+
+lit >= 16.0.5.post0; python_version >= '3.11'
diff --git a/ldcg-python-openxla/ansible/vars/vars.yml b/ldcg-python-openxla/ansible/vars/vars.yml
new file mode 100644
index 0000000000..b5ae1f3781
--- /dev/null
+++ b/ldcg-python-openxla/ansible/vars/vars.yml
@@ -0,0 +1,19 @@
+---
+pip_extra_index_url: "https://snapshots.linaro.org/ldcg/python-cache/"
+build_dir: "/tmp/workspace"
+clang_build: false
+bazelisk_version: "v1.12.0"
+versions:
+  "git":
+    openxla_version: "git"
+    bazel_version: "bazelisk"
+    numpy_version: "~=1.23.5"
+    protobuf_version: ">=3.20.3,<5.0.0dev,!=4.21.0,!=4.21.1,!=4.21.2,!=4.21.3,!=4.21.4,!=4.21.5"
+    image_prefix: "latest"
+    unit_tests_filter_flags: "-no_aarch64,-benchmark-test,-no_oss,-oss_excluded,-gpu"
+    python_versions:
+      - "3.9"
+      - "3.10"
+      - "3.11"
+to_be_built:
+#   - "git"
diff --git a/ldcg-python-openxla/build.sh b/ldcg-python-openxla/build.sh
new file mode 100644
index 0000000000..8f2c1cb36a
--- /dev/null
+++ b/ldcg-python-openxla/build.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -xe
+
+cd $WORKSPACE
+
+rm -rf *.sh configs
+
+git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+
+cd configs; git log --pretty=oneline -1; cd ..
+
+if [ "$buildgit" = "true" ]; then
+    echo '  - "git"' >> configs/ldcg-python-openxla/ansible/vars/vars.yml
+fi
+if [ "$useclang" = "true" ]; then
+    sed -i -e '/clang_build/s/false/true/' configs/ldcg-python-openxla/ansible/vars/vars.yml
+fi
+
+ansible-galaxy collection install community.docker
+
+cd configs/ldcg-python-openxla/ansible/
+sed -i -e"s+/tmp/workspace+${WORKSPACE}+g" vars/vars.yml
+
+ansible-playbook playbooks/test-openxla.yml
diff --git a/ldcg-python-pytorch-vision.yaml b/ldcg-python-pytorch-vision.yaml
new file mode 100644
index 0000000000..be64c09fc8
--- /dev/null
+++ b/ldcg-python-pytorch-vision.yaml
@@ -0,0 +1,40 @@
+- job:
+    name: ldcg-python-pytorch-vision
+    project-type: matrix
+    defaults: global
+    axes:
+        - axis:
+            type: slave
+            name: nodes
+            values:
+                - docker-centos8-arm64-ldcg
+                - docker-buster-arm64-ldcg
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    disabled: false
+    display-name: 'Pytorch Python package'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-python-pytorch-vision/build.sh
+        - shell:
+            !include-raw: ldcg-python-pytorch-vision/publishers.sh
+    publishers:
+        - email:
+            recipients: 'paul.isaacs@linaro.org marcin.juszkiewicz@linaro.org tom.gall@linaro.org'
diff --git a/ldcg-python-pytorch-vision/Dockerfile-centos b/ldcg-python-pytorch-vision/Dockerfile-centos
new file mode 100644
index 0000000000..a2682f19cf
--- /dev/null
+++ b/ldcg-python-pytorch-vision/Dockerfile-centos
@@ -0,0 +1,12 @@
+FROM linaro/jenkins-arm64-centos:8
+
+RUN sudo dnf -y distrosync; \
+    sudo dnf -y install centos-release-ansible-29; \
+    sudo dnf -y install ansible git
+
+COPY ansible/ /home/buildslave/ansible
+
+RUN cd /home/buildslave/ansible/; \
+    sudo -u buildslave ansible-playbook -i inventory playbooks/run.yml
+
+CMD ["bash"]
diff --git a/ldcg-python-pytorch-vision/Dockerfile-debian b/ldcg-python-pytorch-vision/Dockerfile-debian
new file mode 100644
index 0000000000..f421bf6d70
--- /dev/null
+++ b/ldcg-python-pytorch-vision/Dockerfile-debian
@@ -0,0 +1,14 @@
+FROM linaro/jenkins-arm64-debian:buster
+
+RUN echo "deb http://deb.debian.org/debian/ buster-backports main" | sudo tee /etc/apt/sources.list.d/backports.list; \
+    apt update; \
+    apt purge python python2* -y; \
+    apt upgrade -y; \
+    apt install -y ansible/buster-backports git
+
+COPY ansible/ /home/buildslave/ansible
+
+RUN cd /home/buildslave/ansible/; \
+    sudo -u buildslave ansible-playbook -i inventory playbooks/run.yml
+
+CMD ["bash"]
diff --git a/ldcg-python-pytorch-vision/ansible/ansible.cfg b/ldcg-python-pytorch-vision/ansible/ansible.cfg
new file mode 100644
index 0000000000..df3e172850
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/ansible.cfg
@@ -0,0 +1,11 @@
+[defaults]
+interpreter_python: /usr/bin/python3
+
+# Use the YAML callback plugin.
+stdout_callback = yaml
+
+# Use the stdout_callback when running ad-hoc commands.
+bin_ansible_callbacks = True
+
+# profile tasks
+callback_whitelist = profile_tasks
diff --git a/ldcg-python-pytorch-vision/ansible/inventory b/ldcg-python-pytorch-vision/ansible/inventory
new file mode 100644
index 0000000000..4f3deaacad
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/inventory
@@ -0,0 +1,3 @@
+[all]
+localhost	ansible_connection=local
+
diff --git a/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch.yml b/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch.yml
new file mode 100644
index 0000000000..ad307c79c1
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch.yml
@@ -0,0 +1,101 @@
+- name: install pytorch build requirements (CentOS)
+  become: yes
+  dnf:
+    name:
+      - cmake
+      - gcc-c++
+      - gcc-gfortran
+      - lapack-devel
+      - libjpeg-devel
+      - libpng-devel
+      - make
+      - openblas-devel
+      - patch
+      - python3
+      - python3-devel
+      - python3-nose
+      - python3-pillow
+      - python3-setuptools
+      - python3-virtualenv
+      - python3-wheel
+      - python3-yaml
+    state: present
+    enablerepo: powertools
+  when: ansible_os_family == 'RedHat'
+
+- name: install pytorch build requirements (Debian)
+  become: yes
+  apt:
+    name:
+      - cmake
+      - g++
+      - gfortran
+      - liblapack-dev
+      - make
+      - libblas-dev
+      - libjpeg-dev
+      - libpng-dev
+      - patch
+      - python3
+      - python3-dev
+      - python3-nose
+      - python3-pil
+      - python3-setuptools
+      - python3-venv
+      - python3-wheel
+      - python3-yaml
+    state: present
+  when: ansible_os_family == 'Debian'
+
+- name: create virtualenv
+  pip:
+    name:
+      'pip>=20'
+    virtualenv: "{{ virtualenv_dir }}"
+    virtualenv_command: "/usr/bin/python3 -m venv"
+    virtualenv_site_packages: yes
+
+- name: fetch pytorch source
+  git:
+    repo: "https://github.com/pytorch/pytorch.git" # noqa 401
+    dest: "{{ build_dir.path }}/pytorch/"
+    depth: 1
+    recursive: yes
+    force: yes
+
+- name: install Python packages required by pytorch
+  pip:
+    requirements: requirements.txt
+    chdir: "{{ build_dir.path }}/pytorch/"
+    virtualenv: "{{ virtualenv_dir }}"
+    virtualenv_command: "/usr/bin/python3 -m venv"
+    virtualenv_site_packages: yes
+    extra_args: "--extra-index-url {{ pip_extra_index_url }}"
+  environment:
+    NPY_NUM_BUILD_JOBS: "{{ ansible_processor_vcpus }}"
+
+- name: build pytorch
+  shell:
+    cmd: |
+      set -xe
+      source "{{ virtualenv_dir }}/bin/activate"
+      USE_CUDA=0 BUILD_CAFFE2_OPS=0 USE_DISTRIBUTED=0 USE_QNNPACK=0 USE_XNNPACK=0 \
+        pip wheel -w "{{ wheels_dir }}" \
+          --extra-index-url {{ pip_extra_index_url }} \
+        .
+      find . -name "*.whl" -ls
+    chdir: "{{ build_dir.path }}/pytorch/"
+    creates: "{{ build_dir.path }}/pytorch/build/"
+    executable: /bin/bash
+
+- name: get name of built wheel file
+  find:
+    path: "{{ wheels_dir }}"
+    patterns: "torch-*.whl"
+    file_type: file
+  register: wheel_file
+
+- name: install pytorch Python package
+  pip:
+    name: "{{ wheel_file.files[0].path }}"
+    virtualenv: "{{ virtualenv_dir }}"
diff --git a/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch_glow.yml b/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch_glow.yml
new file mode 100644
index 0000000000..b8fc336333
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch_glow.yml
@@ -0,0 +1,134 @@
+- name: enable external repos to gather packages (CentOS)
+  become: yes
+  dnf:
+    name:
+      - centos-release-openstack-ussuri
+      - centos-release-ceph-octopus
+      - epel-release
+    state: present
+  when: ansible_os_family == 'RedHat'
+
+- name: install pytorch glow build requirements (CentOS)
+  become: yes
+  dnf:
+    name:
+      - clang
+      - cmake
+      - llvm
+      - llvm-devel
+      - llvm-static
+      - libaio-devel
+      - libffi-devel
+      - boost-devel
+      - bzip2-devel
+      - ncurses-devel
+      - double-conversion-devel
+      - libdwarf-devel
+      - libevent-devel
+      - fmt-devel
+      - glog-devel
+      #      - libiberty-devel
+      - jemalloc-devel
+      - lz4-devel
+      - xz-devel
+      - libpng-devel
+      - snappy-devel
+      - libsodium-devel
+      - openssl-devel
+      - libunwind-devel
+      - zlib-devel
+      - libzstd-devel
+      - make
+      - pkgconf-pkg-config
+      - protobuf-compiler
+      - protobuf-devel
+    state: present
+    enablerepo: powertools
+  when: ansible_os_family == 'RedHat'
+
+- name: install pytorch glow build requirements (Debian)
+  become: yes
+  apt:
+    name:
+      - clang
+      - cmake
+      - libaio-dev
+      - libboost-context-dev
+      - libboost-dev
+      - libboost-filesystem-dev
+      - libboost-program-options-dev
+      - libboost-regex-dev
+      - libboost-system-dev
+      - libboost-thread-dev
+      - libbz2-dev
+      - libdouble-conversion-dev
+      - libdwarf-dev
+      - libevent-dev
+      - libfmt-dev
+      - libgoogle-glog-dev
+      - libiberty-dev
+      - libjemalloc-dev
+      - liblz4-dev
+      - liblzma-dev
+      - libpng-dev
+      - libsnappy-dev
+      - libsodium-dev
+      - libssl-dev
+      - libunwind-dev
+      - libz-dev
+      - libzstd-dev
+      - make
+      - pkg-config
+      - protobuf-compiler
+    state: present
+  when: ansible_os_family == 'Debian'
+
+- name: fetch pytorch glow source
+  git:
+    repo: "https://github.com/pytorch/glow.git" # noqa 401
+    dest: "{{ build_dir.path }}/glow/"
+    depth: 1
+    recursive: yes
+    force: yes
+
+- name: create build directory
+  file:
+    path: "{{ build_dir.path }}/glow/build/"
+    state: directory
+
+- name: check name of site-packages directory
+  find:
+    path: "{{ virtualenv_dir }}/lib/"
+    patterns: "python3.*"
+    file_type: directory
+  register: virtualenv_python_dir
+
+- name: configure glow
+  command:
+    cmd:
+      "cmake \
+        -DGLOW_BUILD_PYTORCH_INTEGRATION=ON \
+        -DPYTORCH_DIR={{ virtualenv_python_dir.files[0].path }}/site-packages/torch \
+        .."
+    chdir: "{{ build_dir.path }}/glow/build"
+    creates: "{{ build_dir.path }}/glow/build/CMakeCache.txt"
+
+- name: create /usr/bin/python symlink
+  become: yes
+  file:
+    src: /usr/bin/python3
+    dest: /usr/bin/python
+    state: link
+
+- name: build glow
+  command:
+    cmd: "make -j{{ ansible_processor_vcpus }}"
+    chdir: "{{ build_dir.path }}/glow/build"
+    creates: "{{ build_dir.path }}/glow/build/bin/NodeGen"
+
+- name: install glow
+  become: yes
+  command:
+    cmd: "make install DESTDIR=/usr/local/"
+    chdir: "{{ build_dir.path }}/glow/build"
+    creates: "/usr/local/bin/NodeGen"
diff --git a/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch_vision.yml b/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch_vision.yml
new file mode 100644
index 0000000000..929aea0d15
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/playbooks/build_pytorch_vision.yml
@@ -0,0 +1,30 @@
+- name: fetch pytorch vision source
+  git:
+    repo: "https://github.com/pytorch/vision.git" # noqa 401
+    dest: "{{ build_dir.path }}/vision/"
+    depth: 1
+    recursive: yes
+    force: yes
+
+- name: build pytorch vision
+  shell:
+    cmd: |
+      set -xe
+      source "{{ virtualenv_dir }}/bin/activate"
+      python setup.py bdist_wheel
+      cp dist/torchvision-*.whl "{{ wheels_dir }}/"
+    chdir: "{{ build_dir.path }}/vision/"
+    creates: "{{ build_dir.path }}/vision/build/"
+    executable: /bin/bash
+
+- name: get name of built wheel file
+  find:
+    path: "{{ wheels_dir }}"
+    patterns: "torchvision-*.whl"
+    file_type: file
+  register: wheel_file
+
+- name: install pytorch Python package
+  pip:
+    name: "{{ wheel_file.files[0].path }}"
+    virtualenv: "{{ virtualenv_dir }}"
diff --git a/ldcg-python-pytorch-vision/ansible/playbooks/run.yml b/ldcg-python-pytorch-vision/ansible/playbooks/run.yml
new file mode 100644
index 0000000000..e80e5d3397
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/playbooks/run.yml
@@ -0,0 +1,37 @@
+- hosts: all
+  vars_files:
+    ../vars/vars.yml
+  tasks:
+    - name: create build workspace
+      tempfile:
+        state: directory
+      register: build_dir
+
+    - name: handle Pytorch
+      include_tasks: build_pytorch.yml
+
+    - name: handle Pytorch Vision
+      include_tasks: build_pytorch_vision.yml
+
+    - name: handle Pytorch Glow
+      include_tasks: build_pytorch_glow.yml
+
+    - name: prepare wheels for publishing
+      shell:
+        cmd: |
+          set -xe
+          for pkg in {{ wheels_dir }}/*.whl vision/dist/*.whl
+          do
+            pkgdir=$(echo `basename $pkg`|cut -d'-' -f1 | tr '[:upper:]' '[:lower:]')
+            mkdir -p "{{ wheels_dir }}/$pkgdir/"
+            mv $pkg  "{{ wheels_dir }}/$pkgdir/"
+          done
+        chdir: "{{ build_dir.path }}/"
+        creates: "{{ wheels_dir }}/torch/"
+        executable: /bin/bash
+
+    - name: remove build workspace
+      file:
+        path: "{{ build_dir.path }}"
+        state: absent
+      when: build_dir.path is defined
diff --git a/ldcg-python-pytorch-vision/ansible/vars/vars.yml b/ldcg-python-pytorch-vision/ansible/vars/vars.yml
new file mode 100644
index 0000000000..e8cd774988
--- /dev/null
+++ b/ldcg-python-pytorch-vision/ansible/vars/vars.yml
@@ -0,0 +1,4 @@
+---
+pip_extra_index_url: "https://snapshots.linaro.org/ldcg/python-cache/"
+virtualenv_dir: "/home/buildslave/virtualenv"
+wheels_dir: "/home/buildslave/wheels"
diff --git a/ldcg-python-pytorch-vision/build-containers.sh b/ldcg-python-pytorch-vision/build-containers.sh
new file mode 100644
index 0000000000..716ecc623e
--- /dev/null
+++ b/ldcg-python-pytorch-vision/build-containers.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -xe
+
+trap cleanup_exit EXIT INT TERM ERR
+
+cleanup_exit()
+{
+    rm -rf ${HOME}/.docker
+}
+
+mkdir -p ${HOME}/.docker
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+chmod 0600 ${HOME}/.docker/config.json
+
+rm -rf ${WORKSPACE}
+
+git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+
+cd configs/ldcg-python-pytorch-vision/
+
+docker build -f Dockerfile-debian --pull --tag linaro/debian-pytorch:${BUILD_NUMBER} .
+docker build -f Dockerfile-centos --pull --tag linaro/centos-pytorch:${BUILD_NUMBER} .
+
+docker push linaro/debian-pytorch:${BUILD_NUMBER}
+docker push linaro/centos-pytorch:${BUILD_NUMBER}
diff --git a/ldcg-python-pytorch-vision/build.sh b/ldcg-python-pytorch-vision/build.sh
new file mode 100644
index 0000000000..17c7d21e51
--- /dev/null
+++ b/ldcg-python-pytorch-vision/build.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+set -xe
+
+rm -rf ${WORKSPACE}/*
+
+if [ -e /etc/debian_version ]; then
+    echo "deb http://deb.debian.org/debian/ buster-backports main" | sudo tee /etc/apt/sources.list.d/backports.list
+    sudo apt update
+    sudo apt upgrade -y
+    sudo apt install -y ansible/buster-backports
+    sudo apt purge -y python python2*
+else
+    sudo dnf -y distrosync
+    sudo dnf -y install centos-release-ansible-29
+    sudo dnf -y install ansible git python36
+fi
+
+git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+
+cd configs/ldcg-python-pytorch-vision/ansible/
+
+ansible-playbook -i inventory playbooks/run.yml
diff --git a/ldcg-python-pytorch-vision/publishers.sh b/ldcg-python-pytorch-vision/publishers.sh
new file mode 100644
index 0000000000..21700555fd
--- /dev/null
+++ b/ldcg-python-pytorch-vision/publishers.sh
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+set -ex
+
+if [ -e /etc/debian_version ]; then
+    BUILD_NUMBER="${BUILD_NUMBER}-debian"
+else
+    BUILD_NUMBER="${BUILD_NUMBER}-centos"
+    sudo dnf install -y python3-requests wget
+fi
+
+ls -alR /home/buildslave/wheels
+
+# Publish wheel files
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+time python3 ${HOME}/bin/linaro-cp.py \
+    --link-latest \
+    /home/buildslave/wheels \
+    ldcg/python/pytorch/${BUILD_NUMBER}
+
+set +x
+
+echo "Python wheels: https://snapshots.linaro.org/ldcg/python/pytorch/${BUILD_NUMBER}/"
diff --git a/ldcg-sbsa-acs.yaml b/ldcg-sbsa-acs.yaml
new file mode 100644
index 0000000000..7385d85e6c
--- /dev/null
+++ b/ldcg-sbsa-acs.yaml
@@ -0,0 +1,39 @@
+- job:
+    name: ldcg-sbsa-acs
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - string:
+            name: QEMU_TIMEOUT
+            default: '120'
+            description: 'timeout for single qemu run'
+    disabled: false
+    node: docker-bookworm-arm64-ldcg
+    display-name: 'SBSA QEMU firmware test - (S)BSA ACS'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-sbsa-firmware/build-sbsa-acs.sh
+        - shell:
+            !include-raw: ldcg-sbsa-firmware/publishers.sh
+    publishers:
+        - email:
+            recipients: 'shashi.mallela@linaro.org marcin.juszkiewicz@linaro.org asa-dev@op-lists.linaro.org'
diff --git a/ldcg-sbsa-firmware.yaml b/ldcg-sbsa-firmware.yaml
new file mode 100644
index 0000000000..5836eca472
--- /dev/null
+++ b/ldcg-sbsa-firmware.yaml
@@ -0,0 +1,47 @@
+- job:
+    name: ldcg-sbsa-firmware
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 7
+            num-to-keep: 7
+    parameters:
+        - string:
+            name: SYSTEMREADY_SR_ACS_VER
+            default: 'v23.09_2.0.0'
+            description: 'version of Arm SystemReady ACS'
+        - string:
+            name: QEMU_TIMEOUT
+            default: '40m'
+            description: 'timeout for single qemu run'
+        - string:
+            name: QEMU_RETRIES
+            default: 6
+            description: 'how many times QEMU should be run'
+    disabled: false
+    node: docker-bookworm-arm64-ldcg
+    display-name: 'Arm SystemReady SR ACS on QEMU/SBSA Reference Platform'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: ldcg-sbsa-firmware/build.sh
+        - shell:
+            !include-raw: ldcg-sbsa-firmware/publishers.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org asa-dev@op-lists.linaro.org'
diff --git a/ldcg-sbsa-firmware/build-sbsa-acs.sh b/ldcg-sbsa-firmware/build-sbsa-acs.sh
new file mode 100644
index 0000000000..1a43e14a36
--- /dev/null
+++ b/ldcg-sbsa-firmware/build-sbsa-acs.sh
@@ -0,0 +1,162 @@
+#!/bin/bash
+
+set -ex
+
+rm -rf ${WORKSPACE}/*
+mkdir -p ${WORKSPACE}/logs/
+
+if [ -z $QEMU_TIMEOUT ]; then
+    QEMU_TIMEOUT=30s
+fi
+
+QEMU_COMMAND="./qemu/build/qemu-system-aarch64 \
+    -machine sbsa-ref \
+    -cpu max \
+    -drive if=pflash,file=SBSA_FLASH0.fd,format=raw \
+    -drive if=pflash,file=SBSA_FLASH1.fd,format=raw \
+    -drive file=fat:rw:$PWD/virtual-disk/,format=raw \
+    -serial mon:stdio \
+    -device virtio-rng-pci \
+    -device qemu-xhci \
+    -no-reboot \
+    -nographic
+"
+#   more complex PCI Express structure once we get ITS support in QEMU
+#   -device pcie-root-port,id=root_port1,chassis=1,slot=1  \
+#     -device nvme,serial=deadbeef,drive=nvme,bus=root_port1 \
+#   -device pcie-root-port,id=root_port2,chassis=1,slot=2  \
+#     -device qemu-xhci,id=usb,bus=root_port2 \
+#   -device pcie-root-port,id=root_port3,chassis=1,slot=3  \
+#     -device e1000e,bus=root_port3 \
+
+build_qemu()
+{
+    # Build QEMU - only AArch64 target
+
+    cd qemu
+    ./configure --target-list=aarch64-softmmu --disable-werror
+    make -j$(nproc)
+    cd -
+}
+
+build_edk2()
+{
+    # Build EDK2 and truncate results to expected 256M
+
+    export PYTHON_COMMAND=/usr/bin/python3
+    export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-platforms:$WORKSPACE/edk2-non-osi:$WORKSPACE/edk2-libc
+    make -C edk2/BaseTools
+
+    export GCC5_AARCH64_PREFIX=aarch64-linux-gnu-
+
+    source edk2/edksetup.sh
+    build -b RELEASE -a AARCH64 -t GCC5 -p edk2-platforms/Platform/Qemu/SbsaQemu/SbsaQemu.dsc -n 0
+
+    # copy resulting firmware and resize to 256MB images
+
+    cp Build/SbsaQemu/RELEASE_GCC5/FV/SBSA_FLASH[01].fd .
+    truncate -s 256M SBSA_FLASH[01].fd
+}
+
+fetch_code()
+{
+    git clone --depth 1 https://github.com/qemu/qemu.git
+    git clone --depth 1 --recurse-submodules https://github.com/tianocore/edk2.git
+    git clone --depth 1 https://github.com/tianocore/edk2-platforms.git
+    git clone --depth 1 https://github.com/tianocore/edk2-non-osi.git
+    git clone --depth 1 https://github.com/tianocore/edk2-libc.git
+    git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+}
+
+build_sbsa_acs()
+{
+
+    cd edk2
+    patch -p0 < ../configs/ldcg-sbsa-firmware/enable-sbsa-acs.patch
+
+    cd ShellPkg/Application
+    git clone --depth 1 https://github.com/ARM-software/sbsa-acs.git
+
+    cd $WORKSPACE
+    export GCC49_AARCH64_PREFIX=$GCC5_AARCH64_PREFIX
+    source edk2/ShellPkg/Application/sbsa-acs/tools/scripts/avsbuild.sh
+}
+
+build_bsa_acs()
+{
+
+    cd edk2
+    patch -p0 < ../configs/ldcg-sbsa-firmware/enable-bsa-acs.patch
+
+    cd ShellPkg/Application
+    git clone --depth 1 https://github.com/ARM-software/bsa-acs.git
+
+    cd $WORKSPACE
+    export GCC49_AARCH64_PREFIX=$GCC5_AARCH64_PREFIX
+    source edk2/ShellPkg/Application/bsa-acs/tools/scripts/acsbuild.sh
+}
+
+install_deps()
+{
+    # install build dependencies for QEMU and EDK2
+    sudo apt update
+    sudo apt -y --no-install-recommends install build-essential pkg-config python3 \
+                                        libpixman-1-dev libglib2.0-dev wget \
+                                        ninja-build iasl gcc-aarch64-linux-gnu
+}
+
+prepare_virtual_disk()
+{
+    mkdir -p virtual-disk/efi/boot
+    cp Build/SbsaQemu/RELEASE_GCC5/AARCH64/Shell.efi virtual-disk/efi/boot/bootaa64.efi
+    cp Build/Shell/DEBUG_GCC49/AARCH64/Sbsa.efi virtual-disk/
+    cp Build/Shell/DEBUG_GCC49/AARCH64/Bsa.efi virtual-disk/
+}
+
+run_sbsa_acs()
+{
+    for sbsa_level in 3 4 5 6 7
+    do
+        echo "fs0:\Sbsa.efi -p 1 -l ${sbsa_level}" > virtual-disk/startup.nsh
+
+        # we start qemu in 'exit on reboot' mode so we quit on shutdown
+        echo "reset -c" >>virtual-disk/startup.nsh
+        
+        timeout --foreground ${QEMU_TIMEOUT} ${QEMU_COMMAND} | tee logs/sbsa-acs-level${sbsa_level}.log
+    done
+}
+
+run_bsa_acs()
+{
+    echo "fs0:\bsa.efi -sbsa" > virtual-disk/startup.nsh
+
+    # we start qemu in 'exit on reboot' mode so we quit on shutdown
+    echo "reset -c" >>virtual-disk/startup.nsh
+
+    timeout --foreground ${QEMU_TIMEOUT} ${QEMU_COMMAND} | tee logs/bsa-acs.log
+}
+
+run_acpiview()
+{
+    echo "acpiview" > virtual-disk/startup.nsh
+
+    # we start qemu in 'exit on reboot' mode so we quit on shutdown
+    echo "reset -c" >>virtual-disk/startup.nsh
+
+    timeout --foreground ${QEMU_TIMEOUT} ${QEMU_COMMAND} | tee logs/acpiview.log
+}
+
+
+install_deps
+fetch_code
+
+build_qemu
+build_edk2
+build_sbsa_acs
+build_bsa_acs
+
+prepare_virtual_disk
+
+run_sbsa_acs
+run_bsa_acs
+run_acpiview
diff --git a/ldcg-sbsa-firmware/build.sh b/ldcg-sbsa-firmware/build.sh
new file mode 100644
index 0000000000..2304c6c3e6
--- /dev/null
+++ b/ldcg-sbsa-firmware/build.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+if [ -z $SYSTEMREADY_SR_ACS_VER ]; then
+    SYSTEMREADY_SR_ACS_VER="v23.09_2.0.0"
+fi
+
+if [ -z $QEMU_TIMEOUT ]; then
+    QEMU_TIMEOUT=10m
+fi
+
+set -ex
+
+build_qemu()
+{
+    # Build QEMU - only AArch64 target
+
+    cd qemu
+    ./configure --target-list=aarch64-softmmu
+    make -j$(nproc)
+    cd -
+}
+
+build_edk2()
+{
+    # Build EDK2 and truncate results to expected 256M
+
+    export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/edk2-platforms:$WORKSPACE/edk2-non-osi
+    make -C edk2/BaseTools
+
+    export GCC_AARCH64_PREFIX=aarch64-linux-gnu-
+
+    source edk2/edksetup.sh
+    build -b RELEASE -a AARCH64 -t GCC -p edk2-platforms/Platform/Qemu/SbsaQemu/SbsaQemu.dsc -n 0
+
+    # copy resulting firmware and resize to 256MB images
+
+    cp Build/SbsaQemu/RELEASE_GCC5/FV/SBSA_FLASH[01].fd .
+    truncate -s 256M SBSA_FLASH[01].fd
+}
+
+fetch_code()
+{
+    git clone --depth 1 https://github.com/qemu/qemu.git
+    git clone --depth 1 --recurse-submodules https://github.com/tianocore/edk2.git
+    git clone --depth 1 --recurse-submodules https://github.com/tianocore/edk2-platforms.git
+    git clone --depth 1 --recurse-submodules https://github.com/tianocore/edk2-non-osi.git
+}
+
+
+fetch_acs()
+{
+    # Fetch Arm SystemReady ACS for SR
+    wget https://github.com/ARM-software/arm-systemready/raw/main/SR/prebuilt_images/${SYSTEMREADY_SR_ACS_VER}/sr_acs_live_image.img.xz
+    xz -T0 -d sr_acs_live_image.img.xz
+}
+
+cd ${WORKSPACE}
+rm -rf ${WORKSPACE}/*
+
+# install build dependencies for QEMU and EDK2
+sudo apt update
+sudo apt -y --no-install-recommends install build-essential pkg-config python3 \
+         libpixman-1-dev libglib2.0-dev dosfstools git-lfs mtools ninja-build \
+         gcc-aarch64-linux-gnu iasl wget xz-utils python-is-python3 ripgrep
+
+
+fetch_code
+fetch_acs
+
+build_qemu
+build_edk2
+
+# run Arm SystemReady SR ACS in QEMU - in 10 minutes timeouts as there is a test which shutdowns
+
+set +e # do not exit on error
+
+for try in `seq 1 ${QEMU_RETRIES}`
+do
+    echo "Starting qemu for ${try} time"
+    timeout --foreground ${QEMU_TIMEOUT} \
+        ./qemu/build/aarch64-softmmu/qemu-system-aarch64 \
+            -machine sbsa-ref \
+            -m 2048 \
+            -drive if=pflash,file=SBSA_FLASH0.fd,format=raw \
+            -drive if=pflash,file=SBSA_FLASH1.fd,format=raw \
+            -drive if=ide,format=raw,file=sr_acs_live_image.img \
+            -nographic \
+            -device usb-kbd \
+            -watchdog-action none \
+            -serial mon:stdio
+done
+
+# Grab ACS logs
+
+echo "drive c:" >~/.mtoolsrc
+echo "    file=\"$(realpath sr_acs_live_image.img)\" offset=1048576" >>~/.mtoolsrc
+
+mkdir -p logs
+mcopy -s -v c:/ logs/
+
+# show failures (using ripgrep as it deals with UTF-16)
+rg FAIL logs/
diff --git a/ldcg-sbsa-firmware/enable-bsa-acs.patch b/ldcg-sbsa-firmware/enable-bsa-acs.patch
new file mode 100644
index 0000000000..34a63a2100
--- /dev/null
+++ b/ldcg-sbsa-firmware/enable-bsa-acs.patch
@@ -0,0 +1,20 @@
+--- ShellPkg/ShellPkg.dsc
++++ ShellPkg/ShellPkg.dsc
+@@ -29,6 +29,8 @@
+   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf

+   SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf

+   SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf

++  BsaValLib|ShellPkg/Application/bsa-acs/val/BsaValLib.inf

++  BsaPalLib|ShellPkg/Application/bsa-acs/platform/pal_uefi_acpi/BsaPalLib.inf

+ !if $(TARGET) == RELEASE

+   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+ !else

+@@ -107,6 +109,8 @@
+ 

+   ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf

+ 

++  ShellPkg/Application/bsa-acs/uefi_app/BsaAcs.inf

++

+   ShellPkg/Application/Shell/Shell.inf {

+     <PcdsFixedAtBuild>

+       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

diff --git a/ldcg-sbsa-firmware/enable-sbsa-acs.patch b/ldcg-sbsa-firmware/enable-sbsa-acs.patch
new file mode 100644
index 0000000000..2fcfe2aa11
--- /dev/null
+++ b/ldcg-sbsa-firmware/enable-sbsa-acs.patch
@@ -0,0 +1,22 @@
+diff --git ShellPkg/ShellPkg.dsc ShellPkg/ShellPkg.dsc
+index c42bc9464a..43deb92324 100644
+--- ShellPkg/ShellPkg.dsc
++++ ShellPkg/ShellPkg.dsc
+@@ -24,6 +24,8 @@
+   UefiDriverEntryPoint|MdePkg/Library/UefiDriverEntryPoint/UefiDriverEntryPoint.inf

+   UefiBootServicesTableLib|MdePkg/Library/UefiBootServicesTableLib/UefiBootServicesTableLib.inf

+   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibOptionalDevicePathProtocol.inf

++  SbsaValLib|ShellPkg/Application/sbsa-acs/val/SbsaValLib.inf

++  SbsaPalLib|ShellPkg/Application/sbsa-acs/platform/pal_uefi/SbsaPalLib.inf

+ !if $(TARGET) == RELEASE

+   DebugLib|MdePkg/Library/BaseDebugLibNull/BaseDebugLibNull.inf

+ !else

+@@ -98,6 +100,8 @@
+   ShellPkg/Library/UefiShellNetwork1CommandsLib/UefiShellNetwork1CommandsLib.inf

+   ShellPkg/Library/UefiShellNetwork2CommandsLib/UefiShellNetwork2CommandsLib.inf

+ 

++  ShellPkg/Application/sbsa-acs/uefi_app/SbsaAvs.inf

++

+   ShellPkg/Application/Shell/Shell.inf {

+     <PcdsFixedAtBuild>

+       gEfiShellPkgTokenSpaceGuid.PcdShellLibAutoInitialize|FALSE

diff --git a/ldcg-sbsa-firmware/publishers.sh b/ldcg-sbsa-firmware/publishers.sh
new file mode 100644
index 0000000000..dd0d9e6e3a
--- /dev/null
+++ b/ldcg-sbsa-firmware/publishers.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+set -ex
+
+ls -alR ${WORKSPACE}/logs
+
+if [ -e ${WORKSPACE}/logs/sbsa-acs-level3.log ]; then
+  # ldcg-sbsa-acs job
+  PUBLISH_PATH=ldcg/sbsa-acs
+else
+  # ldcg-sbsa-firmware job
+  PUBLISH_PATH=ldcg/sbsa-enterprise-acs
+fi
+
+# Publish log files
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+time python3 ${HOME}/bin/linaro-cp.py \
+  --link-latest \
+  ${WORKSPACE}/logs \
+  ${PUBLISH_PATH}/${BUILD_NUMBER}
+
+set +x
+
+echo "SBSA ACS logs: https://snapshots.linaro.org/${PUBLISH_PATH}/${BUILD_NUMBER}/"
diff --git a/ldcg-tensorflow-asv-benchmarks.yaml b/ldcg-tensorflow-asv-benchmarks.yaml
new file mode 100644
index 0000000000..7ab2ea2ba2
--- /dev/null
+++ b/ldcg-tensorflow-asv-benchmarks.yaml
@@ -0,0 +1,33 @@
+- job:
+    name: ldcg-tensorflow-asv-benchmarks
+    project-type: freestyle
+    defaults: global
+    description: |
+        Runs various Tensorflow benchmarks and documents them with asv.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://github.com/tensorflow/tensorflow
+    disabled: false
+    node: d05bench
+    concurent: false
+    display-name: 'Tensorflow aarch64 - CI Build: MLPerf Benchmark'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: ldcg-tensorflow-asv-benchmarks/ldcg-tensorflow-asv-benchmark.sh
+    publisher:
+        - email:
+            recipients: 'theodore.grey@linaro.org'
diff --git a/ldcg-tensorflow-asv-benchmarks/ldcg-tensorflow-asv-benchmark.sh b/ldcg-tensorflow-asv-benchmarks/ldcg-tensorflow-asv-benchmark.sh
new file mode 100644
index 0000000000..ccdb8d6008
--- /dev/null
+++ b/ldcg-tensorflow-asv-benchmarks/ldcg-tensorflow-asv-benchmark.sh
@@ -0,0 +1,63 @@
+#!/bin/bash -ex
+
+if [ ! -d "${WORKSPACE}" ]; then
+        set -x
+        WORKSPACE=$(pwd)
+fi
+
+if [ ! -d "${WORKSPACE}"/python3.10-venv ]; then
+	wget https://www.python.org/ftp/python/3.10.0/Python-3.10.0.tar.xz
+	tar -xf Python-3.10.0.tar.xz
+	cd "${WORKSPACE}"/Python-3.10.0
+	./configure
+	make -j$(nproc)
+	./python -m venv "${WORKSPACE}"/python3.10-venv
+	cd "${WORKSPACE}"
+	source "${WORKSPACE}"/python3.10-venv/bin/activate
+	python -m pip install pytest virtualenv filelock six pip setuptools wheel matplotlib cython
+else
+	source "${WORKSPACE}"/python3.10-venv/bin/activate
+fi
+
+
+if [ ! -d "${WORKSPACE}"/asv-test ]; then
+        git clone https://github.com/TheodoreRTG/asv-test.git
+	cd "${WORKSPACE}"/asv-test
+	git checkout tmp1
+fi
+
+if [ ! -d /mnt/datasets ]; then
+        mkdir /mnt/datasets
+	mount -t nfs 10.40.96.10:/mnt/nvme /mnt/datasets
+fi
+
+if [ ! -d "${WORKSPACE}"/asv-test/inference/loadgen ]; then
+	cd "${WORKSPACE}"/asv-test
+	git submodule update --init --recursive
+	cd inference
+	git checkout r1.1
+	cd loadgen
+	python setup.py bdist_wheel
+	cd ../vision/classification_and_detection/
+	python setup.py bdist_wheel
+	cd "${WORKSPACE}"
+fi
+
+if [ -d "${WORKSPACE}"/asv-test/builds ]; then
+	rm -r "${WORKSPACE}"/asv-test/builds
+fi
+
+if [ -f "${WORKSPACE}"/asv-test/commit_list ]; then
+	rm -r "${WORKSPACE}"/asv-test/commit_list
+fi
+
+if [ -f "${WORKSPACE}"/asv-test/asv_commit_list ]; then
+	rm -r "${WORKSPACE}"/asv-test/asv_commit_list
+fi
+
+cd ${WORKSPACE}/asv-test
+sh gen_commit_list.sh
+sh get_commit_list.sh
+sh gen_asv_commit_list_file.sh
+asv run HASHFILE:asv_commit_list
+asv publish --html-dir tensorflow-manylinux-nightly-asv-bench
diff --git a/ldcg-update-images.yaml b/ldcg-update-images.yaml
new file mode 100644
index 0000000000..e6a5137896
--- /dev/null
+++ b/ldcg-update-images.yaml
@@ -0,0 +1,30 @@
+- job:
+    name: ldcg-update-images
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 1
+            num-to-keep: 1
+    disabled: false
+    node: ldcg-aarch64-02
+    concurrent: false
+    display-name: 'LDCG update images'
+    triggers:
+      - timed: '@weekly'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: ldcg-update-images/build.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org'
diff --git a/ldcg-update-images/build.sh b/ldcg-update-images/build.sh
new file mode 100644
index 0000000000..da7f611130
--- /dev/null
+++ b/ldcg-update-images/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+docker pull linaro/tensorflow-arm64-build:latest-multipython
+docker pull quay.io/pypa/manylinux2014_aarch64:latest
+docker pull debian:bullseye
diff --git a/ledge-cloud-image-fedora.yaml b/ledge-cloud-image-fedora.yaml
new file mode 100644
index 0000000000..1171db639a
--- /dev/null
+++ b/ledge-cloud-image-fedora.yaml
@@ -0,0 +1,110 @@
+- job:
+    name: ledge-cloud-image-fedora
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'ledge'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'ledge'
+        - string:
+            name: AUTH_GROUPS
+            default: 'linaro'
+    disabled: false
+    node: docker-stretch-arm64-ldcg
+    display-name: 'LEDGE Cloud image Fedora IoT'
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: fedora-iot/cloud-builders.sh
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --server ${PUBLISH_SERVER} \
+              --link-latest \
+              out components/ledge/fedora-cloud/${BUILD_NUMBER}
+
+            rm -rf out
+        - shell: |
+            #!/bin/bash
+
+            if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+                 echo "INFO: apt update error - try again in a moment"
+                 sleep 15
+                 sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+            fi
+
+            pkg_list="chrpath cpio diffstat gawk git expect pkg-config python-pip python-requests python-crypto libpixman-1-dev python python3"
+            if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+                 echo "INFO: apt install error - try again in a moment"
+                 sleep 15
+                 sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+            fi
+
+            sudo locale-gen en_US.UTF-8 && sudo update-locale LANG=en_US.UTF-8
+            export LC_ALL=en_US.UTF-8
+
+            # install required python modules
+            pip install --user --force-reinstall Jinja2 ruamel.yaml==0.16.13
+
+            rm -rf configs
+            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+            #export takes more priority then argument provided with --device-type
+            export DEVICE_TYPE="qemuarm64"
+            export MACHINE="ledge-qemuarm64"
+
+            [ -z "${MANIFEST_COMMIT}" ] && export MANIFEST_COMMIT="HEAD"
+            [ -z "${MANIFEST_BRANCH}" ] && export MANIFEST_BRANCH="master"
+
+            export BASE_URL="http://snapshots.linaro.org"
+            export PUB_DEST="components/ledge/fedora-cloud/${BUILD_NUMBER}"
+            export IMAGE_URL="${BASE_URL}/${PUB_DEST}/fedora-iot-rp-cloud-image_aarch64.qcow2.gz"
+
+            python configs/openembedded-lkft/submit_for_testing.py \
+                 --device-type ${DEVICE_TYPE} \
+                 --build-number ${BUILD_NUMBER} \
+                 --lava-server ${LAVA_SERVER} \
+                 --qa-server ${QA_SERVER} \
+                 --qa-server-team ${QA_SERVER_TEAM} \
+                 --qa-server-project ${QA_SERVER_PROJECT} \
+                 --git-commit ${MANIFEST_COMMIT} \
+                 --template-path configs/fedora-iot/lava-job-definitions \
+                 --template-names template-boot.yaml
+    publishers:
+        - email:
+            recipients: 'maxim.uvarov@linaro.org ilias.apalodimas@linaro.org'
diff --git a/ledge-ts.yaml b/ledge-ts.yaml
new file mode 100644
index 0000000000..0cad93b23b
--- /dev/null
+++ b/ledge-ts.yaml
@@ -0,0 +1,132 @@
+- job:
+    name: ledge-ts
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 10
+    parameters:
+        - string:
+            name: GIT_URL
+            default: 'https://git.codelinaro.org/linaro/dependable-boot/meta-ts.git'
+        - string:
+            name: GIT_BRANCH
+            default: 'master'
+        - string:
+            name: PUB_DEST
+            default: 'components/ledge/ts/${BUILD_NUMBER}/${MACHINE}/'
+        - string:
+            name: LAVA_SERVER
+            default: 'ledge.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'ledge'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'ledge'
+        - string:
+            name: AUTH_GROUPS
+            default: 'linaro'
+        - string:
+            name: BB_CLEANALL_PKGS
+            default: ''
+    disabled: false
+    node: master
+    display-name: 'Trusted Substrate build'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'qemuarm64-secureboot'
+                - 'synquacer'
+                - 'stm32mp157c-dk2'
+                - 'stm32mp157c-ev1'
+                - 'rpi4'
+                - 'rockpi4b'
+                - 'zynqmp-starter'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timeout:
+            timeout: 400
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              ledge-ti-am572x)
+                DEVICE_TYPE=x15-bl_uefi
+                ;;
+              ledge-qemux86-64)
+                DEVICE_TYPE=qemux86_64uefi
+                ;;
+              ledge-qemuarm)
+                DEVICE_TYPE=qemuarmuefi
+                ;;
+              qemuarm64-secureboot)
+                DEVICE_TYPE=qemuarm64uefi
+                ;;
+              ledge-synquacer)
+                DEVICE_TYPE=synquacer
+                ;;
+              ledge-stm32mp157c-dk2)
+                DEVICE_TYPE=stm32mp157c-dk2
+                ;;
+              *)
+                echo "Skip DEVICE_TYPE for ${MACHINE}"
+                ;;
+            esac
+
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - shell:
+            !include-raw: ledge/ts/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: ledge/ts/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - openembedded-lkft/postbuild.groovy
+        - email:
+            recipients: 'maxim.uvarov@linaro.org ilias.apalodimas@linaro.org'
diff --git a/ledge-u-boot.yaml b/ledge-u-boot.yaml
new file mode 100644
index 0000000000..de88cac6be
--- /dev/null
+++ b/ledge-u-boot.yaml
@@ -0,0 +1,97 @@
+- job:
+    name: ledge-u-boot
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 10
+    parameters:
+        - string:
+            name: PUB_DEST
+            default: 'components/ledge/uboot/${BUILD_NUMBER}'
+        - string:
+            name: LAVA_SERVER
+            default: 'ledge.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'ledge'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'ledge'
+        - string:
+            name: AUTH_GROUPS
+            default: 'linaro'
+        - string:
+            name: BB_CLEANALL_PKGS
+            default: ''
+    disabled: false
+    node: master
+    display-name: 'LEDGE U-Boot SystemReady-IR tests'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'qemu-arm64'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timeout:
+            timeout: 400
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: ARTIFACTORIAL_TOKEN
+                variable: ARTIFACTORIAL_TOKEN
+    builders:
+        - shell: |
+            DEVICE_TYPE=${MACHINE}
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - shell:
+            !include-raw: ledge/u-boot/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: ledge/u-boot/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - openembedded-lkft/postbuild.groovy
+        - email:
+            recipients: 'maxim.uvarov@linaro.org ilias.apalodimas@linaro.org'
diff --git a/ledge/oe/builders.sh b/ledge/oe/builders.sh
new file mode 100755
index 0000000000..5af56d00be
--- /dev/null
+++ b/ledge/oe/builders.sh
@@ -0,0 +1,299 @@
+#!/bin/bash
+
+echo "LEDGE build for machine ${MACHINE} distro ${DISTRO}"
+ORIG_MACHINE="${MACHINE}"
+
+set -e
+
+# workaround EDK2 is confused by the long path used during the build
+# and truncate files name expected by VfrCompile
+sudo mkdir -p /srv/oe
+sudo chown buildslave:buildslave /srv/oe
+cd /srv/oe
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    echo "Running cleanup_exit..."
+}
+
+set -ex
+
+# Store the home repository
+if [ -z "${WORKSPACE}" ]; then
+  # Local build
+  export WORKSPACE=${PWD}
+fi
+
+# initialize repo if not done already
+export MANIFEST_URL=${MANIFEST_URL:-https://github.com/Linaro/ledge-oe-manifest.git}
+if [ ! -e ".repo/manifest.xml" ]; then
+   repo init --no-clone-bundle --depth=1 --no-tags -u ${MANIFEST_URL} -b ${MANIFEST_BRANCH}
+
+   if [ -z "${RELEASE}" ]; then
+     # link to shared downloads on persistent disk
+     # our builds config is expecting downloads and sstate-cache, here.
+     # DL_DIR = "${OEROOT}/sources/downloads"
+     # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
+     mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
+     mkdir -p build
+     ln -s ${HOME}/srv/oe/downloads
+     ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
+   fi
+fi
+
+if [ "${ghprbGhRepository}" == "Linaro/ledge-oe-manifest" ]; then
+    cd .repo/manifests
+    git fetch origin pull/${ghprbPullId}/head:prbranch
+    git checkout prbranch
+    cd -
+fi
+
+repo sync
+
+if [ "${ghprbGhRepository}" == "Linaro/meta-ledge" ]; then
+    cd ./layers/meta-ledge
+    git fetch github pull/${ghprbPullId}/head:prbranch
+    git checkout prbranch
+    cd -
+fi
+
+cp .repo/manifest.xml source-manifest.xml
+repo manifest -r -o pinned-manifest.xml
+MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
+echo "MANIFEST_COMMIT=${MANIFEST_COMMIT}" > ${WORKSPACE}/submit_for_testing_parameters
+
+# record changes since last build, if available
+BASE_URL=http://snapshots.linaro.org
+if wget -q ${BASE_URL}/${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
+    repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+else
+    echo "latest build published does not have pinned-manifest.xml, skipping diff report"
+fi
+
+# the setup-environment will create auto.conf and site.conf
+# make sure we get rid of old config.
+# let's remove the previous TMPDIR as well.
+# we want to preserve build/buildhistory though.
+rm -rf build/conf build/tmp-*glibc/
+rm -rf build-${DISTRO}
+
+source setup-environment
+
+# use opensource OSF repository
+cat << EOF >> conf/local.conf
+OSF_LMP_GIT_URL = "github.com"
+OSF_LMP_GIT_NAMESPACE = "opensourcefoundries/"
+EOF
+
+# get build stats to make sure that we use sstate properly
+cat << EOF >> conf/auto.conf
+INHERIT += "buildstats buildstats-summary"
+EOF
+
+# allow the top level job to append to auto.conf
+if [ -f ${WORKSPACE}/auto.conf ]; then
+    cat ${WORKSPACE}/auto.conf >> conf/auto.conf
+fi
+
+# add useful debug info
+cat conf/{site,auto}.conf
+
+BIMAGES=""
+BCLEANALL=""
+case "${ORIG_MACHINE}" in
+	ledge-multi-armv7)
+		for i in ${BB_CLEANALL_PKGS}; do BCLEANALL+="mc:qemuarm:$i "; done
+		for i in ${IMAGES}; do BIMAGES+="mc:qemuarm:$i "; done
+		;;
+	ledge-multi-armv8)
+		for i in ${BB_CLEANALL_PKGS}; do BCLEANALL+="mc:qemuarm64:$i "; done
+		for i in ${IMAGES}; do BIMAGES+="mc:qemuarm64:$i "; done
+		;;
+	*)
+		BCLEANALL="${BB_CLEANALL_PKGS}"
+		BIMAGES=${IMAGES}
+		;;
+esac
+
+export BB_NUMBER_THREADS=4
+
+if [ -n "${BCLEANALL}" ]; then
+	bitbake -c cleanall ${BCLEANALL}
+fi
+
+# For armv7 multi some bug compiling images in one command
+# time bitbake ${BIMAGES} ${FIRMWARE}
+for target in ${BIMAGES} ${FIRMWARE}; do
+	time bitbake ${target}
+done
+
+TOPDIR=$(bitbake -e | grep "^TOPDIR="| cut -d'=' -f2 | tr -d '"')
+DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
+
+case "${ORIG_MACHINE}" in
+	ledge-multi-armv7)
+		UPLOAD_DIR="${TOPDIR}/armhf-glibc/deploy/images"
+		;;
+	ledge-multi-armv8)
+		UPLOAD_DIR="${TOPDIR}/arm64-glibc/deploy/images"
+		;;
+	*)
+		UPLOAD_DIR="${DEPLOY_DIR_IMAGE}"
+		;;
+esac
+
+build_ledgerp_docs() {
+	# Build docs
+	cd ../layers/ledge-doc
+	make latexpdf
+	make installpdf DESTDIR=${UPLOAD_DIR}/
+	cd -
+}
+
+build_ledgerp_docs
+
+# Prepare files to publish
+mv /srv/oe/{source,pinned}-manifest.xml ${UPLOAD_DIR}
+cat ${UPLOAD_DIR}/pinned-manifest.xml
+
+for cert in $(find ${UPLOAD_DIR} -type f -name ledge-kernel-uefi-certs*.wic); do
+	pigz -9 ${cert}
+done
+
+# Create MD5SUMS file
+find ${UPLOAD_DIR} -type f | xargs md5sum > MD5SUMS.txt
+sed -i "s|${UPLOAD_DIR}/||" MD5SUMS.txt
+mv MD5SUMS.txt ${UPLOAD_DIR}
+
+# Note: the main job script allows to override the default value for
+#       BASE_URL and PUB_DEST, typically used for OE RPB builds
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+DEPLOY_DIR_IMAGE=${UPLOAD_DIR}
+EOF
+
+# Build information
+cat > ${UPLOAD_DIR}/HEADER.textile << EOF
+
+h4. LEDGE - OpenEmbedded
+
+Build description:
+* Build URL: "$BUILD_URL":$BUILD_URL
+* Manifest URL: "${MANIFEST_URL}":${MANIFEST_URL}
+* Manifest branch: ${MANIFEST_BRANCH}
+* Manifest commit: "${MANIFEST_COMMIT}":${MANIFEST_URL/.git/\/commit}/${MANIFEST_COMMIT}
+EOF
+
+if [ -e "/srv/oe/manifest-changes.txt" ]; then
+  # the space after pre.. tag is on purpose
+  cat > ${UPLOAD_DIR}/README.textile << EOF
+
+h4. Manifest changes
+
+pre.. 
+EOF
+  cat /srv/oe/manifest-changes.txt >> ${UPLOAD_DIR}/README.textile
+  mv /srv/oe/manifest-changes.txt ${UPLOAD_DIR}
+fi
+
+GCCVERSION=$(bitbake -e | grep "^GCCVERSION="| cut -d'=' -f2 | tr -d '"')
+TARGET_SYS=$(bitbake -e | grep "^TARGET_SYS="| cut -d'=' -f2 | tr -d '"')
+TUNE_FEATURES=$(bitbake -e | grep "^TUNE_FEATURES="| cut -d'=' -f2 | tr -d '"')
+STAGING_KERNEL_DIR=$(bitbake -e | grep "^STAGING_KERNEL_DIR="| cut -d'=' -f2 | tr -d '"')
+
+find ${UPLOAD_DIR}
+
+BOOT_IMG=$(find ${UPLOAD_DIR} -type f -name "boot*${MACHINE}.img" -printf "%f\n"| sort)
+KERNEL_IMG=$(find ${UPLOAD_DIR} -type f -name "*Image-*${MACHINE}*.bin" -printf "%f\n")
+ROOTFS_IMG=$(find ${UPLOAD_DIR} -type f -name "ledge-iot-lava-*${MACHINE}*.rootfs.wic.gz" -printf "%f\n" )
+ROOTFS_GW=$(find ${UPLOAD_DIR} -type f -name "ledge-iot-lava-*${MACHINE}*.rootfs.wic.gz" -printf "%f\n" )
+ROOTFS_EXT4=$(find ${UPLOAD_DIR} -type f -name "ledge-*${MACHINE}*.rootfs.ext4.gz" -printf "%f\n")
+ROOTFS_TARXZ_IMG=$(find ${UPLOAD_DIR} -type f -name "ledge-*${MACHINE}*.rootfs.tar.xz" -printf "%f\n")
+HDD_IMG=$(find ${UPLOAD_DIR} -type f -name "ledge-*${MACHINE}*.hddimg.xz" -printf "%f\n")
+INITRD_URL=""
+OVMF=$(find ${UPLOAD_DIR} -type f -name "ovmf.qcow2" -printf "%f\n")
+CERTS=$(find ${UPLOAD_DIR} -type f -name ledge-kernel-uefi-certs.ext4.img -printf "%f\n");
+FIRMWARE=$(find ${UPLOAD_DIR} -type f -name firmware.uefi.uboot.bin -printf "%f\n");
+FIRMWARE_EDK2=$(find ${UPLOAD_DIR} -type f -name firmware.uefi.edk2.bin -printf "%f\n");
+FIRMWARE_EDK2_VARS=$(find ${UPLOAD_DIR} -type f -name LEDGE_*VARS.bin -printf "%f\n");
+
+# Clean up not needed build artifacts
+find ${UPLOAD_DIR} -not -name '*.wic.gz' -type f -exec rm -rf {} \;
+find ${UPLOAD_DIR} -type l -delete
+find ${UPLOAD_DIR} -type d -empty -delete || true
+
+case "${ORIG_MACHINE}" in
+	ledge-multi-armv7)
+		PUB_DEST_ORIG="${PUB_DEST}"
+		PUB_DEST="${PUB_DEST}/ledge-qemuarm"
+		;;
+	ledge-multi-armv8)
+		PUB_DEST="${PUB_DEST}/ledge-qemuarm64"
+		;;
+	*)
+		;;
+esac
+
+cat > ${UPLOAD_DIR}/build_config.json <<EOF
+{
+  "kernel_repo" : "${KERNEL_REPO}",
+  "kernel_commit_id" : "${SRCREV_kernel}",
+  "make_kernelversion" : "${MAKE_KERNELVERSION}",
+  "kernel_branch" : "${KERNEL_BRANCH}",
+  "kernel_describe" : "${KERNEL_DESCRIBE}",
+  "kselftest_mainline_url" : "${KSELFTESTS_MAINLINE_URL}",
+  "kselftest_mainline_version" : "${KSELFTESTS_MAINLINE_VERSION}",
+  "kselftest_next_url" : "${KSELFTESTS_NEXT_URL}",
+  "kselftest_next_version" : "${KSELFTESTS_NEXT_VERSION}",
+  "ltp_url" : "${LTP_URL}",
+  "ltp_version" : "${LTP_VERSION}",
+  "ltp_revision" : "${LTP_REVISION}",
+  "libhugetlbfs_url" : "${LIBHUGETLBFS_URL}",
+  "libhugetlbfs_version" : "${LIBHUGETLBFS_VERSION}",
+  "libhugetlbfs_revision" : "${LIBHUGETLBFS_REVISION}",
+  "build_arch" : "${TUNE_FEATURES}",
+  "compiler" : "${TARGET_SYS} ${GCCVERSION}",
+  "build_location" : "${BASE_URL}/${PUB_DEST}"
+}
+EOF
+
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+DEPLOY_DIR_IMAGE=${UPLOAD_DIR}
+MANIFEST_COMMIT=${MANIFEST_COMMIT}
+BASE_URL=${BASE_URL}
+BOOT_URL=${BASE_URL}/${PUB_DEST}/${BOOT_IMG}
+ROOTFS_SPARSE_BUILD_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG}
+SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG}
+SYSTEM_URL_GW=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG_GW}
+KERNEL_URL=${BASE_URL}/${PUB_DEST}/${KERNEL_IMG}
+DTB_URL=${BASE_URL}/${PUB_DEST}/${DTB_IMG}
+NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG}
+EXT4_IMAGE_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_EXT4}
+HDD_URL=${BASE_URL}/${PUB_DEST}/${HDD_IMG}
+KERNEL_COMMIT=${SRCREV_kernel}
+KERNEL_CONFIG_URL=${BASE_URL}/${PUB_DEST}/config
+KERNEL_DEFCONFIG_URL=${BASE_URL}/${PUB_DEST}/defconfig
+KSELFTESTS_MAINLINE_URL=${KSELFTESTS_MAINLINE_URL}
+KSELFTESTS_MAINLINE_VERSION=${KSELFTESTS_MAINLINE_VERSION}
+KSELFTESTS_NEXT_URL=${KSELFTESTS_NEXT_URL}
+KSELFTESTS_NEXT_VERSION=${KSELFTESTS_NEXT_VERSION}
+LTP_URL=${LTP_URL}
+LTP_VERSION=${LTP_VERSION}
+LTP_REVISION=${LTP_REVISION}
+LIBHUGETLBFS_URL=${LIBHUGETLBFS_URL}
+LIBHUGETLBFS_VERSION=${LIBHUGETLBFS_VERSION}
+LIBHUGETLBFS_REVISION=${LIBHUGETLBFS_REVISION}
+MAKE_KERNELVERSION=${MAKE_KERNELVERSION}
+TOOLCHAIN="${TARGET_SYS} ${GCCVERSION}"
+INITRD_URL="${INITRD_URL}"
+OVMF="${BASE_URL}/${PUB_DEST}/${OVMF}"
+CERTS="${BASE_URL}/${PUB_DEST}/${CERTS}"
+FIRMWARE="${BASE_URL}/${PUB_DEST}/${FIRMWARE}"
+FIRMWARE_EDK2="${BASE_URL}/${PUB_DEST}/${FIRMWARE_EDK2}"
+FIRMWARE_EDK2_VARS="${BASE_URL}/${PUB_DEST}/${FIRMWARE_EDK2_VARS}"
+STM32_FLASH_IMAGE_URL="${BASE_URL}/${PUB_DEST_ORIG}/${STM32_FLASH_IMAGE_URL}"
+STM32_FLASH_IMAGE_LAYOUT="${BASE_URL}/${PUB_DEST_ORIG}/${STM32_FLASH_IMAGE_LAYOUT}"
+EOF
+
+cat ${WORKSPACE}/post_build_lava_parameters
diff --git a/ledge/oe/lava-job-definitions/ledge-qemuarm64/template-boot.yaml b/ledge/oe/lava-job-definitions/ledge-qemuarm64/template-boot.yaml
new file mode 100644
index 0000000000..aa58df837f
--- /dev/null
+++ b/ledge/oe/lava-job-definitions/ledge-qemuarm64/template-boot.yaml
@@ -0,0 +1,83 @@
+device_type: qemu
+job_name: ledge qemu aarch64 ${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 120
+  action:
+    minutes: 120
+  connection:
+    minutes: 3
+priority: 25
+visibility: public
+context:
+  arch: aarch64
+  machine: virt,secure=on
+  cpu: cortex-a57
+  guestfs_interface: virtio
+  netdevice: user
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      1rootfs:
+        image_arg: -drive id=disk1,file={1rootfs},if=none,format=raw -device virtio-blk-device,drive=disk1 -nographic -device i6300esb,id=watchdog0 -m 2048 -smp 4
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      3bios:
+        image_arg: -drive if=pflash,unit=0,readonly=off,file={3bios},format=raw
+        url: http://snapshots.linaro.org/components/ledge/ts/latest/qemuarm64-secureboot/flash.bin
+    os: oe
+# boot to uboot
+- boot:
+    namespace: target
+    timeout:
+      minutes: 4
+    method: qemu
+    media: tmpfs
+    docker:
+      image: linaro/ci-amd64-ledge:stable
+      binary: /usr/bin/qemu-system-aarch64
+    expect_shell: false
+    auto_login:
+      login_prompt: 'Hit any key to stop autoboot'
+      username: " "
+    parameters:
+      kernel-start-message: "Booting Trusted Firmware"
+    prompts:
+    - '=>'
+    boot_finished:
+    - '=>'
+# configure to boot the image
+- test:
+    namespace: target
+    timeout:
+      minutes: 20
+    interactive:
+    - name: basic-cmds
+      prompts: ['=> ', 'Booting:']
+      script:
+      - command:
+      - command: "virtio scan"
+      - command: "ls virtio 0 && ls virtio 1"
+      - command: "efidebug boot add -b 1 BootLedge virtio 0:1 efi/boot/bootaa64.efi -i virtio 0:1 ledge-initramfs.rootfs.cpio.gz -s 'console=ttyAMA0,115200 console=tty0 root=UUID=6091b3a4-ce08-3020-93a6-f755a22ef03b rootwait panic=60'"
+      - command: "efidebug boot order 1"
+      - command: "bootefi bootmgr"
+# wait for boot to userspace
+- boot:
+    namespace: target
+    timeout:
+      minutes: 40
+    method: minimal
+    reset: false
+    prompts:
+      - 'ledge-qemuarm64:'
+    auto_login:
+      login_prompt: 'login:'
+      username: "ledge"
+      password_prompt: 'Password:'
+      password: "ledge"
diff --git a/ledge/oe/submit_for_testing.sh b/ledge/oe/submit_for_testing.sh
new file mode 100644
index 0000000000..9ea892521e
--- /dev/null
+++ b/ledge/oe/submit_for_testing.sh
@@ -0,0 +1,41 @@
+#!/bin/bash
+
+sudo locale-gen en_US.UTF-8 && sudo update-locale LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+[ -z "${KSELFTEST_PATH}" ] && export KSELFTEST_PATH="/opt/kselftests/mainline/"
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="25"
+[ -z "${SANITY_LAVA_JOB_PRIORITY}" ] && export SANITY_LAVA_JOB_PRIORITY="30"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+[ -z "${QA_SERVER_TEAM}" ] && export QA_SERVER_TEAM=rpb
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${TDEFINITIONS_REVISION}" ] && export TDEFINITIONS_REVISION="kselftest-5.1"
+[ -z "${MANIFEST_COMMIT}" ] && export MANIFEST_COMMIT="HEAD"
+[ -z "${MANIFEST_BRANCH}" ] && export MANIFEST_BRANCH="unknown"
+
+# Used by DB410C's template:
+export RESIZE_ROOTFS=${RESIZE_ROOTFS:-}
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+if [ "${MACHINE}" = "ledge-multi-armv7" ]; then
+	DTYPES=""
+elif [ "${MACHINE}" = "ledge-multi-armv8" ]; then
+	DTYPES="ledge-qemuarm64"
+fi
+
+for DEVICE_TYPE in ${DTYPES}; do
+      export DEVICE_TYPE
+
+      python3 configs/openembedded-lkft/submit_for_testing.py \
+         --device-type ${DEVICE_TYPE} \
+         --build-number ${BUILD_NUMBER} \
+         --lava-server ${LAVA_SERVER} \
+         --qa-server ${QA_SERVER} \
+         --qa-server-team ${QA_SERVER_TEAM} \
+         --qa-server-project ${QA_SERVER_PROJECT} \
+         --git-commit ${MANIFEST_COMMIT} \
+         --template-path configs/ledge/oe/lava-job-definitions \
+         --template-names template-boot.yaml
+done
diff --git a/ledge/oe/test_submit_for_testing.sh b/ledge/oe/test_submit_for_testing.sh
new file mode 100755
index 0000000000..5bdb64429f
--- /dev/null
+++ b/ledge/oe/test_submit_for_testing.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+# This 'test' script generates all job templates from lava-job-definitions,
+# verifies that they are valid YAML, and saves them all to ./tmp/. When making
+# lava job template changes in lava-job-definitions, run this beforehand, save
+# /tmp to a new path, and then run it after and diff the directories to see the
+# effects the change had on the job definitions.
+#
+# These generated templates can also be verified by lava by using the following
+# commandline, which requires lavacli to be configured with authentication
+# against some LAVA host.
+#
+#    drue@xps:~/src/configs/openembedded-lkft$ rm -rf tmp && ./test_submit_for_testing.sh && for file in $(find tmp -name '*.yaml'); do echo $file && lavacli -i therub jobs validate $file || break; done
+
+set -e
+
+virtualenv --python=$(which python2) .venv
+source .venv/bin/activate
+pip install Jinja2 requests urllib3 ruamel.yaml==0.16.13
+
+ export BASE_URL=http://snapshots.linaro.org
+export BOOT_URL=${BASE_URL}/${PUB_DEST}/boot-0.0+AUTOINC+06e4def583-fb1158a365-r0-hikey-20171012090440-346.uefi.img
+export DTB_URL=${BASE_URL}/${PUB_DEST}/junor2.dtb
+export HDD_URL=${BASE_URL}/${PUB_DEST}/rpb-console-image-intel-core2-32-20180212181859-651.hddimg
+export BUILD_ID=346
+export BUILD_NUMBER=346
+export BUILD_URL="https://ci.linaro.org/job/openembedded-lkft-linux-mainline/DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64/346/"
+export JOB_BASE_NAME="DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64"
+export JOB_NAME="openembedded-lkft-linux-mainline/DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64"
+export JOB_URL="https://ci.linaro.org/job/openembedded-lkft-linux-mainline/DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64/"
+export KERNEL_BRANCH=master
+export KERNEL_COMMIT=ff5abbe799e29099695cb8b5b2f198dd8b8bdf26
+export KERNEL_CONFIG_URL=${BASE_URL}/${PUB_DEST}/config
+export KERNEL_DEFCONFIG_URL=${BASE_URL}/${PUB_DEST}/defconfig
+export KERNEL_DESCRIBE=v4.14-rc4-84-gff5abbe799e2
+export KERNEL_RECIPE=linux-hikey-mainline
+export KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+
+export KERNEL_VERSION=git
+export KERNEL_VERSION_OVERRIDE=mainline
+export KSELFTEST_PATH="/opt/"
+export KSELFTESTS_URL=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.13.tar.xz
+export KSELFTESTS_VERSION=4.13
+export KSELFTESTS_REVISION=g4.13
+export KSELFTESTS_NEXT_URL=git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
+export KSELFTESTS_NEXT_VERSION=4.13+gitAUTOINC+49827b977a
+export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
+export LIBHUGETLBFS_REVISION=e44180072b796c0e28e53c4d01ef6279caaa2a99
+export LIBHUGETLBFS_URL=git://github.com/libhugetlbfs/libhugetlbfs.git
+export LIBHUGETLBFS_VERSION=2.20
+export LTP_REVISION=e671f2a13c695bbd87f7dfec2954ca7e3c43f377
+export LTP_URL=git://github.com/linux-test-project/ltp.git
+export LTP_VERSION=20170929
+export MACHINE=hikey
+export MAKE_KERNELVERSION=4.14.0-rc4
+export MANIFEST_BRANCH=morty
+export NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/rpb-console-image-hikey-20171012090440-346.rootfs.tar.xz
+export QA_REPORTS_TOKEN=qa-reports-token
+export QA_SERVER=https://qa-reports.linaro.org
+export QA_SERVER_PROJECT=linux-mainline-oe
+export RECOVERY_IMAGE_URL=${BASE_URL}/${PUB_DEST}/juno-oe-uboot.zip
+export SKIP_LAVA=
+export SRCREV_kernel=ff5abbe799e29099695cb8b5b2f198dd8b8bdf26
+export SYSTEM_URL=${BASE_URL}/${PUB_DEST}/rpb-console-image-hikey-20171012090440-346.rootfs.img.gz
+export BUILD_NAME="openembedded-lkft-linux-mainline"
+export LAVA_JOB_PRIORITY="50"
+export SANITY_LAVA_JOB_PRIORITY="55"
+export QA_SERVER="http://localhost:8000"
+export QA_REPORTS_TOKEN="secret"
+export DEVICE_TYPE="x86"
+export KSELFTEST_SKIPLIST="pstore"
+export QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+export TOOLCHAIN="arm-linaro-linux-gnueabi linaro-6.2"
+
+export DRY_RUN=true
+
+for device in qemuarm64 qemuarm; do
+    export DEVICE_TYPE=$device
+    export PUB_DEST=components/ledge/oe/ledge-${device}/latest/rpb
+    BUILD_LOCATION="${BASE_URL}/${PUB_DEST}"
+    export KERNEL_URL=${BUILD_LOCATION}/*Image*.bin
+    EXT4_IMAGE_FILENAME="ledge-gateway-ledge-*.rootfs.ext4.gz"
+    export EXT4_IMAGE_URL="${BUILD_LOCATION}/${EXT4_IMAGE_FILENAME}"
+    bash rpb-openembedded/submit_for_testing.sh
+done
+
+# cleanup virtualenv
+deactivate
+rm -rf .venv
diff --git a/ledge/qareports.groovy b/ledge/qareports.groovy
new file mode 100644
index 0000000000..4f5febc550
--- /dev/null
+++ b/ledge/qareports.groovy
@@ -0,0 +1,18 @@
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+  def qa_server = manager.envVars["QA_SERVER"]
+  def desc = manager.build.getDescription()
+  if (desc == null) {
+    desc = ""
+  }
+  pattern = ~"(${qa_server}/testjob/(\\d+))(.*)"
+  manager.build.logFile.eachLine { line ->
+    matcher = pattern.matcher(line)
+    if(matcher.matches()) {
+      def url = matcher.group(1)
+      def testjob_id = matcher.group(2)
+      def job_name = matcher.group(3)
+      desc += "&nbsp;<a href='${url}'>LAVA job (QA ${testjob_id})${job_name}</a><br/>"
+    }
+  }
+  manager.build.setDescription(desc)
+}
diff --git a/ledge/ts/builders.sh b/ledge/ts/builders.sh
new file mode 100755
index 0000000000..9ad955edb9
--- /dev/null
+++ b/ledge/ts/builders.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+echo "Trusted Substrate Build for: ${MACHINE}"
+
+set -e
+
+sudo mkdir -p /srv/oe
+sudo chown buildslave:buildslave /srv/oe
+cd /srv/oe
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    echo "Running cleanup_exit..."
+}
+
+set -ex
+
+# Store the home repository
+if [ -z "${WORKSPACE}" ]; then
+  # Local build
+  export WORKSPACE=${PWD}
+fi
+
+git clone ${GIT_URL} -b ${GIT_BRANCH}
+cd meta-ts
+
+# link to shared downloads on persistent disk
+# our builds config is expecting downloads and sstate-cache, here.
+mkdir -p build/downloads ${HOME}/srv/oe/sstate-cache-${GIT_BRANCH}
+mkdir -p build/sstate-cache
+ln -s ${HOME}/srv/oe/downloads build/downloads
+ln -s ${HOME}/srv/oe/sstate-cache-${GIT_BRANCH} sstate-cache
+rm -rf build/conf build/tmp
+
+GIT_COMMIT=`git rev-parse HEAD`
+
+kas build ci/${MACHINE}.yml
+
+DEPLOY_DIR_IMAGE="`pwd`/build/tmp/deploy/images/${MACHINE}"
+UPLOAD_DIR_IMAGE="`pwd`/build/tmp/deploy/images/${MACHINE}-upload"
+mkdir -p ${UPLOAD_DIR_IMAGE}
+
+case ${MACHINE} in
+  qemuarm64-secureboot)
+	DEPLOY_DIR_IMAGE="`pwd`/build/tmp/deploy/images/ts${MACHINE}"
+	find ${DEPLOY_DIR_IMAGE} -name flash.bin -type l -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	;;
+  zynqmp-starter)
+	find ${DEPLOY_DIR_IMAGE} -name ImageA.bin -type f -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	find ${DEPLOY_DIR_IMAGE} -name ImageB.bin -type f -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	;;
+  synquacer)
+	find ${DEPLOY_DIR_IMAGE} -name scp_romramfw_release.bin -type f -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	find ${DEPLOY_DIR_IMAGE} -name u-boot.bin 		-type l -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	find ${DEPLOY_DIR_IMAGE} -name fip_all_arm_tf_optee.bin -type f -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	find ${DEPLOY_DIR_IMAGE} -name tee-pager_v2.bin 	-type f -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	;;
+  stm32mp157c-dk2)
+	find ${DEPLOY_DIR_IMAGE} -name ts-firmware-${MACHINE}.wic.gz -type l -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	pushd ${UPLOAD_DIR_IMAGE}
+	  wget http://releases.linaro.org/components/ledge/rp-0.3/ledge-multi-armv7/ledge-qemuarm/ledge-iot-lava-ledge-qemuarm-20211202164307.rootfs.wic.gz
+	  cp ts-firmware-${MACHINE}.wic.gz sdcard.bin.gz
+	  gunzip ledge-iot-lava-ledge-qemuarm-*.rootfs.wic.gz  sdcard.bin.gz
+	  wget http://git-us.linaro.org/ci/job/configs.git/plain/ledge/ts/scripts/ts-merge-images.sh
+	  rootfsimg=`ls ledge-iot-lava-ledge-qemuarm-*.rootfs.wic`
+	  sudo sh -x ./ts-merge-images.sh sdcard.bin ${rootfsimg}
+	  gzip sdcard.bin
+	  rm -rf ${rootfsimg} ts-merge-images.sh
+	popd
+	URL_STM_SDIMAGE="http://snapshots.linaro.org/${PUB_DEST}/sdcard.bin.gz"
+        ;;
+  *)
+	find ${DEPLOY_DIR_IMAGE} -name ts-firmware-${MACHINE}.wic.gz -type l -exec cp -rvfL --remove-destination {} ${UPLOAD_DIR_IMAGE} \;
+	;;
+esac
+
+# Note: the main job script allows to override the default value for
+#       BASE_URL and PUB_DEST, typically used for OE RPB builds
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+DEPLOY_DIR_IMAGE=${UPLOAD_DIR_IMAGE}
+URL_STM_FLASHER="http://git-us.linaro.org/ci/job/configs.git/plain/ledge/ts/scripts/stm32.tar.gz"
+URL_STM_TSV="http://git-us.linaro.org/ci/job/configs.git/plain/ledge/ts/scripts/stm32mp157c-sdcard.tsv"
+URL_STM_SDIMAGE=${URL_STM_SDIMAGE}
+BUILD_NUMBER=${BUILD_NUMBER}
+MACHINE=${MACHINE}
+GIT_URL=${GIT_URL}
+GIT_BRANCH=${GIT_BRANCH}
+GIT_COMMIT=${GIT_COMMIT}
+PUB_DEST=${PUB_DEST}
+EOF
diff --git a/ledge/ts/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml b/ledge/ts/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
new file mode 100644
index 0000000000..c113cbc499
--- /dev/null
+++ b/ledge/ts/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
@@ -0,0 +1,64 @@
+device_type: stm32mp157c-dk2
+job_name: TS stm32mp157c-dk2 build ${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 5
+  connection:
+    minutes: 5
+priority: medium
+visibility: public
+context:
+  test_character_delay: 30
+actions:
+- deploy:
+    timeout:
+      minutes: 60
+    to: flasher
+    images:
+      tarball:
+        url: ${URL_STM_FLASHER}
+      layout:
+        url: ${URL_STM_TSV}
+      sdcard:
+        url: ${URL_STM_SDIMAGE}
+        compression: gz
+    os: oe
+
+- boot:
+    timeout:
+      minutes: 15
+    method: u-boot
+    auto_login:
+      login_prompt: 'ledge-qemuarm login:'
+      username: ''
+    prompt:
+      - "=>"
+    commands:
+      - ls mmc 0:4 /
+      - ls mmc 0:5 /
+      - efidebug boot add -b 1 BootLedge mmc 0:4 efi/boot/bootarm.efi -i
+          mmc 0:4 ledge-initramfs.rootfs.cpio.gz -s 'console=ttySTM0,115200 root=UUID=6091b3a4-ce08-3020-93a6-f755a22ef03b rootwait panic=10'
+      - efidebug boot order 1
+      - echo "Starting kernel"; bootefi bootmgr
+
+- boot:
+    timeout:
+      minutes: 15
+    method: minimal
+    reset: false
+    prompts:
+      - 'ledge-qemuarm:'
+    auto_login:
+      login_prompt: 'login:'
+      username: "ledge"
+      password_prompt: 'Password:'
+      password: "ledge"
+
+metadata:
+  machine: ${MACHINE}
+  git: ${GIT_URL}
+  git branch: ${GIT_BRANCH}
+  manifest commit: ${GIT_COMMIT}
+  build url: ${PUB_DEST}
diff --git a/ledge/ts/scripts/stm32.tar.gz b/ledge/ts/scripts/stm32.tar.gz
new file mode 100644
index 0000000000..4c4b4b2694
--- /dev/null
+++ b/ledge/ts/scripts/stm32.tar.gz
diff --git a/ledge/ts/scripts/stm32mp157c-sdcard.tsv b/ledge/ts/scripts/stm32mp157c-sdcard.tsv
new file mode 100644
index 0000000000..e96dac7b9a
--- /dev/null
+++ b/ledge/ts/scripts/stm32mp157c-sdcard.tsv
@@ -0,0 +1,4 @@
+#Opt	Id	Name	Type	IP	Offset	Binary
+-	0x01	fsbl1-boot	Binary		none	0x0		tf-a-stm32mp157c-dk2-flasher.stm32
+-	0x03	ssbl-boot	Binary		none	0x0		u-boot-stm32mp157c-dk2-flasher.stm32
+P	0x10	sdcard		RawImage	mmc0	0x00000000	../sdcard/sdcard.bin
diff --git a/ledge/ts/scripts/ts-merge-images-esp.sh b/ledge/ts/scripts/ts-merge-images-esp.sh
new file mode 100644
index 0000000000..446741a3e9
--- /dev/null
+++ b/ledge/ts/scripts/ts-merge-images-esp.sh
@@ -0,0 +1,46 @@
+#!/bin/bash
+firmware_image=$1
+os_image=$2
+
+set -e
+
+export LANG=C
+
+[ "$#" -ne 2 ] && echo "$0 <firmware .wic> <rootfs .wic>" && exit 1
+
+# src esp size
+src_start=`fdisk -l ${os_image} | grep wic1 | awk '{print $2}'` # in sectors
+src_end=`fdisk -l ${os_image} | grep wic1 | awk '{print $3}'` # in sectors
+src_size=$((src_end - src_start + 1)) # in sectors
+
+truncate $firmware_image --size +$((src_size * 512))
+#fix image after resize with sgdisk + fdisk
+sgdisk -e $firmware_image
+fdisk $firmware_image <<EOF
+w
+EOF
+fdisk -l ${firmware_image}
+
+# Create new ESP partition with SRC size and EFI type
+fdisk $firmware_image <<EOF
+n
+
+
++$((src_size - 1))
+t
+
+1
+w
+EOF
+fdisk -l $firmware_image
+
+esp_dest_start=`fdisk -l ${firmware_image} | tail -n 1 | awk '{print $2}'`
+
+dd conv=notrunc \
+	bs=512 \
+	count=${src_size} \
+	skip=${src_start} \
+	seek=${esp_dest_start} \
+	if=${os_image} \
+	of=${firmware_image} \
+	status=progress
diff --git a/ledge/ts/scripts/ts-merge-images.sh b/ledge/ts/scripts/ts-merge-images.sh
new file mode 100644
index 0000000000..f985f1a40b
--- /dev/null
+++ b/ledge/ts/scripts/ts-merge-images.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+firmware_image=$1
+os_image=$2
+
+set -e
+
+export LANG=C
+
+[ "$#" -ne 2 ] && echo "$0 <firmware .wic> <rootfs .wic>" && exit 1
+
+# src esp size
+src_start=`fdisk -l ${os_image} | grep wic1 | awk '{print $2}'` # in sectors
+src_end=`fdisk -l ${os_image} | grep wic1 | awk '{print $3}'` # in sectors
+src_size=$((src_end - src_start + 1)) # in sectors
+
+# rootfs size
+rootfs_start=`fdisk -l ${os_image} | grep wic2 | awk '{print $2}'` # in sectors
+rootfs_end=`fdisk -l ${os_image} | grep wic2 | awk '{print $3}'` # in sectors
+rootfs_size=$((rootfs_end - rootfs_start + 1)) # in sectors
+
+extra_size=$(((src_size + rootfs_size) * 512 + 10*1024*1024)) # 10MB extra at the end
+
+truncate $firmware_image --size +${extra_size}
+#fix image after resize with sgdisk + fdisk
+sgdisk -e $firmware_image
+fdisk $firmware_image <<EOF
+w
+EOF
+
+# Create new ESP and rootfs partitions
+fdisk $firmware_image <<EOF
+n
+
+
++$((src_size - 1))
+t
+
+1
+n
+
+
++$((rootfs_size - 1))
+t
+
+20
+w
+EOF
+fdisk -l $firmware_image
+
+esp_dest_start=`fdisk -l ${firmware_image} | tail -n 2 | head -n 1 | awk '{print $2}'`
+
+dd conv=notrunc \
+	bs=512 \
+	count=${src_size} \
+	skip=${src_start} \
+	seek=${esp_dest_start} \
+	if=${os_image} \
+	of=${firmware_image} \
+	status=progress
+
+
+rootfs_dest_start=`fdisk -l ${firmware_image} | tail -n 1 | awk '{print $2}'`
+dd conv=notrunc \
+	bs=512 \
+	count=${rootfs_size} \
+	skip=${rootfs_start} \
+	seek=${rootfs_dest_start} \
+	if=${os_image} \
+	of=${firmware_image} \
+	status=progress
diff --git a/ledge/ts/submit_for_testing.sh b/ledge/ts/submit_for_testing.sh
new file mode 100644
index 0000000000..1d92dc98f0
--- /dev/null
+++ b/ledge/ts/submit_for_testing.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+case $MACHINE in
+	stm32mp157c-dk2)
+		echo "running test for ${MACHINE}"
+	;;
+	*)
+		echo "skiping test for ${MACHINE}"
+		exit 0
+	;;
+esac
+
+sudo locale-gen en_US.UTF-8 && sudo update-locale LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+[ -z "${KSELFTEST_PATH}" ] && export KSELFTEST_PATH="/opt/kselftests/mainline/"
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="25"
+[ -z "${SANITY_LAVA_JOB_PRIORITY}" ] && export SANITY_LAVA_JOB_PRIORITY="30"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+[ -z "${QA_SERVER_TEAM}" ] && export QA_SERVER_TEAM=rpb
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${TDEFINITIONS_REVISION}" ] && export TDEFINITIONS_REVISION="kselftest-5.1"
+[ -z "${MANIFEST_COMMIT}" ] && export MANIFEST_COMMIT="HEAD"
+[ -z "${MANIFEST_BRANCH}" ] && export MANIFEST_BRANCH="unknown"
+
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+
+python3 configs/openembedded-lkft/submit_for_testing.py \
+         --device-type ${MACHINE} \
+         --build-number ${BUILD_NUMBER} \
+         --lava-server ${LAVA_SERVER} \
+         --qa-server ${QA_SERVER} \
+         --qa-server-team ${QA_SERVER_TEAM} \
+         --qa-server-project ${QA_SERVER_PROJECT} \
+         --git-commit ${MANIFEST_COMMIT} \
+         --template-path configs/ledge/ts/lava-job-definitions \
+         --template-names template-boot.yaml
diff --git a/ledge/u-boot/builders.sh b/ledge/u-boot/builders.sh
new file mode 100755
index 0000000000..d91e2ab667
--- /dev/null
+++ b/ledge/u-boot/builders.sh
@@ -0,0 +1,68 @@
+#!/bin/bash
+
+echo "LEDGE build for machine ${MACHINE} distro ${DISTRO}"
+ORIG_MACHINE="${MACHINE}"
+
+set -e
+
+# workaround EDK2 is confused by the long path used during the build
+# and truncate files name expected by VfrCompile
+sudo mkdir -p /srv/oe
+sudo chown buildslave:buildslave /srv/oe
+cd /srv/oe
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    echo "Running cleanup_exit..."
+}
+
+set -ex
+
+# Store the home repository
+if [ -z "${WORKSPACE}" ]; then
+  # Local build
+  export WORKSPACE=${PWD}
+fi
+
+# Install toolchain
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="gcc-aarch64-linux-gnu"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+
+#Build
+git clone https://github.com/u-boot/u-boot.git
+cd u-boot
+make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu- qemu_arm64_defconfig
+make ARCH=arm CROSS_COMPILE=aarch64-linux-gnu-
+
+export UPLOAD_DIR="`pwd`/../uboot-build"
+mkdir -p ${UPLOAD_DIR}
+cp u-boot.bin ${UPLOAD_DIR}/u-boot.aarch64.bin
+
+BASE_URL=http://snapshots.linaro.org
+
+#Trigger LAVA job
+cat > ${UPLOAD_DIR}/build_config.json <<EOF
+{
+  "branch" : "master",
+  "build_location" : "${BASE_URL}/${PUB_DEST}"
+}
+EOF
+
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+DEPLOY_DIR_IMAGE=${UPLOAD_DIR}
+UBOOT="${BASE_URL}/${PUB_DEST}/u-boot.aarch64.bin"
+EOF
+
+cat ${WORKSPACE}/post_build_lava_parameters
diff --git a/ledge/u-boot/lava-job-definitions/qemu-arm64/template-boot.yaml b/ledge/u-boot/lava-job-definitions/qemu-arm64/template-boot.yaml
new file mode 100644
index 0000000000..843b9740fd
--- /dev/null
+++ b/ledge/u-boot/lava-job-definitions/qemu-arm64/template-boot.yaml
@@ -0,0 +1,60 @@
+job_name: SR-IR QEMU on x86_64
+timeouts:
+  job:
+    minutes: 300
+  action:
+    minutes: 300
+  connection:
+    minutes: 20
+visibility: public
+priority: medium
+device_type: x86
+actions:
+- deploy:
+    role:
+    - target
+    timeout:
+      minutes: 10
+    to: tftp
+    kernel:
+      url: http://people.linaro.org/~ilias.apalodimas/images/ubuntu-focal-lts/vmlinuz
+    nfsrootfs:
+      url: http://people.linaro.org/~ilias.apalodimas/images/ubuntu-focal-lts/binary.tar.xz
+      prefix: media/
+      compression: xz
+    ramdisk:
+      url: http://people.linaro.org/~ilias.apalodimas/images/ubuntu-focal-lts/initrd.img
+    os: debian
+- boot:
+    role:
+    - target
+    timeout:
+      minutes: 45
+    method: ipxe
+    commands: nfs
+    parameters:
+      shutdown-message: 'reboot: Restarting system'
+    auto_login:
+      login_prompt: 'login:'
+      username: linaro
+      password_prompt: 'Password:'
+      password: linaro
+      login_commands:
+      - sudo su -
+    prompts:
+    - root@(.*)
+    - linaro@(.*)
+- test:
+    role:
+    - target
+    timeout:
+      minutes: 300
+    definitions:
+    - repository: https://git.linaro.org/ledge/lava-test-definitions.git
+      from: git
+      path: execs/ubuntu-build-essential.yaml
+      name: deps
+    - repository: https://git.linaro.org/ledge/lava-test-definitions.git
+      from: git
+      path: execs/sr-ir.yaml
+      name: sr-ir
diff --git a/ledge/u-boot/submit_for_testing.sh b/ledge/u-boot/submit_for_testing.sh
new file mode 100644
index 0000000000..a5c781c5f8
--- /dev/null
+++ b/ledge/u-boot/submit_for_testing.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+sudo locale-gen en_US.UTF-8 && sudo update-locale LANG=en_US.UTF-8
+export LC_ALL=en_US.UTF-8
+
+[ -z "${KSELFTEST_PATH}" ] && export KSELFTEST_PATH="/opt/kselftests/mainline/"
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="25"
+[ -z "${SANITY_LAVA_JOB_PRIORITY}" ] && export SANITY_LAVA_JOB_PRIORITY="30"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+[ -z "${QA_SERVER_TEAM}" ] && export QA_SERVER_TEAM=rpb
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${TDEFINITIONS_REVISION}" ] && export TDEFINITIONS_REVISION="kselftest-5.1"
+[ -z "${MANIFEST_COMMIT}" ] && export MANIFEST_COMMIT="HEAD"
+[ -z "${MANIFEST_BRANCH}" ] && export MANIFEST_BRANCH="unknown"
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+DTYPES="${DEVICE_TYPE}"
+
+for DEVICE_TYPE in ${DTYPES}; do
+      export DEVICE_TYPE
+
+      python3 configs/openembedded-lkft/submit_for_testing.py \
+         --device-type ${DEVICE_TYPE} \
+         --build-number ${BUILD_NUMBER} \
+         --lava-server ${LAVA_SERVER} \
+         --qa-server ${QA_SERVER} \
+         --qa-server-team ${QA_SERVER_TEAM} \
+         --qa-server-project ${QA_SERVER_PROJECT} \
+         --git-commit ${MANIFEST_COMMIT} \
+         --template-path configs/ledge/u-boot/lava-job-definitions \
+         --template-names template-boot.yaml
+done
diff --git a/leg-96boards-developerbox-edk2.yaml b/leg-96boards-developerbox-edk2.yaml
index 03434e2b56..369e49f178 100644
--- a/leg-96boards-developerbox-edk2.yaml
+++ b/leg-96boards-developerbox-edk2.yaml
@@ -11,17 +11,17 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
                 - job-cancel
-    disabled: false
+    disabled: true
     node: docker-stretch-arm64
-    display-name: 'Linaro EDK II - Socionext Developerbox System Firmware'
+    display-name: 'DISABLED - Linaro EDK II - Socionext Developerbox System Firmware'
     scm:
         - git:
-            url: git://git.linaro.org/leg/noupstream/edk2-platforms.git 
+            url: git://git.linaro.org/leg/noupstream/edk2-platforms.git
             refspec: +refs/heads/developer-box:refs/remotes/origin/developer-box
             name: origin
             branches:
@@ -33,6 +33,7 @@
             wipe-workspace: false
     triggers:
         - pollscm: 'H/5 * * * *'
+        - timed: '@monthly'
     wrappers:
         - timestamps
         - build-name:
@@ -71,7 +72,8 @@
 
             source edk2/edksetup.sh
 
-            build -a AARCH64 -t GCC5 -b DEBUG -b RELEASE -n $NUM_THREADS -p Platform/Socionext/DeveloperBox/DeveloperBox.dsc -D BUILD_NUMBER=${BUILD_NUMBER} -D DO_X86EMU=TRUE -D FIRMWARE_VENDOR=Linaro
+            build -a AARCH64 -t GCC5 -b RELEASE -n $NUM_THREADS -p Platform/Socionext/DeveloperBox/DeveloperBox.dsc -D BUILD_NUMBER=${BUILD_NUMBER} -D X64EMU_ENABLE -D FIRMWARE_VENDOR=Linaro
+            build -a AARCH64 -t GCC5 -b DEBUG -n $NUM_THREADS -p Platform/Socionext/DeveloperBox/DeveloperBox.dsc -D BUILD_NUMBER=${BUILD_NUMBER} -D X64EMU_ENABLE -D FIRMWARE_VENDOR=Linaro
 
             mkdir $OUTDIR
             cp Build/DeveloperBox/DEBUG_GCC5/FV/SPI_NOR_IMAGE.fd $OUTDIR/SPI_NOR_IMAGE.fd-DEBUG
@@ -102,7 +104,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out components/kernel/${JOB_NAME}/${BUILD_NUMBER}
diff --git a/leg-cloud-image-centos.yaml b/leg-cloud-image-centos.yaml
deleted file mode 100644
index 0d31e73e19..0000000000
--- a/leg-cloud-image-centos.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    name: leg-cloud-image-centos
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: docker-xenial-arm64
-    display-name: 'LEG Cloud image CentOS'
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw: leg-cloud-image/centos/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/developer-cloud/centos/cloud-image/${BUILD_NUMBER}
-
-            rm -rf out
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org marcin.juszkiewicz@linaro.org'
diff --git a/leg-cloud-image-debian.yaml b/leg-cloud-image-debian.yaml
deleted file mode 100644
index 640fb02674..0000000000
--- a/leg-cloud-image-debian.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    name: leg-cloud-image-debian
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'LEG Cloud image Debian'
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw: leg-cloud-image/debian/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/developer-cloud/debian/cloud-image/${BUILD_NUMBER}
-
-            rm -rf out
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org marcin.juszkiewicz@linaro.org'
diff --git a/leg-cloud-image/centos/builders.sh b/leg-cloud-image/centos/builders.sh
deleted file mode 100755
index 357fc230f2..0000000000
--- a/leg-cloud-image/centos/builders.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-export image_name=centos7-cloud-image
-export mountpoint=$(mktemp -d /tmp/${image_name}.XXXXXX)
-
-sudo apt-get -q=2 update
-sudo apt-get -q=2 install -y --no-install-recommends qemu-utils virtinst libvirt-bin
-
-default_gw=$(ip route show default 0.0.0.0/0 | cut -d' ' -f3)
-sudo sed -i "/^uri_default/d" /etc/libvirt/libvirt.conf
-echo "uri_default = \"qemu+tcp://${default_gw}/system\"" | sudo tee -a /etc/libvirt/libvirt.conf
-
-virt-host-validate
-
-sudo virsh pool-list --all
-sudo virsh net-list --all
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  cd ${WORKSPACE}
-  sudo virsh vol-delete --pool default ${image_name}.qcow2 || true
-  sudo virsh destroy ${image_name} || true
-  sudo virsh undefine ${image_name} || true
-  sudo umount ${mountpoint} || true
-  sudo kpartx -dv /dev/nbd0 || true
-  sudo qemu-nbd --disconnect /dev/nbd0 || true
-  sudo rm -rf ${mountpoint} || true
-  sudo rm -f ${image_name}.qcow2
-}
-
-wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-cloud-image/centos/centos7-aarch64.ks -O centos7-aarch64.ks
-
-sudo virt-install \
-  --name ${image_name} \
-  --initrd-inject centos7-aarch64.ks \
-  --extra-args "ks=file:/centos7-aarch64.ks" \
-  --disk=pool=default,size=10,format=qcow2,bus=virtio \
-  --memory 2048 \
-  --location http://mirror.centos.org/altarch/7/os/aarch64/ \
-  --noreboot
-
-set +ex
-while [ true ]; do
-  sleep 1
-  vm_running=$(sudo virsh list --name --state-running | grep "^${image_name}" | wc -l)
-  [ "${vm_running}" -eq "0" ] && break
-done
-set -ex
-
-sudo virsh list --all
-sudo virsh pool-list --all
-sudo virsh net-list --all
-
-mkdir out
-mv centos7-aarch64.ks out/
-# virsh vol-download is slow - copy from a mounted volume
-sudo cp -a /var/lib/libvirt/images/${image_name}.qcow2 .
-# extract kernel and initramfs from image
-sudo qemu-nbd --connect=/dev/nbd0 ${image_name}.qcow2
-for device in $(sudo kpartx -avs /dev/nbd0 | cut -d' ' -f3); do
-  partition=$(echo ${device} | cut -d'p' -f2)
-  [ "${partition}" = "2" ] && sudo mount /dev/mapper/${device} ${mountpoint}
-done
-sudo cp -a ${mountpoint}/*.linaro.aarch64* out/
-sudo qemu-img convert -c -O qcow2 ${image_name}.qcow2 out/${image_name}.qcow2
-sudo chown -R buildslave:buildslave out
diff --git a/leg-cloud-image/centos/centos7-aarch64.ks b/leg-cloud-image/centos/centos7-aarch64.ks
deleted file mode 100644
index 1a560364a5..0000000000
--- a/leg-cloud-image/centos/centos7-aarch64.ks
+++ /dev/null
@@ -1,96 +0,0 @@
-reboot
-eula --agreed
-text
-firstboot --disable
-ignoredisk --only-use=vda
-keyboard --vckeymap=us --xlayouts='us'
-lang en_GB.UTF-8
-network  --bootproto=dhcp --device=eth0 --onboot=off --ipv6=auto --hostname=localhost.localdomain
-repo --name=os      --baseurl=http://mirror.centos.org/altarch/7/os/aarch64/
-repo --name=extras  --baseurl=http://mirror.centos.org/altarch/7/extras/aarch64/
-repo --name=updates --baseurl=http://mirror.centos.org/altarch/7/updates/aarch64/
-rootpw --plaintext root
-user --name centos --plaintext --password centos --homedir /home/centos --groups wheel
-timezone Europe/Warsaw --isUtc
-bootloader  --boot-drive=vda
-autopart --type=plain
-clearpart --all --initlabel --drives=vda
-
-%packages
-@core
-cloud-init
-chrony
-gdisk
-nfs-utils
-rsync
-tar
-yum-utils
-dracut-config-generic
-dracut-norescue
--aic94xx-firmware
--alsa-firmware
--alsa-lib
--alsa-tools-firmware
--iprutils
--ivtv-firmware
--iwl100-firmware
--iwl1000-firmware
--iwl105-firmware
--iwl135-firmware
--iwl2000-firmware
--iwl2030-firmware
--iwl3160-firmware
--iwl3945-firmware
--iwl4965-firmware
--iwl5000-firmware
--iwl5150-firmware
--iwl6000-firmware
--iwl6000g2a-firmware
--iwl6000g2b-firmware
--iwl6050-firmware
--iwl7260-firmware
-%end
-
-%post
-# Needed for install, not so much for cloud.
-yum -C -y remove firewalld --setopt="clean_requirements_on_remove=1"
-yum -C -y remove avahi\* Network\*
-
-cat > /etc/sysconfig/network << EO
-NETWORKING=yes
-NOZEROCONF=yes
-EO
-
-# Ensure we're not backing in a mac addr.
-cat > /etc/sysconfig/network-scripts/ifcfg-eth0 << EO
-DEVICE="eth0"
-BOOTPROTO="dhcp"
-ONBOOT="yes"
-TYPE="Ethernet"
-USERCTL="yes"
-PEERDNS="yes"
-IPV6INIT="no"
-PERSISTENT_DHCLIENT="1"
-EO
-
-# Let mirrors know it's cloud
-echo 'genclo' > /etc/yum/vars/infra
-
-# Fix selinux context
-echo "Fixing SELinux contexts."
-touch /var/log/cron
-touch /var/log/boot.log
-mkdir -p /var/cache/yum
-/usr/sbin/fixfiles -R -a restore
-
-# make sure firstboot doesn't start
-echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
-
-# install updates (including kernel) from Linaro overlay
-curl http://repo.linaro.org/rpm/linaro-overlay/centos-7/linaro-overlay.repo > /etc/yum.repos.d/linaro-overlay.repo
-yum update -y --nogpgcheck
-
-# make sure that resulting initramfs will have virtio storage drivers
-echo 'add_drivers+="virtio-blk virtio-scsi"' > /etc/dracut.conf.d/add-virtio-modules.conf
-dracut -f /boot/initramfs-$(rpm -qa kernel|sed -e "s/kernel-//g").img $(rpm -qa kernel|sed -e "s/kernel-//g")
-%end
\ No newline at end of file
diff --git a/leg-cloud-image/debian/builders.sh b/leg-cloud-image/debian/builders.sh
deleted file mode 100755
index 3bb2613f5f..0000000000
--- a/leg-cloud-image/debian/builders.sh
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-export image_name=debian-cloud-image
-export mountpoint=$(mktemp -d /tmp/${image_name}.XXXXXX)
-
-sudo apt-get -q=2 update
-sudo apt-get -q=2 install -y --no-install-recommends cpio qemu-utils virtinst libvirt-clients
-
-default_gw=$(ip route show default 0.0.0.0/0 | cut -d' ' -f3)
-sudo sed -i "/^uri_default/d" /etc/libvirt/libvirt.conf
-echo "uri_default = \"qemu+tcp://${default_gw}/system\"" | sudo tee -a /etc/libvirt/libvirt.conf
-
-virt-host-validate
-
-sudo virsh pool-list --all
-sudo virsh net-list --all
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  cd ${WORKSPACE}
-  sudo virsh vol-delete --pool default ${image_name}.qcow2 || true
-  sudo virsh destroy ${image_name} || true
-  sudo virsh undefine ${image_name} || true
-  sudo umount ${mountpoint} || true
-  sudo kpartx -dv /dev/nbd0 || true
-  sudo qemu-nbd --disconnect /dev/nbd0 || true
-  sudo rm -rf ${mountpoint} || true
-  sudo rm -f ${image_name}.qcow2
-}
-
-wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-cloud-image/debian/preseed.cfg -O preseed.cfg
-
-#
-# address.type=virtio-mmio forces all devices (storage, network) to be mmio instead of pci
-# Debian/jessie 3.16 kernel does not recognize virtio pci network card
-#
-sudo virt-install \
-  --name ${image_name} \
-  --initrd-inject preseed.cfg \
-  --extra-args "interface=auto noshell auto=true DEBIAN_FRONTEND=text" \
-  --disk=pool=default,bus=virtio,size=1.5,format=qcow2 \
-  --network=network=default,address.type=virtio-mmio \
-  --memory 2048 \
-  --location http://ftp.debian.org/debian/dists/oldstable/main/installer-arm64/ \
-  --noreboot 
-
-set +ex
-while [ true ]; do
-  sleep 1
-  vm_running=$(sudo virsh list --name --state-running | grep "^${image_name}" | wc -l)
-  [ "${vm_running}" -eq "0" ] && break
-done
-set -ex
-
-sudo virsh list --all
-sudo virsh pool-list --all
-sudo virsh net-list --all
-
-mkdir out
-mv preseed.cfg out/debian-jessie-arm64-preseed.cfg
-
-# https://bugs.linaro.org/show_bug.cgi?id=3164
-#sudo cp -a /var/lib/libvirt/images/${image_name}.qcow2 .
-
-sudo virsh vol-download --pool default --vol ${image_name}.qcow2 --file ${image_name}.qcow2
-
-# extract kernel and initramfs from image
-sudo qemu-nbd --connect=/dev/nbd0 ${image_name}.qcow2
-for device in $(sudo kpartx -avs /dev/nbd0 | cut -d' ' -f3); do
-  partition=$(echo ${device} | cut -d'p' -f2)
-  [ "${partition}" = "2" ] && sudo mount /dev/mapper/${device} ${mountpoint}
-done
-cp -a ${mountpoint}/boot/*-arm64 out/
-sudo qemu-img convert -c -O qcow2 ${image_name}.qcow2 out/${image_name}.qcow2
-sudo chown -R buildslave:buildslave out
diff --git a/leg-cloud-image/debian/preseed.cfg b/leg-cloud-image/debian/preseed.cfg
deleted file mode 100644
index e2e177c6c9..0000000000
--- a/leg-cloud-image/debian/preseed.cfg
+++ /dev/null
@@ -1,72 +0,0 @@
-d-i debian-installer/locale string en_US.UTF-8
-d-i localechooser/supported-locales multiselect en_US.UTF-8, en_GB.UTF-8
-d-i keyboard-configuration/xkb-keymap select us
-d-i netcfg/choose_interface select auto
-d-i netcfg/get_hostname string unassigned-hostname
-d-i netcfg/get_domain string unassigned-domain
-d-i netcfg/wireless_wep string
-d-i mirror/country string manual
-d-i mirror/http/hostname string deb.debian.org
-d-i mirror/http/directory string /debian
-d-i mirror/http/proxy string
-d-i passwd/root-login boolean false
-d-i passwd/user-fullname string Debian User
-d-i passwd/username string debian
-d-i passwd/user-password password insecure
-d-i passwd/user-password-again password insecure
-d-i clock-setup/utc boolean true
-d-i time/zone string UTC
-d-i clock-setup/ntp boolean true
-d-i partman-auto/method string regular
-d-i partman-lvm/device_remove_lvm boolean true
-d-i partman-md/device_remove_md boolean true
-d-i partman-lvm/confirm boolean true
-d-i partman-lvm/confirm_nooverwrite boolean true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman/confirm_nooverwrite boolean true
-d-i partman-md/confirm boolean true
-d-i partman-partitioning/confirm_write_new_label boolean true
-d-i partman/choose_partition select finish
-d-i partman/confirm boolean true
-d-i partman-basicfilesystems/no_swap boolean false
-d-i partman/confirm_nooverwrite boolean true
-d-i partman-auto/expert_recipe string \
-	myroot :: \
-		64 64 64 vfat \
-			$primary{ }  \
-			format{ } \
-			filesystem{ vfat } \
-			method{ efi } \
-			mountpoint{ /boot/efi } \
-		. \
-		800 50 -1 ext4 \
-			$primary{ } \
-			$bootable{ } \
-			method{ format } \
-			format{ } \
-			use_filesystem{ } \
-			filesystem{ ext4 } \
-			mountpoint{ / } \
-		.
-
-d-i partman-auto/choose_recipe select myroot
-d-i apt-setup/services-select multiselect security, updates, backports
-d-i apt-setup/local0/repository string http://repo.linaro.org/debian/erp-17.08-stable jessie main
-d-i apt-setup/local0/comment string Entreprise RP 17.08
-d-i apt-setup/local0/source boolean true
-d-i apt-setup/local0/key string http://repo.linaro.org/debian/linarorepo.key
-d-i pkgsel/upgrade select full-upgrade
-tasksel tasksel/first multiselect standard
-d-i pkgsel/include string openssh-server cloud-init/jessie-backports cloud-utils/jessie-backports cloud-initramfs-growroot linux-image-reference-arm64
-popularity-contest popularity-contest/participate boolean false
-d-i grub-installer/only_debian boolean true
-d-i grub-installer/with_other_os boolean true
-d-i grub-installer/bootdev  string default
-d-i finish-install/reboot_in_progress note
-d-i preseed/late_command string \
-    mkdir -p /target/boot/efi/EFI/BOOT ; \
-    cp /target/boot/efi/EFI/debian/grubaa64.efi /target/boot/efi/EFI/BOOT/BOOTAA64.EFI ; \
-    echo 'debian ALL = NOPASSWD: ALL' > /target/etc/sudoers.d/cloud ; \
-    chmod 440 /target/etc/sudoers.d/cloud
diff --git a/leg-devcloud-openstack-virtualenv-rpm.yaml b/leg-devcloud-openstack-virtualenv-rpm.yaml
deleted file mode 100644
index a7482d906d..0000000000
--- a/leg-devcloud-openstack-virtualenv-rpm.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    name: leg-devcloud-openstack-virtualenv-rpm
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'LEG DevCloud OpenStack VirtualEnv tarballs generator for CentOS'
-    scm:
-        - git:
-            url: https://git.linaro.org/leg/sdi/openstack-ref-architecture.git/
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: leg-devcloud-openstack-virtualenv/builders.sh
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org marcin.juszkiewicz@linaro.org'
diff --git a/leg-devcloud-openstack-virtualenv.yaml b/leg-devcloud-openstack-virtualenv.yaml
deleted file mode 100644
index 838e6c85e4..0000000000
--- a/leg-devcloud-openstack-virtualenv.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-- job:
-    name: leg-devcloud-openstack-virtualenv
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: true
-    node: docker-jessie-arm64
-    display-name: 'LEG DevCloud OpenStack VirtualEnv tarballs generator for Debian'
-    scm:
-        - git:
-            url: https://git.linaro.org/leg/sdi/openstack-ref-architecture.git/
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: leg-devcloud-openstack-virtualenv/builders.sh
-        - trigger-builds:
-            - project: 'leg-erp-venv-debian'
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org marcin.juszkiewicz@linaro.org'
diff --git a/leg-devcloud-openstack-virtualenv/builders.sh b/leg-devcloud-openstack-virtualenv/builders.sh
deleted file mode 100755
index 957a04ddc6..0000000000
--- a/leg-devcloud-openstack-virtualenv/builders.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-  cd ${WORKSPACE}
-  sudo rm -rf /srv/* /tmp/*.tgz
-  rm -rf out
-}
-
-# workaround to enforce release version to major until docker image is updated
-[ -f "/etc/yum/vars/releasever" ] && echo "7" | sudo tee /etc/yum/vars/releasever
-
-cd ${WORKSPACE}/openstack-venvs
-sudo ./build_all.sh
-
-mkdir out
-sudo mv /tmp/*.tgz out/
-sudo chown -R buildslave:buildslave out
-(cd out && sha256sum * > SHA256SUMS)
-
-# Publish
-DEST=96boards/reference-platform/components/developer-cloud/openstack/centos-virtualenv/${BUILD_NUMBER}
-if grep Debian /etc/issue 2>&1 >/dev/null ; then
-  DEST=96boards/reference-platform/components/developer-cloud/openstack/debian-virtualenv/${BUILD_NUMBER}
-fi
-
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-  --server ${PUBLISH_SERVER} \
-  --link-latest \
-  out ${DEST}
diff --git a/leg-erp-dpdk.yaml b/leg-erp-dpdk.yaml
deleted file mode 100644
index 21676b1119..0000000000
--- a/leg-erp-dpdk.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-- job:
-    name: leg-erp-dpdk
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 7
-            num-to-keep: 7
-    disabled: true
-    node: docker-jessie-arm64
-    display-name: 'LEG ERP DPDK Debian package'
-    scm:
-        - git:
-            url: https://git.linaro.org/leg/sdi/pkg/dpdk.git
-            refspec: +refs/heads/17.05.x:refs/remotes/origin/17.05.x
-            name: origin
-            branches:
-                - refs/heads/17.05.x
-            skip-tag: true
-            clean: true
-            disable-submodules: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            sudo apt-get update -q
-            sudo apt-get install -q -y --no-install-recommends pristine-tar dkms
-
-            TARBALL=dpdk_17.05.2.orig.tar.xz
-            pristine-tar checkout $TARBALL
-            mv $TARBALL ..
-
-            debuild --no-lintian -uc -us -sa -S
-
-            mv ../dpdk_17* $WORKSPACE
-
-            echo "source=$BUILD_URL/artifact/`find . -name *dsc`" >build-params
-            echo "repo=erp-17.08-staging" >>build-params
-            echo "appendversion=false" >>build-params
-
-
-    publishers:
-        - archive:
-            artifacts: '*.changes, *.dsc, *.gz, *.bz2, *.xz'
-            latest-only: true
-        - trigger-parameterized-builds:
-            - project: build-package
-              property-file: build-params
-              condition: SUCCESS
-        - email:
-            recipients: 'marcin.juszkiewicz@linaro.org'
diff --git a/leg-erp-venv-debian.yaml b/leg-erp-venv-debian.yaml
deleted file mode 100644
index a7ebf90137..0000000000
--- a/leg-erp-venv-debian.yaml
+++ /dev/null
@@ -1,87 +0,0 @@
-- job:
-    name: leg-erp-venv-debian
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 7
-            num-to-keep: 7
-    disabled: true
-    node: docker-jessie-arm64
-    display-name: 'LEG ERP Virtualenv Debian packages'
-    scm:
-        - git:
-            url: git://git.linaro.org/leg/sdi/openstack-ref-architecture.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            clean: true
-            disable-submodules: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            sudo apt-get update -q
-            sudo apt-get install -q -y --no-install-recommends quilt
-
-            cd openstack-venvs/packages/debian
-
-            ./_update-venvs.sh
-            ls -l
-            ./_changelog-bump
-
-            ./_build-all.sh source
-
-            mv *.changes *.dsc *.gz *.xz params-* $WORKSPACE
-    publishers:
-        - archive:
-            artifacts: '*.changes, *.dsc, *.gz, *.bz2, *.xz'
-            latest-only: true
-        - trigger-parameterized-builds:
-            - project: build-package
-              property-file: params-cinder
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-glance
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-heat
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-horizon
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-keystone
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-neutron
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-nova
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-openstack-cli
-              condition: SUCCESS
-            - project: build-package
-              property-file: params-swift
-              condition: SUCCESS
-        - email:
-            recipients: 'marcin.juszkiewicz@linaro.org'
diff --git a/leg-kolla-push-images/build.sh b/leg-kolla-push-images/build.sh
new file mode 100755
index 0000000000..4d8b4e15d2
--- /dev/null
+++ b/leg-kolla-push-images/build.sh
@@ -0,0 +1,69 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+docker_push_logs_dir="./docker_push_logs"
+docker_push_retries=3
+
+cleanup_exit()
+{
+    test -d ${docker_push_logs_dir} && cat ${docker_push_logs_dir}/*/**/std* jobs.log && rm -fr ${docker_push_logs_dir} jobs.log
+    rm -rf ${HOME}/.docker
+}
+
+mkdir -p ${HOME}/.docker
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+chmod 0600 ${HOME}/.docker/config.json
+
+rm -rf ${WORKSPACE}/*
+
+docker images | grep ${kolla_tag} | cut -d" " -f1|sort >list-of-images
+
+total=$(wc -l list-of-images | cut -d" " -f1)
+current=1
+errors=0
+pushed=0
+attempts=0
+retries='2 3 4'
+
+echo "Going to push ${total} of images with '${kolla_tag}' tag."
+
+for image in $(cat list-of-images)
+do
+	((attempts+=1))
+
+	echo "Pushing ${current}/${total} - ${image}:${kolla_tag}"
+	docker push ${image}:${kolla_tag}
+
+	if [ $? -eq 0 ]; then
+		(( pushed+=1 ))
+	else
+		(( errors+=1 ))
+
+		for retry in $retries
+		do
+			((attempts+=1))
+			sleep 5
+			echo "Pushing ${current}/${total} - ${image}:${kolla_tag} - attempt number ${retry}"
+			docker push ${image}:${kolla_tag}
+
+			if [ $? -eq 0 ]; then
+				(( pushed+=1 ))
+				break
+			fi
+
+			(( errors+=1 ))
+		done
+	fi
+
+	(( current+=1 ))
+done
+
+echo "Uploaded: ${pushed} out of ${total}"
+echo "Attempts: ${attempts}"
+echo "Errors: ${errors}"
+
+# And now we can call job to remove pushed images
+echo "kolla_tag=${kolla_tag}" >${WORKSPACE}/remove.parameters
diff --git a/leg-kolla-queens-ldc.yaml b/leg-kolla-queens-ldc.yaml
deleted file mode 100644
index cd2d33aa7d..0000000000
--- a/leg-kolla-queens-ldc.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: leg-kolla-queens-ldc
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: DEVCLOUD
-            default: '1'
-            description: 'build images for developer cloud'
-        - string:
-            name: BRANCH
-            default: 'stable/queens'
-            description: 'branch to use'
-    disabled: false
-    node: leg-aarch64
-    concurrent: false
-    display-name: 'LEG Kolla images build/publish (Queens images for Linaro Developer Cloud)'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - shell:
-            !include-raw: leg-kolla/build.sh
-        - linaro-publish-token
-        - shell:
-            !include-raw: leg-kolla/publishers.sh
-    publishers:
-        - email:
-            recipients: 'marcin.juszkiewicz@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org sdi-team@linaro.org'
diff --git a/leg-kolla-queens.yaml b/leg-kolla-queens.yaml
deleted file mode 100644
index 9aef516185..0000000000
--- a/leg-kolla-queens.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-- job:
-    name: leg-kolla-queens
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: BRANCH
-            default: 'stable/queens'
-            description: 'branch to use'
-    disabled: false
-    node: leg-aarch64
-    concurrent: false
-    display-name: 'LEG Kolla images build/publish (Queens images)'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
-    builders:
-        - shell:
-            !include-raw: leg-kolla/build.sh
-        - linaro-publish-token
-        - shell:
-            !include-raw: leg-kolla/publishers.sh
-    publishers:
-        - email:
-            recipients: 'marcin.juszkiewicz@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org sdi-team@linaro.org'
diff --git a/leg-kolla-remove-images.yaml b/leg-kolla-remove-images.yaml
new file mode 100644
index 0000000000..63a4ce7bc3
--- /dev/null
+++ b/leg-kolla-remove-images.yaml
@@ -0,0 +1,32 @@
+- job:
+    name: leg-kolla-remove-images
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - file:
+            name: remove.parameters
+            description: "tag of images to remove"
+    disabled: true
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'LEG Kolla images local removal'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: leg-kolla-remove-images/build.sh
+    publishers:
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org ldcg-team@linaro.org'
diff --git a/leg-kolla-remove-images/build.sh b/leg-kolla-remove-images/build.sh
new file mode 100644
index 0000000000..2eff752f78
--- /dev/null
+++ b/leg-kolla-remove-images/build.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -ex
+
+docker images --filter reference="linaro/debian-source*:${kolla_tag}" --quiet|xargs docker image rm
diff --git a/leg-kolla-rocky-ldc.yaml b/leg-kolla-rocky-ldc.yaml
new file mode 100644
index 0000000000..6a44be354a
--- /dev/null
+++ b/leg-kolla-rocky-ldc.yaml
@@ -0,0 +1,58 @@
+- job:
+    name: leg-kolla-rocky-ldc
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: DEVCLOUD
+            default: '1'
+            description: 'build images for developer cloud'
+        - string:
+            name: DEVCLOUD_EXTRA_PATCHES
+            default: '75b3aa7c6ade77e8497e5036664a1661b92d1464,5f783e40c91079bebc24e3ba4a164ba071a432d2'
+            description: "comma separated list of patch commit ids to apply to the ldc branch not merged into stable/rocky"
+        - string:
+            name: BRANCH
+            default: 'stable/rocky'
+            description: 'branch to use'
+        - string:
+            name: THREADS_OPT
+            default: '24'
+            description: 'number of threads (default: 24)'
+        - string:
+            name: RETRIES_OPT
+            default: '3'
+            description: 'number of retries (default: 3)'
+    disabled: true
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'LEG Kolla images build (Rocky images for Linaro Developer Cloud)'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: leg-kolla/build.sh
+        - linaro-publish-token
+        - shell:
+            !include-raw: leg-kolla/publishers.sh
+        - trigger-builds:
+            - project:
+                - 'leg-kolla-push-images'
+              property-file: "push.parameters"
+    publishers:
+        - archive:
+            artifacts: 'push.parameters'
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org ldcg-team@linaro.org'
diff --git a/leg-kolla-stein-ldc.yaml b/leg-kolla-stein-ldc.yaml
new file mode 100644
index 0000000000..552340a6a8
--- /dev/null
+++ b/leg-kolla-stein-ldc.yaml
@@ -0,0 +1,64 @@
+- job:
+    name: leg-kolla-stein-ldc
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: DEVCLOUD
+            default: '1'
+            description: 'build images for developer cloud'
+        - string:
+            name: DEVCLOUD_EXTRA_PATCHES
+            default: ''
+            description: "comma separated list of patch commit ids to apply to the ldc branch not merged into stable/stein"
+        - string:
+            name: BRANCH
+            default: 'stable/stein'
+            description: 'branch to use'
+        - string:
+            name: THREADS_OPT
+            default: '24'
+            description: 'number of threads (default: 24)'
+        - string:
+            name: RETRIES_OPT
+            default: '3'
+            description: 'number of retries (default: 3)'
+        - choice:
+            name: CEPH_VERSION
+            choices:
+              - luminous_buster_crc
+              - nautilus
+            description: 'Version of ceph to use: Luminous 12.2.11 (Buster + CRC fix) or Nautilus 14.2.x (Buster-backports)'
+    disabled: true
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'LEG Kolla images build (stein images for Linaro Developer Cloud)'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: leg-kolla/build.sh
+        - linaro-publish-token
+        - shell:
+            !include-raw: leg-kolla/publishers.sh
+        - trigger-builds:
+            - project:
+                - 'leg-kolla-push-images'
+              property-file: "push.parameters"
+    publishers:
+        - archive:
+            artifacts: 'push.parameters'
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org kevin.zhao@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org ldcg-team@linaro.org'
diff --git a/leg-kolla-train-ldc.yaml b/leg-kolla-train-ldc.yaml
new file mode 100644
index 0000000000..74bf1d7d33
--- /dev/null
+++ b/leg-kolla-train-ldc.yaml
@@ -0,0 +1,58 @@
+- job:
+    name: leg-kolla-train-ldc
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: DEVCLOUD
+            default: '1'
+            description: 'build images for developer cloud'
+        - string:
+            name: DEVCLOUD_EXTRA_PATCHES
+            default: ''
+            description: "comma separated list of patch commit ids to apply to the ldc branch not merged into stable/train"
+        - string:
+            name: BRANCH
+            default: 'stable/train'
+            description: 'branch to use'
+        - string:
+            name: THREADS_OPT
+            default: '24'
+            description: 'number of threads (default: 24)'
+        - string:
+            name: RETRIES_OPT
+            default: '3'
+            description: 'number of retries (default: 3)'
+    disabled: true
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'LEG Kolla images build (train images for Linaro Developer Cloud)'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: leg-kolla/build.sh
+        - linaro-publish-token
+        - shell:
+            !include-raw: leg-kolla/publishers.sh
+        - trigger-builds:
+            - project:
+                - 'leg-kolla-push-images'
+              property-file: "push.parameters"
+    publishers:
+        - archive:
+            artifacts: 'push.parameters'
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org kevin.zhao@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org ldcg-team@linaro.org'
diff --git a/leg-kolla-ussuri-ldc.yaml b/leg-kolla-ussuri-ldc.yaml
new file mode 100644
index 0000000000..f31f76dfcb
--- /dev/null
+++ b/leg-kolla-ussuri-ldc.yaml
@@ -0,0 +1,59 @@
+- job:
+    name: leg-kolla-ussuri-ldc
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: DEVCLOUD
+            default: '1'
+            description: 'build images for developer cloud'
+        - string:
+            name: DEVCLOUD_EXTRA_PATCHES
+            default: ''
+            description: "comma separated list of patch numeric ids to apply to the ldc branch not merged into stable/ussuri.
+                          E.g.: For change https://review.opendev.org/c/openstack/kolla/+/772615, the patch number id is 772615"
+        - string:
+            name: BRANCH
+            default: 'stable/ussuri'
+            description: 'branch to use'
+        - string:
+            name: THREADS_OPT
+            default: '24'
+            description: 'number of threads (default: 24)'
+        - string:
+            name: RETRIES_OPT
+            default: '3'
+            description: 'number of retries (default: 3)'
+    disabled: true
+    node: leg-aarch64
+    concurrent: false
+    display-name: 'LEG Kolla images build (ussuri images for Linaro Developer Cloud)'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: leg-kolla/build.sh
+        - linaro-publish-token
+        - shell:
+            !include-raw: leg-kolla/publishers.sh
+        - trigger-builds:
+            - project:
+                - 'leg-kolla-push-images'
+              property-file: "push.parameters"
+    publishers:
+        - archive:
+            artifacts: 'push.parameters'
+        - email:
+            recipients: 'marcin.juszkiewicz@linaro.org kevin.zhao@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org ldcg-team@linaro.org'
diff --git a/leg-kolla.yaml b/leg-kolla.yaml
index 03859a679b..e9658d543e 100644
--- a/leg-kolla.yaml
+++ b/leg-kolla.yaml
@@ -5,8 +5,8 @@
     properties:
         - authorization:
             anonymous:
-                - job-discover
-            linaro:
+                - job-read
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -19,26 +19,32 @@
             name: BRANCH
             default: 'master'
             description: 'branch to use'
-    disabled: false
+        - string:
+            name: THREADS_OPT
+            default: '24'
+            description: 'number of threads (default: 24)'
+        - string:
+            name: RETRIES_OPT
+            default: '3'
+            description: 'number of retries (default: 3)'
+    disabled: true
     node: leg-aarch64
     concurrent: false
-    display-name: 'LEG Kolla images build/publish'
+    display-name: 'LEG Kolla images build'
     wrappers:
         - timestamps
-        - copy-to-slave:
-            includes:
-                - config.json
-            relative-to: 'somewhereElse'
-        - credentials-binding:
-            - text:
-                credential-id: DOCKER_AUTH
-                variable: DOCKER_AUTH
     builders:
         - shell:
             !include-raw: leg-kolla/build.sh
         - linaro-publish-token
         - shell:
             !include-raw: leg-kolla/publishers.sh
+        - trigger-builds:
+            - project:
+                - 'leg-kolla-push-images'
+              property-file: "push.parameters"
     publishers:
+        - archive:
+            artifacts: 'push.parameters'
         - email:
             recipients: 'marcin.juszkiewicz@linaro.org riku.voipio@linaro.org fathi.boudra@linaro.org sdi-team@linaro.org'
diff --git a/leg-kolla/build.sh b/leg-kolla/build.sh
index f1c396a5b3..9a08dc9210 100644
--- a/leg-kolla/build.sh
+++ b/leg-kolla/build.sh
@@ -4,67 +4,127 @@
 
 kolla_branch=${BRANCH}
 kolla_ldc=${DEVCLOUD}
+kolla_ldc_extras=${DEVCLOUD_EXTRA_PATCHES}
 kolla_options=
+kolla_python=/usr/bin/python3
+ceph_version=${CEPH_VERSION}
 
-if [ -z "${kolla_branch}" ]; then
-    kolla_branch=master
-    kolla_tag=rocky-$(date +"%Y%m%d") # use YYYYMMDD for tags
+if [ -z "${kolla_branch}" -o "${kolla_branch}" == "master" ]; then
+    branch="victoria"
+elif [[ ${kolla_branch} = "stable"* ]]; then
+    branch=$(echo ${kolla_branch} | sed -e 's+stable/++g')
 else
-    if [ -z "${kolla_ldc}" ]; then
-        kolla_tag=queens-$(date +"%Y%m%d") # use YYYYMMDD for tags
+    echo "Choose something"
+    exit 1
+fi
+
+if [ ! -z "${kolla_ldc}" ]; then
+
+    patches_count=0
+    if [ ! -z ${kolla_ldc_extras} ]; then
+        patches_count=$(echo ${kolla_ldc_extras} | tr ',' ' ' | wc -w)
+    fi
+
+    if [ "${patches_count}" -eq "0" ]; then
+        kolla_tag=ldc-${branch}-${BUILD_NUMBER}
     else
-        kolla_tag=ldc-queens-$(date +"%Y%m%d") # use YYYYMMDD for tags
-        kolla_options="--template-override ./Linaro-overlay/linaro-override.j2 --docker-dir ./Linaro-overlay/docker/"
+        kolla_tag=ldc-${branch}-${BUILD_NUMBER}-p${patches_count}
     fi
+
+else
+    kolla_tag=${branch}-${BUILD_NUMBER}
 fi
 
 set -ex
 
-trap cleanup_exit INT TERM EXIT
+trap failure_exit INT TERM ERR
+trap cleanup_exit EXIT
 
 cleanup_exit()
 {
     rm -rf ${HOME}/.docker
 }
 
-mkdir -p ${HOME}/.docker
-sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
-chmod 0600 ${HOME}/.docker/config.json
+failure_exit()
+{
+    # we failed - remove images
+    docker images --filter reference="linaro/debian-source*:${kolla_tag}" --quiet|xargs docker image rm
+    cleanup_exit
+}
 
 rm -rf ${WORKSPACE}/*
 
-git clone --depth 1 --branch ${kolla_branch} https://git.openstack.org/openstack/kolla
+wget -q http://git.linaro.org/ci/job/configs.git/plain/leg-kolla/linaro.conf -O ${WORKSPACE}/linaro.conf
+
+git clone --depth 1 --branch ${kolla_branch} https://opendev.org/openstack/kolla.git
 
 if [ -n ${kolla_ldc} ]; then
     git clone --depth 1 https://git.linaro.org/leg/sdi/kolla/ldc-overlay.git Linaro-overlay
+
+    override_file="${WORKSPACE}/Linaro-overlay/linaro-override.j2"
+
+    if [ -e "${WORKSPACE}/Linaro-overlay/linaro-override-${branch}.j2" ]; then
+	override_file="${WORKSPACE}/Linaro-overlay/linaro-override-${branch}.j2"
+    fi
+
+    kolla_options="--template-override ${override_file} --profile devcloud "
+
+    # applied unmerged patches for ussuri
+    if [[ $branch = "ussuri" ]]; then
+        cat <<EOF >> ${WORKSPACE}/linaro.conf
+
+[cinder-base]
+type = git
+location = https://github.com/xin3liang/cinder.git
+reference = ${kolla_branch}-ldc
+
+[ironic-base]
+type = git
+location = https://github.com/xin3liang/ironic.git
+reference = ${kolla_branch}-ldc
+
+[nova-base]
+type = git
+location = https://github.com/xin3liang/nova.git
+reference = ${kolla_branch}-ldc
+EOF
+    fi
+fi
+
+# Apply extra patches to the kolla source code that haven't
+# been merged into the branch.
+if [[ ! -z ${kolla_ldc} && ! -z ${kolla_ldc_extras} ]]; then
+    echo ${kolla_ldc_extras} | sed -n 1'p' | tr ',' '\n' | while read patch; do
+        curl "https://review.opendev.org/changes/openstack%2Fkolla~${patch}/revisions/current/patch" | base64 -d | git apply -v --directory=kolla/
+    done
 fi
 
-virtualenv --python=/usr/bin/python2 venv-for-kolla
+virtualenv --python=${kolla_python} venv-for-kolla
 . venv-for-kolla/bin/activate
 
 cd kolla
 
 pip install -r requirements.txt
 
-mkdir -p logs/debian-source
+mkdir -p ${WORKSPACE}/kolla/logs/debian-source
 
 kolla_namespace=linaro
 ./tools/build.py --base debian \
                  --format none \
                  ${kolla_options} \
                  --logs-dir logs/debian-source \
+                 --config-file ${WORKSPACE}/linaro.conf \
                  --pull \
-                 --push \
-                 --retries 0 \
+                 --retries ${RETRIES_OPT} \
+                 --threads ${THREADS_OPT} \
                  --tag ${kolla_tag} \
                  --type source \
-                 --namespace ${kolla_namespace} || true
+                 --namespace ${kolla_namespace}
+
+docker images | grep ${kolla_tag} | cut -d" " -f1 | sort >list-of-images
+
+cat list-of-images
 
-docker images | grep ${kolla_tag} | sort
+wc -l list-of-images
 
-# remove all images as they are pushed to hub.docker.com and won't be used
-# do in a loop as we remove in random order and some have children images
-for run in 1 2 3 4 5
-do
-    docker images | grep ${kolla_tag} | awk '{print $3}' | xargs docker rmi -f 2>&1 >/dev/null || true
-done
+echo "kolla_tag=${kolla_tag}" >${WORKSPACE}/push.parameters
diff --git a/leg-kolla/linaro.conf b/leg-kolla/linaro.conf
new file mode 100644
index 0000000000..5fdc69893f
--- /dev/null
+++ b/leg-kolla/linaro.conf
@@ -0,0 +1,40 @@
+[profiles]
+devcloud = cadvisor,
+	barbican-keystone-listener, barbican-worker, barbican-api,
+	ceph-mds, ceph-mgr, ceph-mon, ceph-osd, ceph-rgw,
+	chrony,
+	cinder-api, cinder-backup, cinder-scheduler, cinder-volume,
+	cron,
+	dnsmasq,
+	ec2-api,
+	elasticsearch,
+	glance-api, glance-registry,
+	^grafana,
+	haproxy,
+	heat-all, heat-api, heat-api-cfn, heat-engine,
+	horizon,
+	ironic-api, ironic-conductor, ironic-inspector, ironic-neutron-agent, ironic-pxe,
+	iscsid,
+	keepalived,
+	keystone, keystone-fernet, keystone-ssh,
+	kibana,
+	kolla-toolbox,
+	magnum-api,
+	magnum-conductor,
+	mariadb,
+	memcached,
+	multipathd,
+	neutron-dhcp-agent, neutron-l3-agent, neutron-linuxbridge-agent, neutron-metadata-agent, neutron-metering-agent, neutron-openvswitch-agent, neutron-server,
+	nova-api, nova-compute, nova-compute-ironic, nova-conductor, nova-consoleauth, nova-libvirt, nova-novncproxy, nova-placement-api, nova-scheduler, nova-serialproxy, nova-spicehtml5proxy, nova-ssh,
+	octavia-api, octavia-health-manager, octavia-housekeeping, octavia-worker,
+	openvswitch-db-server, openvswitch-vswitchd,
+	placement-api,
+	prometheus-alertmanager, prometheus-blackbox-exporter, prometheus-cadvisor, prometheus-elasticsearch-exporter, prometheus-haproxy-exporter, prometheus-memcached-exporter, prometheus-mysqld-exporter, prometheus-node-exporter, prometheus-openstack-exporter, prometheus-server,
+	ptp,
+	rabbitmq,
+	rally,
+	rsyslog,
+	swift-account, swift-container, swift-object, swift-object-expirer, swift-proxy-server, swift-rsyncd,
+	tempest,
+	tgtd,
+	vmtp
diff --git a/leg-kolla/publishers.sh b/leg-kolla/publishers.sh
index 283327ed0f..9a10af2e51 100755
--- a/leg-kolla/publishers.sh
+++ b/leg-kolla/publishers.sh
@@ -1,11 +1,17 @@
 #!/bin/bash
 
+set -ex
+
 # Publish logs
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
+  --server ${PUBLISH_SERVER} \
   --link-latest \
-  logs/debian-source reference-platform/enterprise/components/openstack/kolla-logs/${BUILD_NUMBER}
+  ${WORKSPACE}/kolla/logs/debian-source \
+  reference-platform/enterprise/components/openstack/kolla-logs/${JOB_NAME}/${BUILD_NUMBER}
+
+set +x
 
 echo "Images: https://hub.docker.com/u/linaro/"
-echo "Logs:   https://snapshots.linaro.org/reference-platform/enterprise/components/openstack/kolla-logs/${BUILD_NUMBER}/"
+echo "Logs:   https://snapshots.linaro.org/reference-platform/enterprise/components/openstack/kolla-logs/${JOB_NAME}/${BUILD_NUMBER}/"
diff --git a/leg-openstack-rally.yaml b/leg-openstack-rally.yaml
deleted file mode 100644
index 4ea2df930d..0000000000
--- a/leg-openstack-rally.yaml
+++ /dev/null
@@ -1,111 +0,0 @@
-- job:
-    name: leg-openstack-rally
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/openstack/rally-ci/'
-        - string:
-            name: LAVA_SERVER
-            default: 'openstack.validation.linaro.org/RPC2/'
-        - string:
-            name: LAVA_JOB_DEFINITION
-            default: 'configs/leg-openstack-rally/lava-job-definitions/${DEVICE_TYPE}/template-rally.yaml'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'LEG - Openstack Rally'
-    axes:
-        - axis:
-            type: user-defined
-            name: DEVICE_TYPE
-            values:
-              - mustang
-        - axis:
-            type: user-defined
-            name: OS_DISTRO
-            values:
-              - ubuntu
-        - axis:
-            type: user-defined
-            name: OS_VERSION
-            values:
-              - trusty
-        - axis:
-            type: user-defined
-            name: DEVSTACK_BRANCH
-            values:
-              - master
-    execution-strategy:
-        sequential: true
-    triggers:
-        - timed: '@daily'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # IMPORTANT: specify the exact target device (required by the LAVA job
-            # template) to use for the specified device type
-            case "${DEVICE_TYPE}" in
-              mustang)
-                export DEVICE_TARGET=osmustang02
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # FIXME: regression introduced with commit 00a22059
-            wget https://git.linaro.org/ci/lci-build-tools.git/blob_plain/3d23206c4afe0213d8f05b669a8213e7b26903cc:/yaml-to-json.py -O lci-build-tools/yaml-to-json.py
-
-            # Update the template based on the specified os distro
-            case "${OS_DISTRO}" in
-              ubuntu)
-                # The template needs to be updated to specify the correct cloud image to
-                # pull. This must be done BEFORE calling yaml-to-json.py!
-                LAVA_CLOUD_IMG_URL="http://cloud-images.ubuntu.com/${OS_VERSION}/current/${OS_VERSION}-server-cloudimg-arm64-disk1.img"
-                sed -i "s|\${LAVA_CLOUD_IMG_URL}|${LAVA_CLOUD_IMG_URL}|" ${LAVA_JOB_DEFINITION}
-                ;;
-            esac
-
-            # Update the metadata fields in the template
-            sed -e "s|\${DEVSTACK_BRANCH}|${DEVSTACK_BRANCH}|" \
-                -e "s|\${OS_DISTRO}|${OS_DISTRO}|" \
-                -e "s|\${OS_VERSION}|${OS_VERSION}|" \
-                < ${LAVA_JOB_DEFINITION} \
-                > ${LAVA_JOB_DEFINITION}.new
-
-            ./lci-build-tools/yaml-to-json.py ${LAVA_JOB_DEFINITION}.new > custom_lava_job_definition.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/leg-openstack-rally/lava-job-definitions/mustang/template-deploy-cloud-image.yaml b/leg-openstack-rally/lava-job-definitions/mustang/template-deploy-cloud-image.yaml
deleted file mode 100644
index eb48a49fae..0000000000
--- a/leg-openstack-rally/lava-job-definitions/mustang/template-deploy-cloud-image.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/mustang.dtb'
-    kernel: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/uImage'
-    ramdisk: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/uInitrd-nfs'
-    nfsrootfs: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/ubuntu-arm64-chroot.tar.bz2'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'ubuntu'
-    login_commands: ['sudo su -l']
-  metadata:
-    build id: '${BUILD_NUMBER}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv autoload no'
-      - 'setenv kernel_addr_r ''{KERNEL_ADDR}'''
-      - 'setenv initrd_addr_r ''{RAMDISK_ADDR}'''
-      - 'setenv fdt_addr_r ''{DTB_ADDR}'''
-      - 'setenv loadstuff ''tftp ${kernel_addr_r} {KERNEL}; tftp ${initrd_addr_r} {RAMDISK}; tftp ${fdt_addr_r} {DTB}'''
-      - 'setenv bootargs console=ttyS0,115200 panic=1 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'
-      - 'setenv bootcmd ''dhcp; setenv serverip {SERVER_IP}; run loadstuff; {BOOTX}'''
-      - 'boot'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-deploy-cloudimg.git'
-        parameters:
-          LAVA_CLOUD_IMG_URL: 'http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64-disk1.img'
-          EXTRA_PREP_SCRIPT_URL: ''
-    timeout: 1800
-- command: deploy_linaro_kernel
-  parameters:
-    # The dtb and kernel are actually ignored.
-    dtb: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/mustang.dtb_1.11'
-    kernel: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/uImage_1.11'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'password'
-    login_commands: ['sudo -s']
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv script_addr_r 0x4004000000'
-      - 'setenv sata 0x0C'
-      - 'scsi init'
-      - 'ext4load scsi 0 ${script_addr_r} boot/boot.scr'
-      - 'source ${script_addr_r}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-deploy-cloudimg.git'
-        testdef: 'hacking-session.yaml'
-        parameters:
-          LAVA_SLEEP_DURATION: 28800
-    timeout: 7200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-target: '${DEVICE_TARGET}'
-job_name: '${BUILD_URL}'
-timeout: 28800
diff --git a/leg-openstack-rally/lava-job-definitions/mustang/template-rally.yaml b/leg-openstack-rally/lava-job-definitions/mustang/template-rally.yaml
deleted file mode 100644
index 539886358f..0000000000
--- a/leg-openstack-rally/lava-job-definitions/mustang/template-rally.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: 'http://people.linaro.org/leg-openstack/mustang-deploy/mustang.dtb'
-    kernel: 'http://people.linaro.org/leg-openstack/mustang-deploy/uImage'
-    ramdisk: 'http://people.linaro.org/leg-openstack/mustang-deploy/uInitrd-nfs'
-    nfsrootfs: 'http://people.linaro.org/leg-openstack/mustang-deploy/ubuntu-arm64-chroot.tar.bz2'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'ubuntu'
-    login_commands: ['sudo su -l']
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    devstack-branch: '${DEVSTACK_BRANCH}'
-    os-distro: '${OS_DISTRO}'
-    os-version: '${OS_VERSION}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv autoload no'
-      - 'setenv kernel_addr_r ''{KERNEL_ADDR}'''
-      - 'setenv initrd_addr_r ''{RAMDISK_ADDR}'''
-      - 'setenv fdt_addr_r ''{DTB_ADDR}'''
-      - 'setenv loadstuff ''tftp ${kernel_addr_r} {KERNEL}; tftp ${initrd_addr_r} {RAMDISK}; tftp ${fdt_addr_r} {DTB}'''
-      - 'setenv bootargs console=ttyS0,115200 panic root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'
-      - 'setenv bootcmd ''dhcp; setenv serverip {SERVER_IP}; run loadstuff; {BOOTX}'''
-      - 'boot'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-deploy-cloudimg.git'
-        parameters:
-          LAVA_CLOUD_IMG_URL: '${LAVA_CLOUD_IMG_URL}'
-    timeout: 900
-- command: deploy_linaro_kernel
-  parameters:
-    # The dtb and kernel are actually ignored.
-    dtb: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/mustang.dtb_1.11'
-    kernel: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/uImage_1.11'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'password'
-    login_commands: ['sudo -s']
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv script_addr_r 0x4004000000'
-      - 'setenv sata 0x0C'
-      - 'scsi init'
-      - 'ext4load scsi 0 ${script_addr_r} boot/boot.scr'
-      - 'source ${script_addr_r}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'devstack/openstack-devstack.yaml'
-        parameters:
-          LAVA_SLEEP_FOR_ACCESS: 'no'
-          LAVA_SLEEP_DURATION: 36000
-          LAVA_ADD_RALLY: 'yes'
-          LAVA_DEVSTACK_BRANCH: '${DEVSTACK_BRANCH}'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'qemu/build-qemu-system-aarch64.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'rally/testdefs/prep.yaml'
-        parameters:
-          PARAMETER_FILENAME: 'rally/parameters/iter10.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'rally/testdefs/keystone.yaml'
-        parameters:
-          PARAMETER_FILENAME: 'rally/parameters/iter10.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'rally/testdefs/swift.yaml'
-        parameters:
-          PARAMETER_FILENAME: 'rally/parameters/iter10.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'rally/testdefs/glance.yaml'
-        parameters:
-          PARAMETER_FILENAME: 'rally/parameters/iter10.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'rally/testdefs/nova.yaml'
-        parameters:
-          PARAMETER_FILENAME: 'rally/parameters/iter10.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'rally/testdefs/report.yaml'
-        parameters:
-          PARAMETER_FILENAME: 'rally/parameters/iter10.yaml'
-    timeout: 18000
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-target: '${DEVICE_TARGET}'
-job_name: '${BUILD_URL}'
-timeout: 28800
diff --git a/leg-openstack-tempest-testing.yaml b/leg-openstack-tempest-testing.yaml
deleted file mode 100644
index b81e801334..0000000000
--- a/leg-openstack-tempest-testing.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-- job:
-    name: leg-openstack-tempest-testing
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/anonymous/tempest-testing/'
-        - string:
-            name: LAVA_SERVER
-            default: 'openstack.validation.linaro.org/RPC2/'
-        - string:
-            name: LAVA_JOB_DEFINITION
-            default: 'configs/leg-openstack-tempest/lava-job-definitions/${DEVICE_TYPE}/template-tempest.yaml'
-        - string:
-            name: DEVICE_TYPE
-            default: mustang
-        - string:
-            name: OS_DISTRO
-            default: ubuntu
-        - string:
-            name: OS_VERSION
-            default: trusty
-        - string:
-            name: DEVSTACK_BRANCH
-            default: master
-        - string:
-            name: MUSTANG_DEVICE
-            default: osmustang02
-    disabled: false
-    node: build
-    display-name: 'LEG - Openstack Tempest (Manual Test Builds)'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # IMPORTANT: specify the exact target device (required by the LAVA job
-            # template) to use for the specified device type
-            case "${DEVICE_TYPE}" in
-              mustang)
-                export DEVICE_TARGET=${MUSTANG_DEVICE}
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # FIXME: regression introduced with commit 00a22059
-            wget https://git.linaro.org/ci/lci-build-tools.git/blob_plain/3d23206c4afe0213d8f05b669a8213e7b26903cc:/yaml-to-json.py -O lci-build-tools/yaml-to-json.py
-
-            # Update the template based on the specified os distro
-            case "${OS_DISTRO}" in
-              ubuntu)
-                # The template needs to be updated to specify the correct cloud image to
-                # pull. This must be done BEFORE calling yaml-to-json.py!
-                LAVA_CLOUD_IMG_URL="http://cloud-images.ubuntu.com/${OS_VERSION}/current/${OS_VERSION}-server-cloudimg-arm64-disk1.img"
-                sed -i "s|\${LAVA_CLOUD_IMG_URL}|${LAVA_CLOUD_IMG_URL}|" ${LAVA_JOB_DEFINITION}
-                ;;
-            esac
-
-            # Update the metadata fields in the template
-            sed -e "s|\${DEVSTACK_BRANCH}|${DEVSTACK_BRANCH}|" \
-                -e "s|\${OS_DISTRO}|${OS_DISTRO}|" \
-                -e "s|\${OS_VERSION}|${OS_VERSION}|" \
-                < ${LAVA_JOB_DEFINITION} \
-                > ${LAVA_JOB_DEFINITION}.new
-
-            ./lci-build-tools/yaml-to-json.py ${LAVA_JOB_DEFINITION}.new > custom_lava_job_definition.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/leg-openstack-tempest.yaml b/leg-openstack-tempest.yaml
deleted file mode 100644
index f052664e52..0000000000
--- a/leg-openstack-tempest.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: leg-openstack-tempest
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/openstack/tempest-ci/'
-        - string:
-            name: LAVA_SERVER
-            default: 'openstack.validation.linaro.org/RPC2/'
-        - string:
-            name: LAVA_JOB_DEFINITION
-            default: 'configs/leg-openstack-tempest/lava-job-definitions/${DEVICE_TYPE}/template-tempest.yaml'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'LEG - Openstack Tempest'
-    axes:
-        - axis:
-            type: user-defined
-            name: DEVICE_TYPE
-            values:
-              - mustang
-        - axis:
-            type: user-defined
-            name: OS_DISTRO
-            values:
-              - ubuntu
-        - axis:
-            type: user-defined
-            name: OS_VERSION
-            values:
-              - wily
-              - trusty
-              - vivid
-        - axis:
-            type: user-defined
-            name: DEVSTACK_BRANCH
-            values:
-              - master
-              - stable/liberty
-    execution-strategy:
-        combination-filter: |
-          !((OS_VERSION=="vivid" || OS_VERSION=="wily") && DEVSTACK_BRANCH=="stable/kilo")
-        sequential: true
-    triggers:
-        - timed: '0 22 * * *'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # FIXME: regression introduced with commit 00a22059
-            wget https://git.linaro.org/ci/lci-build-tools.git/blob_plain/3d23206c4afe0213d8f05b669a8213e7b26903cc:/yaml-to-json.py -O lci-build-tools/yaml-to-json.py
-
-            # Update the template based on the specified os distro
-            case "${OS_DISTRO}" in
-              ubuntu)
-                case "${OS_VERSION}" in
-                  trusty)
-                    echo "using older image"
-                    LAVA_CLOUD_IMG_URL="http://cloud-images.ubuntu.com/releases/trusty/release-20150305/ubuntu-14.04-server-cloudimg-arm64-disk1.img"
-                    ;;
-                  vivid)
-                    echo "using older image"
-                    LAVA_CLOUD_IMG_URL="http://cloud-images.ubuntu.com/releases/vivid/release-20150707/ubuntu-15.04-server-cloudimg-arm64-disk1.img"
-                    ;;
-                  *)
-                    LAVA_CLOUD_IMG_URL="http://cloud-images.ubuntu.com/${OS_VERSION}/current/${OS_VERSION}-server-cloudimg-arm64-disk1.img"
-                    ;;
-                esac
-                echo "cloud image for ${OS_VERSION}: ${LAVA_CLOUD_IMG_URL}"
-                # The template needs to be updated to specify the correct cloud image to
-                # pull. This must be done BEFORE calling yaml-to-json.py!
-                sed -i "s|\${LAVA_CLOUD_IMG_URL}|${LAVA_CLOUD_IMG_URL}|" ${LAVA_JOB_DEFINITION}
-                ;;
-            esac
-
-            # Update the metadata fields in the template
-            sed -e "s|\${DEVSTACK_BRANCH}|${DEVSTACK_BRANCH}|" \
-                -e "s|\${OS_DISTRO}|${OS_DISTRO}|" \
-                -e "s|\${OS_VERSION}|${OS_VERSION}|" \
-                < ${LAVA_JOB_DEFINITION} \
-                > ${LAVA_JOB_DEFINITION}.new
-
-            ./lci-build-tools/yaml-to-json.py ${LAVA_JOB_DEFINITION}.new > custom_lava_job_definition.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/leg-openstack-tempest/lava-job-definitions/mustang/template-deploy-cloud-image.yaml b/leg-openstack-tempest/lava-job-definitions/mustang/template-deploy-cloud-image.yaml
deleted file mode 100644
index 6ea0fdfffd..0000000000
--- a/leg-openstack-tempest/lava-job-definitions/mustang/template-deploy-cloud-image.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: 'http://people.linaro.org/leg-openstack/mustang-deploy/mustang.dtb'
-    kernel: 'http://people.linaro.org/leg-openstack/mustang-deploy/uImage'
-    ramdisk: 'http://people.linaro.org/leg-openstack/mustang-deploy/uInitrd-nfs'
-    nfsrootfs: 'http://people.linaro.org/leg-openstack/mustang-deploy/ubuntu-arm64-chroot.tar.bz2'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'ubuntu'
-    login_commands: ['sudo su -l']
-  metadata:
-    build id: '${BUILD_NUMBER}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv autoload no'
-      - 'setenv kernel_addr_r ''{KERNEL_ADDR}'''
-      - 'setenv initrd_addr_r ''{RAMDISK_ADDR}'''
-      - 'setenv fdt_addr_r ''{DTB_ADDR}'''
-      - 'setenv loadstuff ''tftp ${kernel_addr_r} {KERNEL}; tftp ${initrd_addr_r} {RAMDISK}; tftp ${fdt_addr_r} {DTB}'''
-      - 'setenv bootargs console=ttyS0,115200 panic=1 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'
-      - 'setenv bootcmd ''dhcp; setenv serverip {SERVER_IP}; run loadstuff; {BOOTX}'''
-      - 'boot'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-deploy-cloudimg.git'
-        parameters:
-          LAVA_CLOUD_IMG_URL: 'http://cloud-images.ubuntu.com/trusty/current/trusty-server-cloudimg-arm64-disk1.img'
-          EXTRA_PREP_SCRIPT_URL: ''
-    timeout: 1800
-- command: deploy_linaro_kernel
-  parameters:
-    # The dtb and kernel are actually ignored.
-    dtb: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/mustang.dtb_1.11'
-    kernel: 'http://people.linaro.org/~andrew.mcdermott/mustang-deploy/uImage_1.11'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'password'
-    login_commands: ['sudo -s']
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv script_addr_r 0x4004000000'
-      - 'setenv sata 0x0C'
-      - 'scsi init'
-      - 'ext4load scsi 0 ${script_addr_r} boot/boot.scr'
-      - 'source ${script_addr_r}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-deploy-cloudimg.git'
-        testdef: 'hacking-session.yaml'
-        parameters:
-          LAVA_SLEEP_DURATION: 28800
-    timeout: 7200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-target: '${DEVICE_TARGET}'
-job_name: '${BUILD_URL}'
-timeout: 28800
diff --git a/leg-openstack-tempest/lava-job-definitions/mustang/template-tempest.yaml b/leg-openstack-tempest/lava-job-definitions/mustang/template-tempest.yaml
deleted file mode 100644
index 2316d8cc6a..0000000000
--- a/leg-openstack-tempest/lava-job-definitions/mustang/template-tempest.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: 'http://people.linaro.org/leg-openstack/mustang-deploy/mustang.dtb'
-    kernel: 'http://people.linaro.org/leg-openstack/mustang-deploy/uImage'
-    ramdisk: 'http://people.linaro.org/leg-openstack/mustang-deploy/uInitrd-nfs'
-    nfsrootfs: 'http://people.linaro.org/leg-openstack/mustang-deploy/ubuntu-arm64-chroot.tar.bz2'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'ubuntu'
-    login_commands: ['sudo su -l']
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    devstack-branch: '${DEVSTACK_BRANCH}'
-    os-distro: '${OS_DISTRO}'
-    os-version: '${OS_VERSION}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv autoload no'
-      - 'setenv kernel_addr_r ''{KERNEL_ADDR}'''
-      - 'setenv initrd_addr_r ''{RAMDISK_ADDR}'''
-      - 'setenv fdt_addr_r ''{DTB_ADDR}'''
-      - 'setenv loadstuff ''tftp ${kernel_addr_r} {KERNEL}; tftp ${initrd_addr_r} {RAMDISK}; tftp ${fdt_addr_r} {DTB}'''
-      - 'setenv bootargs console=ttyS0,115200 panic root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS} ip=dhcp'
-      - 'setenv bootcmd ''dhcp; setenv serverip {SERVER_IP}; run loadstuff; {BOOTX}'''
-      - 'boot'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-deploy-cloudimg.git'
-        parameters:
-          LAVA_CLOUD_IMG_URL: '${LAVA_CLOUD_IMG_URL}'
-    timeout: 900
-- command: deploy_linaro_kernel
-  parameters:
-    # The dtb and kernel are actually ignored.
-    dtb: 'http://people.linaro.org/leg-openstack/mustang-deploy/mustang.dtb_1.11'
-    kernel: 'http://people.linaro.org/leg-openstack/mustang-deploy/uImage_1.11'
-    target_type: 'ubuntu'
-    login_prompt: 'login:'
-    username: 'ubuntu'
-    password_prompt: 'Password'
-    password: 'password'
-    login_commands: ['sudo -s']
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-      - 'setenv script_addr_r 0x4004000000'
-      - 'setenv sata 0x0C'
-      - 'scsi init'
-      - 'ext4load scsi 0 ${script_addr_r} boot/boot.scr'
-      - 'source ${script_addr_r}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'devstack/openstack-devstack.yaml'
-        parameters:
-          LAVA_SLEEP_FOR_ACCESS: 'no'
-          LAVA_SLEEP_DURATION: 36000
-          LAVA_ADD_RALLY: 'no'
-          LAVA_DEVSTACK_BRANCH: '${DEVSTACK_BRANCH}'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'qemu/build-qemu-system-aarch64.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'libvirt/build-libvirt.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'tempest/tempest-run.yaml'
-        parameters:
-          LAVA_RUN_TEMPEST: 'yes'
-          LAVA_TESTS_TO_RUN: ''
-          LAVA_TEMPEST_CONCURRENCY: 1
-          OS_TEST_TIMEOUT: 300
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'tempest/tempest-metrics.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'tempest/tempest-results.yaml'
-      - git-repo: 'http://git.linaro.org/leg/openstack/lava-openstack.git'
-        testdef: 'tempest/tempest-summary.yaml'
-    timeout: 36000
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 36000
diff --git a/leg-sdi-remove-tags/build.sh b/leg-sdi-remove-tags/build.sh
new file mode 100644
index 0000000000..f370d089d2
--- /dev/null
+++ b/leg-sdi-remove-tags/build.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+# build dependencies on Debian:
+# git python3
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -rf ${HOME}/.docker
+}
+
+mkdir -p ${HOME}/.docker
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < ${WORKSPACE}/config.json > ${HOME}/.docker/config.json
+chmod 0600 ${HOME}/.docker/config.json
+
+rm -rf ${WORKSPACE}/*
+
+git clone --depth 1 https://github.com/Linaro/docker-utils.git
+
+python3 docker-utils/delimage.py linaro debian-source ${TAGNAME}
diff --git a/leg-tiancore-edk2-build-test.yaml b/leg-tiancore-edk2-build-test.yaml
deleted file mode 100644
index f8ec014329..0000000000
--- a/leg-tiancore-edk2-build-test.yaml
+++ /dev/null
@@ -1,132 +0,0 @@
-- job:
-    name: leg-tianocore-edk2-build-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: GIT_REPO
-            default: 'https://git.linaro.org/people/ard.biesheuvel/uefi-next.git'
-        - string:
-            name: GIT_BRANCH
-            default: 'unify-gcc-v2'
-    disabled: true
-    node: docker-xenial-amd64
-    display-name: 'Linaro EDK II - multiarch build test'
-    scm:
-        - git:
-            url: ${GIT_REPO}
-            refspec: +refs/heads/${GIT_BRANCH}:refs/remotes/origin/${GIT_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${GIT_BRANCH}
-            basedir: edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out edk2/Build
-            }
-
-            # use the GCC 4.[89] toolchains that are already available on the build host
-            export GCC48_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.04/bin/aarch64-linux-gnu-
-            export GCC48_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.04/bin/arm-linux-gnueabihf-
-
-            export GCC49_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.09/bin/aarch64-linux-gnu-
-            export GCC49_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.09/bin/arm-linux-gnueabihf-
-
-            # reuse the binutils that ship with GCC 4.9 for the CLANG35 builds
-            export CLANG35_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.09/bin/aarch64-linux-gnu-
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends clang gcc-4.4 gcc-4.6 gcc-4.7 gcc-4.8 gcc-4.9 gcc-mingw-w64 nasm
-
-            # set up the paths for the various GCC versions
-            for i in 4 6 7 8 9
-            do
-                export GCC4${i}_BIN=${WORKSPACE}/GCC4${i}/
-
-                mkdir ${WORKSPACE}/GCC4${i}
-                for t in objcopy ld ar make
-                do
-                    ln -s /usr/bin/$t ${WORKSPACE}/GCC4${i}/
-                done
-                ln -s /usr/bin/gcc-4.${i} ${WORKSPACE}/GCC4${i}/gcc
-            done
-                    
-            export OUTDIR=${WORKSPACE}/out
-
-            (
-                unset WORKSPACE
-
-                NUM_THREADS=$((`getconf _NPROCESSORS_ONLN` + 1))
-
-                # Initialise the build environment
-                cd edk2
-                git clean -dxf BaseTools/
-                make -C BaseTools
-
-                source edksetup.sh
-
-                # override the mingw prefixes
-                sed 's/^\(DEFINE.\+UNIXGCC_IA32_PETOOLS_PREFIX.\+=\).\+/\1 i686-w64-mingw32-/' -i Conf/tools_def.txt
-                sed 's/^\(DEFINE.\+UNIXGCC_X64_PETOOLS_PREFIX.\+=\).\+/\1 x86_64-w64-mingw32-/' -i Conf/tools_def.txt
-
-                # download and unpack the OpenSSL tarball
-                cd ${WORKSPACE}/CryptoPkg/Library/OpensslLib
-
-                # capture OpenSSL version number from the HOWTO
-                VERSION=$(grep 'Current supported OpenSSL version' Patch-HOWTO.txt |sed 's/^[^0-9]\+\([0-9]\(\.[0-9]\)\+[a-z]*\).*\r\?$/\1/')
-
-                wget -O - -q "http://www.openssl.org/source/openssl-${VERSION}.tar.gz" | tar xzf -
-                ( cd openssl-${VERSION}; patch -p0 -i ../EDKII_openssl-${VERSION}.patch )
-                ./Install.sh
-
-                cd ${WORKSPACE}
-                
-                build -n $NUM_THREADS -b DEBUG -b RELEASE -a AARCH64 -t GCC48 -t GCC49 -t CLANG35 -p ArmVirtPkg/ArmVirtQemu.dsc -D SECURE_BOOT_ENABLE
-                build -n $NUM_THREADS -b DEBUG -b RELEASE -a AARCH64 -t GCC48 -t GCC49 -t CLANG35 -p ArmPlatformPkg/ArmVExpressPkg/ArmVExpress-FVP-AArch64.dsc
-                build -n $NUM_THREADS -b DEBUG -b RELEASE -a AARCH64 -t GCC48 -t GCC49 -t CLANG35 -p ArmVirtPkg/ArmVirtXen.dsc
-                build -n $NUM_THREADS -b DEBUG -b RELEASE -a AARCH64 -t GCC48 -t GCC49 -t CLANG35 -p ArmPlatformPkg/ArmJunoPkg/ArmJuno.dsc
-                build -n $NUM_THREADS -b DEBUG -b RELEASE -a ARM     -t GCC48 -t GCC49            -p ArmVirtPkg/ArmVirtQemu.dsc
-
-                build -n $NUM_THREADS -b DEBUG -a IA32 -t GCC44 -t GCC46 -t GCC47 -t GCC48 -t GCC49 -t UNIXGCC -p OvmfPkg/OvmfPkgIa32.dsc -D SECURE_BOOT_ENABLE
-                build -n $NUM_THREADS -b DEBUG -a X64  -t GCC44 -t GCC46 -t GCC47 -t GCC48 -t GCC49 -t UNIXGCC -p OvmfPkg/OvmfPkgX64.dsc  -D SECURE_BOOT_ENABLE
-
-                build -n $NUM_THREADS -b RELEASE -a IA32 -t GCC44 -t GCC46 -t GCC47 -t GCC48 -t GCC49 -p OvmfPkg/OvmfPkgIa32.dsc
-                build -n $NUM_THREADS -b RELEASE -a X64  -t GCC44 -t GCC46 -t GCC47 -t GCC48 -t GCC49 -p OvmfPkg/OvmfPkgX64.dsc
-
-            )
-
-    publishers:
-        - email:
-            recipients: 'ard.biesheuvel@linaro.org'
diff --git a/leg-virt-tiancore-edk2-upstream.yaml b/leg-virt-tiancore-edk2-upstream.yaml
deleted file mode 100644
index 42873159e3..0000000000
--- a/leg-virt-tiancore-edk2-upstream.yaml
+++ /dev/null
@@ -1,190 +0,0 @@
-- job:
-    name: leg-virt-tianocore-edk2-upstream
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/leg-edk2/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: docker-xenial-amd64
-    display-name: 'Linaro EDK II - UEFI Continuous Integration (upstream)'
-    scm:
-        - git:
-            url: https://github.com/tianocore/edk2.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out edk2/Build
-            }
-
-            # use the GCC 4.[89] toolchains that are already available on the build host
-            export GCC48_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.04/bin/aarch64-linux-gnu-
-            export GCC48_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.04/bin/arm-linux-gnueabihf-
-            export GCC49_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.09/bin/aarch64-linux-gnu-
-            export GCC49_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.09/bin/arm-linux-gnueabihf-
-
-            # use Xenial's default cross toolchains as GCC5
-            export GCC5_AARCH64_PREFIX=aarch64-linux-gnu-
-            export GCC5_ARM_PREFIX=arm-linux-gnueabihf-
-
-            # reuse the binutils that ship with GCC 4.9 for the CLANG35 builds
-            export CLANG35_AARCH64_PREFIX=${HOME}/srv/toolchain/arm64-tc-14.09/bin/aarch64-linux-gnu-
-            export CLANG35_ARM_PREFIX=${HOME}/srv/toolchain/arm-tc-14.09/bin/arm-linux-gnueabihf-
-
-            # now that we invoke Clang as the linker, it will look for $(TARGET)-ld on the path
-            export PATH=$PATH:${HOME}/srv/toolchain/arm64-tc-14.09/bin:${HOME}/srv/toolchain/arm-tc-14.09/bin
-
-            sudo dpkg --add-architecture i386
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends clang python-requests zip libstdc++6:i386 zlib1g:i386 \
-                            gcc-aarch64-linux-gnu gcc-arm-linux-gnueabihf
-
-            export OUTDIR=${WORKSPACE}/out
-
-            (
-                unset WORKSPACE
-
-                NUM_THREADS=$((`getconf _NPROCESSORS_ONLN` + 1))
-
-                # Initialise the build environment
-                cd edk2
-                git clean -dxf BaseTools/
-                make -C BaseTools
-
-                source edksetup.sh
-
-                # pull the OpenSSL sources
-                git submodule update --init --recursive
-
-                cd ${WORKSPACE}
-                for type in DEBUG RELEASE
-                do
-                    for tc in GCC48 GCC49 GCC5 CLANG35
-                    do
-                        mkdir -p ${OUTDIR}/QEMU-ARM/${type}_${tc}
-                        build -a ARM -t ${tc} -b ${type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtQemu.dsc -D SECURE_BOOT_ENABLE
-                        cp Build/ArmVirtQemu-ARM/${type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-ARM/${type}_${tc}
-
-                        mkdir -p ${OUTDIR}/QEMU-AARCH64/${type}_${tc}
-                        build -a AARCH64 -t ${tc} -b ${type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtQemu.dsc -D SECURE_BOOT_ENABLE
-                        cp Build/ArmVirtQemu-AARCH64/${type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-AARCH64/${type}_${tc}
-
-                        mkdir -p ${OUTDIR}/QEMU-KERNEL-AARCH64/${type}_${tc}
-                        build -a AARCH64 -t ${tc} -b ${type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtQemuKernel.dsc -D SECURE_BOOT_ENABLE
-                        cp Build/ArmVirtQemuKernel-AARCH64/${type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-KERNEL-AARCH64/${type}_${tc}
-
-                        mkdir -p ${OUTDIR}/XEN-ARM/${type}_${tc}
-                        build -a ARM -t ${tc} -b ${type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtXen.dsc
-                        cp Build/ArmVirtXen-ARM/${type}_${tc}/FV/XEN_EFI.fd ${OUTDIR}/XEN-ARM/${type}_${tc}
-
-                        mkdir -p ${OUTDIR}/XEN-AARCH64/${type}_${tc}
-                        build -a AARCH64 -t ${tc} -b ${type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtXen.dsc
-                        cp Build/ArmVirtXen-AARCH64/${type}_${tc}/FV/XEN_EFI.fd ${OUTDIR}/XEN-AARCH64/${type}_${tc}
-                    done
-                done
-            )
-
-            find out -name '*QEMU_EFI.fd' -exec bash -c 'in=${1}; out=${in%fd}img; cat $in /dev/zero | dd iflag=fullblock bs=1M count=64 of=$out; gzip -9 $out' _ {} \;
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out components/kernel/${JOB_NAME}/${BUILD_NUMBER}
-# Disable v1 job submissions. LAVA 2017.10 release **disables ALL V1 test job submissions**
-# https://lists.linaro.org/pipermail/lava-announce/2017-October/000039.html
-#        - shell: |
-#            KERNEL_BUILD_NUM=$(wget -q --no-check-certificate -O - https://ci.linaro.org/job/linux-xen/hwpack=mustang,label=docker-vivid-amd64/lastSuccessfulBuild/buildNumber)
-#            DEVICE_TYPE=mustang
-#            XEN_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/XEN-AARCH64/RELEASE_GCC49/XEN_EFI.fd
-#            TEMPLATE=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-virt-tiancore-edk2-upstream/lava-job-definitions/${DEVICE_TYPE}/template.json
-#
-#            wget -O - -q --no-check-certificate $TEMPLATE | \
-#            sed -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-#                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-#                -e "s|\${XEN_EFI_URL}|${XEN_EFI_URL}|" \
-#                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-#                -e "s|\${KERNEL_BUILD_NUM}|${KERNEL_BUILD_NUM}|" \
-#                > custom_lava_job_definition_xen_aarch64_uefi.json
-#
-#            cat << EOF > post_build_lava_parameters_xen_aarch64_uefi
-#            DEVICE_TYPE=${DEVICE_TYPE}
-#            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-#            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_xen_aarch64_uefi.json
-#            LAVA_SERVER=${LAVA_SERVER}
-#            EOF
-#        - trigger-builds:
-#            - project: 'post-build-lava'
-#              property-file: post_build_lava_parameters_xen_aarch64_uefi
-#              block: true
-#        - shell: |
-#            KERNEL_BUILD_NUM=$(wget -q --no-check-certificate -O - https://ci.linaro.org/job/linux-mainline/ARCH=arm64,defconfig=defconfig,label=linaro-kernel-ci/lastSuccessfulBuild/buildNumber)
-#            DEVICE_TYPE=kvm-aarch64
-#            QEMU_EFI_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}
-#            TEMPLATE=https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/leg-virt-tiancore-edk2-upstream/lava-job-definitions/${DEVICE_TYPE}/template.json
-#
-#            wget -O - -q --no-check-certificate $TEMPLATE | \
-#            sed -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-#                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-#                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-#                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-#                -e "s|\${KERNEL_BUILD_NUM}|${KERNEL_BUILD_NUM}|" \
-#                > custom_lava_job_definition_qemu_aarch64_uefi.json
-#
-#            cat << EOF > post_build_lava_parameters_qemu_aarch64_uefi
-#            DEVICE_TYPE=${DEVICE_TYPE}
-#            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-#            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_aarch64_uefi.json
-#            LAVA_SERVER=${LAVA_SERVER}
-#            EOF
-#        - trigger-builds:
-#            - project: 'post-build-lava'
-#              property-file: post_build_lava_parameters_qemu_aarch64_uefi
-#              block: true
-    publishers:
-        - email:
-            recipients: 'ard.biesheuvel@linaro.org eugene@hp.com'
diff --git a/leg-virt-tiancore-edk2-upstream/lava-job-definitions/kvm-aarch64/template.json b/leg-virt-tiancore-edk2-upstream/lava-job-definitions/kvm-aarch64/template.json
deleted file mode 100644
index d93da9f5d4..0000000000
--- a/leg-virt-tiancore-edk2-upstream/lava-job-definitions/kvm-aarch64/template.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-    "timeout": 900,
-    "job_name": "${BUILD_URL}",
-    "logging_level": "INFO",
-    "vm_group": {
-        "host": {
-            "device_type": "mustang",
-            "role": "host"
-        },
-        "auto_start_vms": false,
-        "vms": [{
-            "device_type": "kvm-aarch64",
-            "role": "guest-nonsecure"
-        },{
-            "device_type": "kvm-aarch64",
-            "role": "guest-secure"
-        },{
-            "device_type": "kvm-aarch64",
-            "role": "guest-grub-secure"
-        },{
-            "device_type": "kvm-aarch32",
-            "role": "guest-nonsecure-arm32"
-        }]
-    },
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "parameters": {
-                "dtb": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/stable-v4.0.4/apm-mustang.dtb",
-                "kernel": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/stable-v4.0.4/Image",
-                "overlays": ["http://people.linaro.org/~ard.biesheuvel/lava-uefi/stable-v4.0.4/modules.tar.xz"],
-                "nfsrootfs": "http://releases.linaro.org/15.03/ubuntu/utopic-images/nano-arm64/linaro-utopic-nano-20150309-90.tar.gz",
-                "target_type": "ubuntu",
-                "role": "host"
-            }
-        },
-        {
-            "command": "deploy_linaro_kernel",
-            "parameters": {
-                "kernel": "http://snapshots.linaro.org/kernel-hwpack/linux-mainline/defconfig/${KERNEL_BUILD_NUM}/Image",
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz",
-                "firmware": "${QEMU_EFI_URL}/QEMU-AARCH64/RELEASE_GCC49/QEMU_EFI.img.gz",
-                "role": "guest-nonsecure"
-            }
-        },
-        {
-            "command": "deploy_linaro_kernel",
-            "parameters": {
-                "kernel": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/secureboot/Image",
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/arm64/rootfs.cpio.gz",
-                "qemu_pflash": ["${QEMU_EFI_URL}/QEMU-AARCH64/RELEASE_GCC49/QEMU_EFI.img.gz", "http://people.linaro.org/~ard.biesheuvel/lava-uefi/secureboot/vars.bin.gz"],
-                "role": "guest-secure"
-            }
-        },
-        {
-            "command": "deploy_linaro_kernel",
-            "parameters": {
-                "kernel": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/secureboot/grubaa64.efi",
-                "rootfs": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/secureboot/vexpress64-openembedded_minimal-armv8.img.gz",
-                "qemu_pflash": ["${QEMU_EFI_URL}/QEMU-AARCH64/RELEASE_GCC49/QEMU_EFI.img.gz", "http://people.linaro.org/~ard.biesheuvel/lava-uefi/secureboot/grub-vars.bin.gz"],
-                "role": "guest-grub-secure"
-            }
-        },
-        {
-            "command": "deploy_linaro_kernel",
-            "parameters": {
-                "kernel": "http://people.linaro.org/~ard.biesheuvel/lava-uefi/arm32-efi/zImage",
-                "ramdisk": "http://storage.kernelci.org/images/rootfs/buildroot/armel/rootfs.cpio.gz",
-                "firmware": "${QEMU_EFI_URL}/QEMU-ARM/RELEASE_GCC49/QEMU_EFI.img.gz",
-                "role": "guest-nonsecure-arm32"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                {
-                    "url": "https://git.linaro.org/ci/uefi.git/blob_plain/HEAD:/lava/kvm-install-qemu-host.yaml"
-                }],
-                "timeout": 1800,
-                "role": "host"
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [
-                {
-                    "url": "https://git.linaro.org/ci/uefi.git/blob_plain/HEAD:/lava/kvm-host.yaml"
-                }],
-                "role": "host"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "dmesg|grep 'rtc-efi rtc-efi: setting system clock to'"
-                ],
-                "timeout": 300,
-                "role": "guest-nonsecure"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "dmesg|grep 'rtc-efi rtc-efi: setting system clock to'"
-                ],
-                "timeout": 300,
-                "role": "guest-secure"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "dmesg|grep 'rtc-efi rtc-efi: setting system clock to'"
-                ],
-                "timeout": 300,
-                "role": "guest-nonsecure-arm32"
-            }
-        },
-        {
-            "command": "lava_command_run",
-            "parameters": {
-                "commands": [
-                    "grep BOOT_IMAGE /proc/cmdline"
-                ],
-                "timeout": 300,
-                "role": "guest-grub-secure"
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "http://${LAVA_SERVER}",
-                "stream": "${BUNDLE_STREAM_NAME}"
-            }
-        }
-    ]
-}
diff --git a/leg-virt-tiancore-edk2-upstream/lava-job-definitions/mustang/template.json b/leg-virt-tiancore-edk2-upstream/lava-job-definitions/mustang/template.json
deleted file mode 100644
index 4d95db5667..0000000000
--- a/leg-virt-tiancore-edk2-upstream/lava-job-definitions/mustang/template.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "actions": [
-        {
-            "command": "deploy_linaro_kernel",
-            "parameters": {
-                "dtb": "https://snapshots.linaro.org/ubuntu/images/xen/mustang/${KERNEL_BUILD_NUM}/apm-mustang.dtb",
-                "kernel": "http://people.linaro.org/~ard.biesheuvel/uXen-arm64",
-                "nfsrootfs": "https://snapshots.linaro.org/ubuntu/images/xen/mustang/${KERNEL_BUILD_NUM}/xenlava-mustang.tar.xz",
-                "ramdisk": "https://snapshots.linaro.org/ubuntu/images/xen/mustang/${KERNEL_BUILD_NUM}/Image-xen-mustang",
-                "target_type": "ubuntu"
-            },
-            "metadata": {
-                "testplan" : "xen",
-                "rootfs.type": "server",
-                "hwpack.type" : "xen-mustang",
-                "ubuntu.distribution": "ubuntu",
-                "ubuntu.name": "mustang"
-            }
-        },
-        {
-            "command": "boot_linaro_image",
-            "parameters": {
-                "boot_cmds": [
-                    "setenv autoload no",
-                    "setenv xen_addr_r 0x4000080000",
-                    "setenv kernel_addr_r    0x4002000000",
-                    "setenv kernel_addr_load 0x4001ffffC0",
-                    "setenv fdt_addr_r '{DTB_ADDR}'",
-                    "setenv xen_load 'tftp ${xen_addr_r} {KERNEL}'",
-                    "setenv xen_dtb 'tftp ${fdt_addr_r} {DTB} ;fdt addr ${fdt_addr_r};fdt resize;'",
-                    "setenv xen_dom0 'tftp ${kernel_addr_load} {RAMDISK}'",
-                    "setenv xen_run 'run xen_dom0 xen_load;fdt print /chosen;run xen_boot'",
-                    "setenv xen_boot 'setenv bootargs ${bootargs_xen};bootm ${xen_addr_r} - ${fdt_addr_r}'",
-                    "setenv bootargs_xen 'conswitch=x dom0_mem=1G dom0_max_vcpus=1 console=dtuart dtuart=/soc/serial@1c020000'",
-                    "setenv dom0_bootargs 'console=hvc0,115200 debug maxcpus=8 swiotlb=4096 root=/dev/nfs rw nfsroot={SERVER_IP}:{NFSROOTFS},tcp,hard,intr ip=dhcp'",
-                    "dhcp",
-                    "setenv serverip {SERVER_IP}",
-                    "run xen_dtb",
-                    "fdt addr $fdt_addr_r",
-                    "fdt resize",
-                    "fdt set /chosen '#address-cells' <2>",
-                    "fdt set /chosen '#size-cells' <1>",
-                    "fdt mknode /chosen module@0",
-                    "fdt set /chosen/module@0 compatible xen,linux-zimage xen,multiboot-module",
-                    "fdt set /chosen/module@0 reg <0x40 0x4002000000 0x00a00000>",
-                    "fdt set /chosen/module@0 bootargs \\\"${dom0_bootargs}\\\"",
-                    "run xen_run"
-                ]
-            }
-        },
-        {
-            "command": "lava_test_shell",
-            "parameters": {
-                "testdef_repos": [{
-                    "git-repo": "git://git.linaro.org/ci/uefi.git",
-                    "parameters": {
-                        "EDK2_BIN": "${XEN_EFI_URL}"
-                    },
-                    "testdef": "lava/xentest.yaml"
-                }],
-                "timeout": 9600
-            }
-        },
-        {
-            "command": "submit_results",
-            "parameters": {
-                "server": "http://${LAVA_SERVER}",
-                "stream": "${BUNDLE_STREAM_NAME}"
-            }
-        }
-
-    ],
-    "device_type": "mustang",
-    "job_name": "${BUILD_URL}",
-    "log_level": "INFO",
-    "timeout": 30000
-}
\ No newline at end of file
diff --git a/leg-virt-tianocore-edk2-upstream.yaml b/leg-virt-tianocore-edk2-upstream.yaml
new file mode 100644
index 0000000000..24c841ec39
--- /dev/null
+++ b/leg-virt-tianocore-edk2-upstream.yaml
@@ -0,0 +1,52 @@
+- job:
+    name: leg-virt-tianocore-edk2-upstream
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    disabled: false
+    node: ldcg-aarch64-02
+    display-name: 'Linaro EDK II - UEFI Continuous Integration (upstream)'
+    scm:
+        - git:
+            url: https://github.com/tianocore/edk2.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
+            name: origin
+            branches:
+                - refs/heads/master
+            basedir: edk2
+            skip-tag: true
+            shallow-clone: true
+            clean: true
+            wipe-workspace: false
+    triggers:
+        - pollscm: 'H H/8 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: leg-virt-tianocore-edk2-upstream/build.sh
+        - linaro-publish-token
+        - shell:
+            !include-raw: leg-virt-tianocore-edk2-upstream/publish.sh
+    publishers:
+        - email:
+            recipients: 'ardb@kernel.org quic_llindhol@quicinc.com marcin.juszkiewicz@linaro.org'
diff --git a/leg-virt-tianocore-edk2-upstream/build-in-docker.sh b/leg-virt-tianocore-edk2-upstream/build-in-docker.sh
new file mode 100644
index 0000000000..bfaadc5a71
--- /dev/null
+++ b/leg-virt-tianocore-edk2-upstream/build-in-docker.sh
@@ -0,0 +1,65 @@
+#!/bin/bash
+
+set -ex
+
+# use Debian's default cross toolchains for GCC5 (binutils)
+export GCC_AARCH64_PREFIX=aarch64-linux-gnu-
+export GCC_ARM_PREFIX=arm-linux-gnueabihf-
+
+sudo apt-get update
+sudo apt-get install -y --no-install-recommends zip build-essential \
+         g++-aarch64-linux-gnu g++-arm-linux-gnueabihf \
+         nasm llvm clang llvm-dev lld \
+         uuid-dev iasl git ca-certificates \
+         python3-distutils python-is-python3
+
+export OUTDIR=/tmp/shared/out
+
+rm -rf ${OUTDIR}/*
+
+cd /tmp
+
+(
+    unset WORKSPACE
+
+    NUM_THREADS=$((`getconf _NPROCESSORS_ONLN` + 1))
+
+    git clone --depth 1 https://github.com/tianocore/edk2.git
+    cd edk2
+    git submodule update --init
+
+    # Initialise the build environment
+    git clean -dxf BaseTools/
+    make -C BaseTools -j $NUM_THREADS
+
+    source edksetup.sh --reconfig
+
+    for build_type in DEBUG RELEASE NOOPT
+    do
+        for arch in AARCH64 ARM
+        do
+            for tc in GCC CLANGDWARF
+            do
+                for pkg in Arm ArmPlatform Embedded
+                do
+                    build -s -a ${arch} -t ${tc} -b ${build_type} -n $NUM_THREADS -p ${pkg}Pkg/${pkg}Pkg.dsc
+                done
+
+                install -d -m 0777 ${OUTDIR}/QEMU-${arch}/${build_type}_${tc}
+                build -s -a ${arch} -t ${tc} -b ${build_type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtQemu.dsc -D SECURE_BOOT_ENABLE -D NETWORK_IP6_ENABLE -D HTTP_BOOT_ENABLE
+                cp Build/ArmVirtQemu-${arch}/${build_type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-${arch}/${build_type}_${tc}
+
+                install -d -m 0777 ${OUTDIR}/QEMU-KERNEL-${arch}/${build_type}_${tc}
+                build -s -a ${arch} -t ${tc} -b ${build_type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtQemuKernel.dsc -D SECURE_BOOT_ENABLE -D NETWORK_IP6_ENABLE -D HTTP_BOOT_ENABLE
+                cp Build/ArmVirtQemuKernel-${arch}/${build_type}_${tc}/FV/QEMU_EFI.fd ${OUTDIR}/QEMU-KERNEL-${arch}/${build_type}_${tc}
+
+                install -d -m 0777 ${OUTDIR}/XEN-${arch}/${build_type}_${tc}
+                build -s -a ${arch} -t ${tc} -b ${build_type} -n $NUM_THREADS -p ArmVirtPkg/ArmVirtXen.dsc
+                cp Build/ArmVirtXen-${arch}/${build_type}_${tc}/FV/XEN_EFI.fd ${OUTDIR}/XEN-${arch}/${build_type}_${tc}
+            done
+        done
+    done
+)
+
+# we expand firmware images to 64MB and set permissions to be able to remove them from normal account
+find $OUTDIR -name '*QEMU_EFI.fd' -exec bash -c 'in=${1}; out=${in%fd}img; cat $in /dev/zero | dd iflag=fullblock bs=1M count=64 of=$out; gzip -9 $out; chmod 666 ${1} ${out}*' _ {} \;
diff --git a/leg-virt-tianocore-edk2-upstream/build.sh b/leg-virt-tianocore-edk2-upstream/build.sh
new file mode 100644
index 0000000000..a47826880b
--- /dev/null
+++ b/leg-virt-tianocore-edk2-upstream/build.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit EXIT INT TERM ERR
+
+cleanup_exit()
+{
+	if [ -z $DRUN_ID ]; then
+		docker kill $DRUN_ID
+	fi
+}
+
+docker pull linaro/jenkins-arm64-debian:bookworm
+
+cd $WORKSPACE
+
+mkdir -p out
+
+rm build-in-docker.sh*
+
+wget https://git.linaro.org/ci/job/configs.git/plain/leg-virt-tianocore-edk2-upstream/build-in-docker.sh
+
+DRUN_ID=`docker run --rm -d -v $PWD:/tmp/shared linaro/jenkins-arm64-debian:bookworm sleep infinity`
+
+docker exec $DRUN_ID apt-get update
+docker exec $DRUN_ID apt-get install -y sudo
+docker exec $DRUN_ID bash /tmp/shared/build-in-docker.sh
+
+docker kill $DRUN_ID
diff --git a/leg-virt-tianocore-edk2-upstream/publish.sh b/leg-virt-tianocore-edk2-upstream/publish.sh
new file mode 100644
index 0000000000..85f7b9960e
--- /dev/null
+++ b/leg-virt-tianocore-edk2-upstream/publish.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+
+time python3 ${HOME}/bin/linaro-cp.py \
+  --link-latest \
+  $WORKSPACE/out/ \
+  components/kernel/${JOB_NAME}/${BUILD_NUMBER}
diff --git a/lhg-oe-build-next.yaml b/lhg-oe-build-next.yaml
deleted file mode 100644
index 04e89c24ca..0000000000
--- a/lhg-oe-build-next.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- job:
-    name: lhg-oe-build-next
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-build
-                - job-cancel
-                - job-configure
-    parameters:
-        - string:
-            name: MANIFEST_REPO
-            default: 'https://github.com/linaro-home/lhg-oe-manifests.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty-staging'
-        - string:
-            name: DISTRO
-            default: 'rpb-wayland'
-        - string:
-            name: IMAGES
-            default: 'rpb-westonchromium-image'
-    disabled: true
-    node: lhg
-    display-name: 'LHG rpb-based build (staging)'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64-lhg
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - dragonboard-410c
-                - hikey
-                - am57xx-evm
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw: lhg-oe-build/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              openembedded/pre-built/lhg/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NUMBER}
-    publishers:
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'out/*'
-        - email:
-            recipients: 'andrey.konovalov@linaro.org'
diff --git a/lhg-oe-build.yaml b/lhg-oe-build.yaml
index 08aa0537d0..cb7a5b3711 100644
--- a/lhg-oe-build.yaml
+++ b/lhg-oe-build.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -23,7 +23,7 @@
             default: 'rpb-westonchromium-image'
         - string:
             name: MANIFEST_URL
-            default: 'https://github.com/linaro-home/lhg-oe-manifests.git'
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
         - string:
             name: MANIFEST_BRANCH
             default: 'morty'
@@ -35,7 +35,7 @@
             default: 'openembedded/pre-built/lhg/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
         - string:
             name: LAVA_SERVER
-            default: 'https://staging.validation.linaro.org/RPC2/'
+            default: 'https://validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -43,7 +43,7 @@
             name: QA_SERVER_PROJECT
             default: 'openembedded-morty'
 
-    disabled: false
+    disabled: true
     node: lhg
     display-name: 'LHG - OpenEmbedded (morty)'
     axes:
@@ -81,6 +81,9 @@
               hikey)
                 DEVICE_TYPE=hi6220-hikey
                 ;;
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
               *)
                 echo "Skip DEVICE_TYPE for ${MACHINE}"
                 ;;
@@ -104,4 +107,4 @@
         - archive:
             artifacts: 'out/*'
         - email:
-            recipients: 'andrey.konovalov@linaro.org'
+            recipients: 'andrey.konovalov@linaro.org, peter.griffin@linaro.org'
diff --git a/lhg-oe-build/builders.sh b/lhg-oe-build/builders.sh
index e581be021e..3459f434f4 100755
--- a/lhg-oe-build/builders.sh
+++ b/lhg-oe-build/builders.sh
@@ -20,15 +20,15 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-crypto python-requests texinfo vim-tiny whiptail"
+pkg_list="build-essential python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-crypto python-requests texinfo vim-tiny whiptail"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
 
-# Install jinja2-cli and ruamel.yaml
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
+# Install jinja2-cli and ruamel.yaml==0.16.13
+pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
 
 set -ex
 
@@ -51,6 +51,11 @@ if [ ! -e ".repo/manifest.xml" ]; then
    ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
 fi
 
+if [ "${ghprbPullId}" ]; then
+    echo "Applying Github pull-request #${ghprbPullId} from ${ghprbGhRepository}"
+    sed -i -e "s|name=\"${ghprbGhRepository}\"|name=\"${ghprbGhRepository}\" revision=\"refs/pull/${ghprbPullId}/head\"|" .repo/manifest.xml
+fi
+
 repo sync
 cp .repo/manifest.xml source-manifest.xml
 repo manifest -r -o pinned-manifest.xml
@@ -59,7 +64,12 @@ echo "MANIFEST_COMMIT=${MANIFEST_COMMIT}" > ${WORKSPACE}/submit_for_testing_para
 
 # record changes since last build, if available
 if wget -q ${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
-    repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+    # https://github.com/96boards/oe-rpb-manifest/commit/0be354483a124903982103dc937f9e5c1a094a3a
+    if grep -q ".*linkfile.*\.\./\.\./\.repo/manifests/setup-environment" pinned-manifest-latest.xml ; then
+	echo "detected old style symlink with relative path, skipping diff report"
+    else
+	repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+    fi
 else
     echo "latest build published does not have pinned-manifest.xml, skipping diff report"
 fi
@@ -68,7 +78,7 @@ fi
 # make sure we get rid of old config.
 # let's remove the previous TMPDIR as well.
 # we want to preserve build/buildhistory though.
-rm -rf conf build/conf build/tmp-*glibc/
+rm -rf build/conf build/tmp-*glibc/
 
 # Accept EULA if/when needed
 export EULA_dragonboard410c=1
@@ -94,6 +104,11 @@ cat << EOF >> conf/local.conf
 CMDLINE_remove = "quiet"
 EOF
 
+# Accept freescale EULA
+cat << EOF >> conf/local.conf
+ACCEPT_FSL_EULA = "1"
+EOF
+
 # add useful debug info
 cat conf/{site,auto}.conf
 
@@ -122,10 +137,12 @@ case "${MACHINE}" in
     ;;
   *)
     for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
-      gunzip -k ${rootfs}
-      sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
-      rm -f ${rootfs%.gz}
-      gzip -9 ${rootfs%.ext4.gz}.img
+      if [ -e ${rootfs} ]; then
+        gunzip -k ${rootfs}
+        sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
+        rm -f ${rootfs%.gz}
+        gzip -9 ${rootfs%.ext4.gz}.img
+      fi
     done
     ;;
 esac
@@ -192,6 +209,6 @@ SYSTEM_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_IMG}
 KERNEL_URL=${BASE_URL}${PUB_DEST}/${KERNEL_IMG}
 DTB_URL=${BASE_URL}${PUB_DEST}/${DTB_IMG}
 NFSROOTFS_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_TARXZ_IMG}
-PTABLE_URL=${BASE_URL}${PUB_DEST}/bootloader/${PTABLE_IMG}
+PTABLE_URL=http://images.validation.linaro.org/builds.96boards.org/snapshots/reference-platform/components/uefi-staging/49/hikey/release/ptable-linux-8g.img
 FIP_URL=${BASE_URL}${PUB_DEST}/bootloader/${FIP_IMG}
 EOF
diff --git a/lhg-oe-build/lava-job-definitions/am57xx-evm/template-igt-test.yaml b/lhg-oe-build/lava-job-definitions/am57xx-evm/template-igt-test.yaml
new file mode 100644
index 0000000000..48495c28d1
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/am57xx-evm/template-igt-test.yaml
@@ -0,0 +1,88 @@
+device_type: x15
+tags:
+  - chamelium
+job_name: lhg-oe-igt-Chamelium-test-${MANIFEST_BRANCH}-${BUILD_NUMBER} 
+timeouts:
+  job:
+    minutes: 45
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+context:
+  test_character_delay: 10
+
+actions:
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    images:
+      userdata:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+
+- boot:
+    auto_login:
+      login_prompt: 'am57xx-evm login:'
+      username: root
+    prompts:
+    - 'root@am57xx-evm:'
+    commands:
+    - run findfdt
+    - setenv console ttyS2,115200n8
+    - setenv mmcdev 1
+    - setenv bootpart 1:9
+    - run mmcboot
+    timeout:
+      minutes: 15
+    method: u-boot
+
+- test:
+    timeout:
+      minutes: 30
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: basic-tests
+          description: Basic tests after X15 boots to the shell prompt
+        run:
+          steps:
+          - lava-test-case target-ps --shell ps aux
+          - lava-test-case target-dmesg --shell dmesg
+          - lava-test-case target-ifconfig --shell ifconfig -a
+          - lava-test-case target-ping-google --shell ping -c4 www.google.com
+          - df -h
+          - lava-test-case ping-chamelium --shell ping -c4 ${CHAMELIUM_IP}
+          # Stop Weston, otherwise igt-gpu-tools wouldn't run
+          - lava-test-case stop-weston --shell systemctl stop weston@linaro systemd-logind
+          - cat /sys/kernel/debug/dri/0/clients
+      name: target-basic-test
+      path: inline/target-basic-test.yaml
+
+
+- test:
+    timeout:
+      minutes: 25
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/igt/igt-test.yaml
+      name: igt-chamelium-test
+      params:
+        IGT_DIR: "/usr/share/igt-gpu-tools"
+        TEST_LIST: "CHAMELIUM"
+        ARTIFACTORIAL_URL: "https://archive.validation.linaro.org/artifacts/team/multimedia/"
+        ARTIFACTORIAL_TOKEN: "e8d5f76f05d70bba65e7c7739be9e814"
diff --git a/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-igt-test.yaml b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-igt-test.yaml
new file mode 100644
index 0000000000..1f4488e9f6
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-igt-test.yaml
@@ -0,0 +1,77 @@
+device_type: dragonboard-410c
+tags:
+  - chamelium
+job_name: lhg-oe-igt-Chamelium-test-${MANIFEST_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 120
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+actions:
+- deploy:
+    timeout:
+      minutes: 45
+    to: fastboot
+    images:
+      boot:
+        url: ${BOOT_URL}
+      rootfs:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+
+- boot:
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - 'root@dragonboard-410c:~#'
+    timeout:
+      minutes: 8
+    method: fastboot
+
+- test:
+    timeout:
+      minutes: 20
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: basic-tests
+          description: "Basic tests after dragonboard-410c boots to the shell prompt"
+        run:
+          steps:
+          - ifconfig -a
+          - lava-test-case ping-google --shell ping -c4 www.google.com
+          - lava-test-case ping-chamelium --shell ping -c4 ${CHAMELIUM_IP}
+          - cat /sys/kernel/debug/dri/0/clients
+          # Stop Weston, otherwise igt-gpu-tools wouldn't run
+          - lava-test-case stop-weston --shell systemctl stop weston@linaro systemd-logind
+          - cat /sys/kernel/debug/dri/0/clients
+      name: basic-tests
+      path: inline/basic-tests.yaml
+
+- test:
+    timeout:
+      minutes: 25
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/igt/igt-test.yaml
+      name: igt-chamelium-test
+      params:
+        IGT_DIR: "/usr/share/igt-gpu-tools"
+        TEST_LIST: "CHAMELIUM"
+        ARTIFACTORIAL_URL: "https://archive.validation.linaro.org/artifacts/team/multimedia/"
+        ARTIFACTORIAL_TOKEN: "e8d5f76f05d70bba65e7c7739be9e814"
diff --git a/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-robotframework-tests.yaml b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-robotframework-tests.yaml
new file mode 100644
index 0000000000..094903274d
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-robotframework-tests.yaml
@@ -0,0 +1,144 @@
+device_type: dragonboard-410c
+tags:
+  - static-ip
+  - 4k-hdmi-dongle
+  - usb-mouse
+job_name: lhg-oe-robotframework-tests-${MANIFEST_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 160
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: high
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+protocols:
+  lava-lxc:
+    name: lxc-dragonboard-410c-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    - python-opencv
+    - python-pip
+    - libffi-dev
+    - libssl-dev
+    - tesseract-ocr
+    - python-lxml
+    - git
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - root@(.*):/#
+    - root@linaro-developer:~#
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: dragonboard-410c
+    images:
+      boot:
+        url: ${BOOT_URL}
+      rootfs:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: dragonboard-410c
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - root@(.*):/#
+    - root@dragonboard-410c:~#
+    timeout:
+      minutes: 15
+    method: fastboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+
+- test:
+    namespace: dragonboard-410c
+    name: target-simple-test
+    timeout:
+      minutes: 160
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: basic-tests
+          description: "Basic tests after dragonboard-410c boots to the shell prompt"
+        run:
+          steps:
+          - lava-test-case ps --shell ps aux
+          - lava-test-case db410c-dmesg --shell dmesg
+          - lava-test-case db410c-ifconfig --shell ifconfig -a
+          - lava-test-case db410c-ping-google --shell ping -c4 www.google.com
+          # Prevent Weston enter "inactive mode"
+          - echo -e "[core]\nidle-time=0" >> /etc/xdg/weston/weston.ini
+          - cat /etc/xdg/weston/weston.ini
+          - lava-test-case prevent-weston-enter-inactive-mode-and-restart-it --shell systemctl restart weston@linaro
+
+      name: target-basic-test
+      path: inline/target-basic-test.yaml
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 30
+    definitions:
+    - repository: https://git.linaro.org/people/arthur.she/test-definitions.git
+      from: git
+      path: openembedded/robotframework-lxc.yaml
+      name: robotframework-lxc
+      params:
+        RF_TEST_CASES_REPO: "https://github.com/linaro-mmwg/lhg-robotframework-test.git"
+        RF_TEST_CASE: "weston-simple-egl/weston-simple-egl-test.robot,browser-test/chromium-browser-test.robot,gst-wayland-test/gst-wayland-test.robot,gst-wayland-test/gst-wayland410hw-test.robot,webgl-test/webgl-test.robot,youtube-test/youtube-test.robot"
diff --git a/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-v4l2-compliance-test.yaml b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-v4l2-compliance-test.yaml
new file mode 100644
index 0000000000..f295c27f1d
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-v4l2-compliance-test.yaml
@@ -0,0 +1,118 @@
+device_type: dragonboard-410c
+job_name: lhg-oe-v4l2-compliance-test-${MANIFEST_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 160
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: high
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+protocols:
+  lava-lxc:
+    name: lxc-dragonboard-410c-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - root@(.*):/#
+    - root@linaro-developer:~#
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: dragonboard-410c
+    images:
+      boot:
+        url: ${BOOT_URL}
+      rootfs:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: dragonboard-410c
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - root@(.*):/#
+    - root@dragonboard-410c:~#
+    timeout:
+      minutes: 15
+    method: fastboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+
+- test:
+    namespace: dragonboard-410c
+    timeout:
+      minutes: 30
+    definitions:
+     - repository: https://git.linaro.org/qa/test-definitions.git
+       from: git
+       path: automated/linux/v4l2/v4l2-compliance.yaml
+       parameters:
+         # V4L2 capture device
+         VIDEO_DEVICE: '/dev/video0'
+       name: v4l2-compliance-venus-capture
+       timeout:
+         minutes: 15
+     - repository: https://git.linaro.org/qa/test-definitions.git
+       from: git
+       path: automated/linux/v4l2/v4l2-compliance.yaml
+       parameters:
+         # V4L2 output device
+         VIDEO_DEVICE: '/dev/video1'
+       name: v4l2-compliance-venus-output
+       timeout:
+         minutes: 15
diff --git a/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-wifi-tests.yaml b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-wifi-tests.yaml
new file mode 100644
index 0000000000..6382217651
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/dragonboard-410c/template-wifi-tests.yaml
@@ -0,0 +1,147 @@
+device_type: dragonboard-410c
+job_name: lhg-oe-wifi-test-${MANIFEST_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 160
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: high
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+protocols:
+  lava-lxc:
+    name: lxc-dragonboard-410c-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - root@(.*):/#
+    - root@linaro-developer:~#
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: dragonboard-410c
+    images:
+      boot:
+        url: ${BOOT_URL}
+      rootfs:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: dragonboard-410c
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - root@(.*):/#
+    - root@dragonboard-410c:~#
+    timeout:
+      minutes: 15
+    method: fastboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+
+- test:
+    namespace: dragonboard-410c
+    name: target-simple-test
+    timeout:
+      minutes: 160
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: basic-tests
+          description: "Basic tests after dragonboard-410c boots to the shell prompt"
+        run:
+          steps:
+          - lava-test-case ps --shell ps aux
+          - lava-test-case db410c-dmesg --shell dmesg
+          - lava-test-case db410c-ifconfig --shell ifconfig -a
+          - lava-test-case db410c-ping-google --shell ping -c4 www.google.com
+      name: target-basic-test
+      path: inline/target-basic-test.yaml
+
+- test:
+    namespace: dragonboard-410c
+    name: wifi-test
+    timeout:
+      minutes: 5
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/wlan-smoke/wlan-smoke.yaml
+      params:
+        DEVICE: wlan0
+      name: linux-wlan-smoke
+
+- test:
+    namespace: dragonboard-410c
+    name: wlan-download-test
+    timeout:
+      minutes: 20
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/wlan-download/wlan-download.yaml
+      params:
+        DEVICE: wlan0
+        ETHERNET_DEVICE: eth0
+        SSID_NAME: LAVATESTX
+        SSID_PASSWORD: NepjqGbq
+        FILE_URL: http://testdata.validation.linaro.org/stress/stress-network.img
+        FILE_CHECKSUM: e5c834fbdaa6bfd8eac5eb9404eefdd4
+        TIME_DELAY: 0s
+      name: linux-wlan-download
diff --git a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-eme-clearkey.yaml b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-eme-clearkey.yaml
deleted file mode 100644
index f49c7f2e16..0000000000
--- a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-eme-clearkey.yaml
+++ /dev/null
@@ -1,153 +0,0 @@
-device_type: hi6220-hikey
-tags:
-  - static-ip
-  - 4k-hdmi-dongle
-job_name: lhg-oe-eme-clearkey-test-${MANIFEST_BRANCH}-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 20
-  action:
-    minutes: 20
-  connection:
-    minutes: 5
-priority: high
-visibility: public
-
-metadata:
-  manifest branch: ${MANIFEST_BRANCH}
-  build-url: ${BUILD_URL}
-  build-location: ${BASE_URL}/${PUB_DEST}
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 20
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    - python-opencv
-    - python-pip
-    - libffi-dev
-    - libssl-dev
-    - python-lxml
-    - git
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - "root@(.*):/#"
-    - "hikey:/"
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 20
-    to: fastboot
-    namespace: hikey-oe
-    connection: lxc
-    images:
-      ptable:
-        url: ${PTABLE_URL}
-        reboot: hard-reset
-      fastboot:
-        url: ${FIP_URL}
-        reboot: hard-reset
-      boot:
-        url: ${BOOT_URL}
-        reboot: hard-reset
-      system:
-        url: ${SYSTEM_URL}
-        compression: gz
-        apply-overlay: true
-    os: oe
-    protocols:
-       lava-lxc:
-       - action: fastboot-deploy
-         request: pre-power-command
-         timeout:
-           minutes: 2
-
-- boot:
-    namespace: hikey-oe
-    auto_login:
-      login_prompt: "login:"
-      username: root
-    prompts:
-    - "root@hikey:~#"
-    timeout:
-      minutes: 5
-    method: uefi-menu
-    commands: fastboot
-    protocols:
-      lava-lxc:
-      # other action could be boot-fastboot
-      - action: uefi-commands
-        request: pre-os-command
-        timeout:
-          minutes: 5
-
-- test:
-   namespace: hikey-oe
-   timeout:
-     minutes: 20
-   definitions:
-   - from: inline
-     repository:
-       metadata:
-         format: Lava-Test Test Definition 1.0
-         name: basic-tests
-         description: "Basic tests after hikey boots to the shell prompt"
-       run:
-         steps:
-         - lava-test-case ps --shell ps aux
-         - lava-test-case hikey-dmesg --shell dmesg
-         - lava-test-case weston-status --shell test -f /run/user/1000/weston.log
-     name: basic-tests
-     path: inline/basic-tests.yaml
-
-- test:
-   namespace: tlxc
-   timeout:
-     minutes: 20
-   definitions:
-   - repository: https://git.linaro.org/people/arthur.she/test-definitions.git
-     from: git
-     path: openembedded/robotframework-lxc.yaml
-     name: robotframework-lxc
-     params:
-       RF_TEST_CASE: "eme-test/eme-clearkey-test.robot"
-       RF_TEST_CASES_REPO: "https://git.linaro.org/people/arthur.she/lhg-robotframework-test.git"
diff --git a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml
new file mode 100644
index 0000000000..af9acc2293
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-robotframework-tests.yaml
@@ -0,0 +1,150 @@
+device_type: hi6220-hikey-r2
+tags:
+  - static-ip
+  - 4k-hdmi-dongle
+  - usb-mouse
+job_name: lhg-oe-robotframework-tests-${MANIFEST_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 40
+  action:
+    minutes: 20
+  connection:
+    minutes: 5
+priority: high
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 20
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    - python-opencv
+    - python-pip
+    - libffi-dev
+    - libssl-dev
+    - python-lxml
+    - tesseract-ocr
+    - git
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - "root@(.*):/#"
+    - "hikey:/"
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 20
+    to: fastboot
+    namespace: hikey-oe
+    connection: lxc
+    images:
+      ptable:
+        url: ${PTABLE_URL}
+        reboot: hard-reset
+      # Reflashing fip.bin doesn't seem to work atm
+      #fastboot:
+      #  url: ${FIP_URL}
+      #  reboot: hard-reset
+      boot:
+        url: ${BOOT_URL}
+        reboot: hard-reset
+      system:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+    protocols:
+       lava-lxc:
+       - action: fastboot-deploy
+         request: pre-power-command
+         timeout:
+           minutes: 2
+
+- boot:
+    namespace: hikey-oe
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@hikey:~#"
+    timeout:
+      minutes: 5
+    method: grub
+    commands: installed
+    protocols:
+      lava-lxc:
+      - action: grub-sequence-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+
+- test:
+   namespace: hikey-oe
+   timeout:
+     minutes: 20
+   definitions:
+   - from: inline
+     repository:
+       metadata:
+         format: Lava-Test Test Definition 1.0
+         name: basic-tests
+         description: "Basic tests after hikey boots to the shell prompt"
+       run:
+         steps:
+         - lava-test-case ps --shell ps aux
+         - lava-test-case hikey-dmesg --shell dmesg
+         - lava-test-case weston-status --shell test -f /run/user/1000/weston.log
+         # Prevent Weston enter "inactive mode"
+         - echo -e "idle-time=0" >> /etc/xdg/weston/weston.ini
+         - cat /etc/xdg/weston/weston.ini
+         - lava-test-case prevent-weston-enter-inactive-mode-and-restart-it --shell systemctl restart weston@linaro
+     name: basic-tests
+     path: inline/basic-tests.yaml
+
+- test:
+   namespace: tlxc
+   timeout:
+     minutes: 40
+   definitions:
+   - repository: https://git.linaro.org/people/arthur.she/test-definitions.git
+     from: git
+     path: openembedded/robotframework-lxc.yaml
+     name: robotframework-lxc
+     params:
+       RF_TEST_CASE: "weston-simple-egl/weston-simple-egl-test.robot,gst-wayland-test/gst-wayland-test.robot,browser-test/chromium-browser-test.robot,youtube-test/youtube-test.robot,webgl-test/webgl-test.robot,x-test/xtest-benchmark.robot,x-test/xtest-regression.robot,eme-test/eme-clearkey-test.robot"
+       RF_TEST_CASES_REPO: "https://github.com/linaro-mmwg/lhg-robotframework-test.git"
diff --git a/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-wifi-tests.yaml b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-wifi-tests.yaml
new file mode 100644
index 0000000000..b568ee1d96
--- /dev/null
+++ b/lhg-oe-build/lava-job-definitions/hi6220-hikey/template-wifi-tests.yaml
@@ -0,0 +1,154 @@
+device_type: hi6220-hikey-r2
+job_name: lhg-oe-wifi-tests-${MANIFEST_BRANCH}-${BUILD_NUMBER}
+timeouts:
+  job:
+    minutes: 40
+  action:
+    minutes: 20
+  connection:
+    minutes: 5
+priority: high
+visibility: public
+
+metadata:
+  manifest branch: ${MANIFEST_BRANCH}
+  build-url: ${BUILD_URL}
+  build-location: ${BASE_URL}/${PUB_DEST}
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    distribution: ubuntu
+    release: xenial
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 20
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - "root@(.*):/#"
+    - "hikey:/"
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 20
+    to: fastboot
+    namespace: hikey-oe
+    connection: lxc
+    images:
+      ptable:
+        url: ${PTABLE_URL}
+        reboot: hard-reset
+      # Reflashing fip.bin doesn't seem to work atm
+      #fastboot:
+      #  url: ${FIP_URL}
+      #  reboot: hard-reset
+      boot:
+        url: ${BOOT_URL}
+        reboot: hard-reset
+      system:
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+    protocols:
+       lava-lxc:
+       - action: fastboot-deploy
+         request: pre-power-command
+         timeout:
+           minutes: 2
+
+- boot:
+    namespace: hikey-oe
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@hikey:~#"
+    timeout:
+      minutes: 5
+    method: grub
+    commands: installed
+    protocols:
+      lava-lxc:
+      - action: grub-sequence-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+
+- test:
+   namespace: hikey-oe
+   timeout:
+     minutes: 20
+   definitions:
+   - from: inline
+     repository:
+       metadata:
+         format: Lava-Test Test Definition 1.0
+         name: basic-tests
+         description: "Basic tests after hikey boots to the shell prompt"
+       run:
+         steps:
+         - lava-test-case ps --shell ps aux
+         - lava-test-case hikey-dmesg --shell dmesg
+         - lava-test-case weston-status --shell test -f /run/user/1000/weston.log
+     name: basic-tests
+     path: inline/basic-tests.yaml
+
+- test:
+    namespace: hikey-oe
+    name: wifi-test
+    timeout:
+      minutes: 5
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/wlan-smoke/wlan-smoke.yaml
+      params:
+        DEVICE: wlan0
+      name: linux-wlan-smoke
+
+- test:
+    namespace: hikey-oe
+    name: wlan-download-test
+    timeout:
+      minutes: 20
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/wlan-download/wlan-download.yaml
+      params:
+        DEVICE: wlan0
+        ETHERNET_DEVICE: eth0
+        SSID_NAME: LAVATESTX
+        SSID_PASSWORD: NepjqGbq
+        FILE_URL: http://testdata.validation.linaro.org/stress/stress-network.img
+        FILE_CHECKSUM: e5c834fbdaa6bfd8eac5eb9404eefdd4
+        TIME_DELAY: 0s
+      name: linux-wlan-download
diff --git a/lhg-oe-build/submit_for_testing.sh b/lhg-oe-build/submit_for_testing.sh
index 323fcb2ab7..541cb80edc 100755
--- a/lhg-oe-build/submit_for_testing.sh
+++ b/lhg-oe-build/submit_for_testing.sh
@@ -5,14 +5,44 @@ set -ex
 rm -rf configs
 git clone --depth 1 http://git.linaro.org/ci/job/configs.git
 
-[ -z "${DEVICE_TYPE}" ] || \
-python configs/openembedded-lkft/submit_for_testing.py \
-  --device-type ${DEVICE_TYPE} \
-  --build-number ${BUILD_NUMBER} \
-  --lava-server ${LAVA_SERVER} \
-  --qa-server ${QA_SERVER} \
-  --qa-server-team lhg \
-  --qa-server-project ${QA_SERVER_PROJECT} \
-  --git-commit ${MANIFEST_COMMIT} \
-  --template-path configs/lhg-oe-build/lava-job-definitions \
-  --template-names template-eme-clearkey.yaml
+PRODUCTION_LAVA_TEST_JOBS="template-robotframework-tests.yaml template-wifi-tests.yaml"
+STAGING_LAVA_TEST_JOBS=""
+export CHAMELIUM_IP="\${CHAMELIUM_IP}"
+
+case "${DEVICE_TYPE}" in
+  dragonboard-410c)
+    PRODUCTION_LAVA_TEST_JOBS="${PRODUCTION_LAVA_TEST_JOBS} template-v4l2-compliance-test.yaml"
+    if [ "${MANIFEST_BRANCH}" == "rocko" ]; then
+      STAGING_LAVA_TEST_JOBS="template-igt-test.yaml"
+    fi
+    ;;
+  am57xx-evm)
+    PRODUCTION_LAVA_TEST_JOBS="template-igt-test.yaml"
+    ;;
+esac
+
+if [ -n "${DEVICE_TYPE}" ]; then
+  [ -z "${PRODUCTION_LAVA_TEST_JOBS}" ] || \
+  python configs/openembedded-lkft/submit_for_testing.py \
+    --device-type ${DEVICE_TYPE} \
+    --build-number ${BUILD_NUMBER} \
+    --lava-server ${LAVA_SERVER} \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team lhg \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --git-commit ${BUILD_NUMBER} \
+    --template-path configs/lhg-oe-build/lava-job-definitions \
+    --template-names ${PRODUCTION_LAVA_TEST_JOBS}
+  
+  [ -z "${STAGING_LAVA_TEST_JOBS}" ] || \
+  python configs/openembedded-lkft/submit_for_testing.py \
+    --device-type ${DEVICE_TYPE} \
+    --build-number ${BUILD_NUMBER} \
+    --lava-server https://staging.validation.linaro.org/RPC2/ \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team lhg \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --git-commit ${BUILD_NUMBER} \
+    --template-path configs/lhg-oe-build/lava-job-definitions \
+    --template-names ${STAGING_LAVA_TEST_JOBS}
+fi
diff --git a/lhg-oe-rocko.yaml b/lhg-oe-rocko.yaml
index d59f189867..17efc3b4ce 100644
--- a/lhg-oe-rocko.yaml
+++ b/lhg-oe-rocko.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -23,7 +23,7 @@
             default: 'rpb-westonchromium-image'
         - string:
             name: MANIFEST_URL
-            default: 'https://github.com/linaro-home/lhg-oe-manifests.git'
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
         - string:
             name: MANIFEST_BRANCH
             default: 'rocko'
@@ -35,7 +35,7 @@
             default: 'openembedded/pre-built/lhg/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
         - string:
             name: LAVA_SERVER
-            default: 'https://staging.validation.linaro.org/RPC2/'
+            default: 'https://validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -81,6 +81,12 @@
               hikey)
                 DEVICE_TYPE=hi6220-hikey
                 ;;
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
+              am57xx-evm)
+                DEVICE_TYPE=am57xx-evm
+                ;;
               *)
                 echo "Skip DEVICE_TYPE for ${MACHINE}"
                 ;;
@@ -98,11 +104,10 @@
             !include-raw: rpb-openembedded/publishers.sh
         - inject:
             properties-file: submit_for_testing_parameters
-# Uncomment this after QA_SERVER_PROJECT 'openembedded-rocko' is created
-#        - shell:
-#            !include-raw: lhg-oe-build/submit_for_testing.sh
+        - shell:
+            !include-raw: lhg-oe-build/submit_for_testing.sh
     publishers:
         - archive:
             artifacts: 'out/*'
         - email:
-            recipients: 'andrey.konovalov@linaro.org'
+            recipients: 'andrey.konovalov@linaro.org peter.griffin@linaro.org'
diff --git a/lhg-oe-thud.yaml b/lhg-oe-thud.yaml
new file mode 100644
index 0000000000..9e89653136
--- /dev/null
+++ b/lhg-oe-thud.yaml
@@ -0,0 +1,110 @@
+- job:
+    name: lhg-oe-thud
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'rpb-westonchromium-image'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'thud'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/pre-built/lhg/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'openembedded-thud'
+
+    disabled: true
+    node: lhg
+    display-name: 'LHG - OpenEmbedded (thud)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - am57xx-evm
+                - dragonboard-410c
+                - imx8mqevk
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb-wayland
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-stretch-amd64-lhg
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
+              am57xx-evm)
+                DEVICE_TYPE=am57xx-evm
+                ;;
+              *)
+                echo "Skip DEVICE_TYPE for ${MACHINE}"
+                ;;
+            esac
+
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - shell:
+            !include-raw: lhg-oe-build/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - inject:
+            properties-file: submit_for_testing_parameters
+        - shell:
+            !include-raw: lhg-oe-build/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'out/*'
+        - email:
+            recipients: 'andrey.konovalov@linaro.org peter.griffin@linaro.org'
diff --git a/lhg-oe-wpe-master.yaml b/lhg-oe-wpe-master.yaml
new file mode 100644
index 0000000000..cbd854815b
--- /dev/null
+++ b/lhg-oe-wpe-master.yaml
@@ -0,0 +1,106 @@
+- job:
+    name: lhg-oe-wpe-master
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'lhg-westeros-wpe-image'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'master'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/pre-built/lhg/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'openembedded-master'
+
+    disabled: true
+    node: lhg
+    display-name: 'LHG - OpenEmbedded (master)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - dragonboard-410c
+                - imx8mqevk
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb-wayland
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-stretch-amd64-lhg
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
+              *)
+                echo "Skip DEVICE_TYPE for ${MACHINE}"
+                ;;
+            esac
+
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - shell:
+            !include-raw: lhg-oe-build/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - inject:
+            properties-file: submit_for_testing_parameters
+        - shell:
+            !include-raw: lhg-oe-build/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'out/*'
+        - email:
+            recipients: 'andrey.konovalov@linaro.org peter.griffin@linaro.org manikandan.krishnasamy@linaro.org'
diff --git a/lhg-oe-wpe-morty.yaml b/lhg-oe-wpe-morty.yaml
index 7e0ec79cec..6ba73076f5 100644
--- a/lhg-oe-wpe-morty.yaml
+++ b/lhg-oe-wpe-morty.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: lhg-oe-wpe-build
+    name: lhg-oe-wpe-morty
     project-type: matrix
     defaults: global
     properties:
@@ -8,11 +8,12 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
                 - job-cancel
+                - job-configure
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 30
@@ -23,7 +24,7 @@
             default: 'lhg-westeros-wpe-image'
         - string:
             name: MANIFEST_URL
-            default: 'https://github.com/linaro-home/lhg-oe-manifests.git'
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
         - string:
             name: MANIFEST_BRANCH_PREFIX
             default: 'wpe/'
@@ -37,7 +38,7 @@
 # TBD: need to confirm with LHG where the WPE builds are to be published
             name: PUB_DEST
             default: 'openembedded/pre-built/lhg/${MANIFEST_BRANCH_PREFIX}${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-    disabled: false
+    disabled: true
     node: lhg
     display-name: 'LHG Westeros/WPE - OpenEmbedded (morty)'
     axes:
@@ -72,4 +73,4 @@
         - archive:
             artifacts: 'out/*'
         - email:
-            recipients: 'andrey.konovalov@linaro.org'
+            recipients: 'andrey.konovalov@linaro.org peter.griffin@linaro.org'
diff --git a/lhg-openembedded-playready-morty.yaml b/lhg-openembedded-playready-morty.yaml
index b0c5ea7bf2..9e999df8ba 100644
--- a/lhg-openembedded-playready-morty.yaml
+++ b/lhg-openembedded-playready-morty.yaml
@@ -4,7 +4,7 @@
     defaults: global
     properties:
         - authorization:
-            linaro:
+            everyone-flat:
                 - job-read
             playready-confidential-access:
                 - job-read
@@ -21,7 +21,10 @@
             default: 'rpb-westonchromium-image'
         - string:
             name: MANIFEST_URL
-            default: 'https://github.com/linaro-home/lhg-oe-manifests.git'
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
+        - string:
+            name: MANIFEST_BRANCH_PREFIX
+            default: 'playready/'
         - string:
             name: MANIFEST_BRANCH
             default: 'morty'
@@ -34,9 +37,12 @@
         - string:
             name: GIT_SSH_COMMAND
             default: 'ssh -F ${HOME}/lhg-review.sshconfig'
-    disabled: false
+        - string:
+            name: AUTH_GROUPS
+            default: 'playready-confidential-access'
+    disabled: true
     node: master
-    display-name: 'LHG PlayReady - OpenEmbedded (morty)'
+    display-name: 'MMWG PlayReady - OpenEmbedded (morty)'
     triggers:
         - gerrit:
             server-name: 'lhg-review.linaro.org'
@@ -45,8 +51,8 @@
             gerrit-build-failed-codereview-value: -1
             readable-message: true
             successful-message: 'OE Build Sanity Check Successful'
-            start-message: 'OE Build Sanity Check Started'
-            failure-message: 'OE Build Sanity Check Failed'
+            start-message: 'OE Morty Build Sanity Check Started'
+            failure-message: 'OE Morty Build Sanity Check Failed'
             trigger-for-unreviewed-patches: true
             projects:
                 - project-compare-type: 'PLAIN'
@@ -63,7 +69,7 @@
                   project-pattern: 'lhg/meta-lhg-prop'
                   branches:
                     - branch-compare-type: 'PLAIN'
-                      branch-pattern: 'master'
+                      branch-pattern: 'morty'
     axes:
         - axis:
             type: user-defined
@@ -95,4 +101,6 @@
             properties-file: post_build_lava_parameters
         - linaro-publish-token
         - shell:
-            !include-raw: rpb-openembedded/publishers-lhg.sh
+            !include-raw: rpb-openembedded/buildinfo-protected.sh
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
diff --git a/lhg-openembedded-playready-rocko.yaml b/lhg-openembedded-playready-rocko.yaml
new file mode 100644
index 0000000000..395224ce6a
--- /dev/null
+++ b/lhg-openembedded-playready-rocko.yaml
@@ -0,0 +1,106 @@
+- job:
+    name: lhg-openembedded-playready-rocko
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            playready-confidential-access:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'rpb-westonchromium-image'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
+        - string:
+            name: MANIFEST_BRANCH_PREFIX
+            default: 'playready/'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'rocko'
+        - string:
+            name: BASE_URL
+            default: 'http://snapshots.linaro.org/'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/pre-built/lhg-playready/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
+        - string:
+            name: GIT_SSH_COMMAND
+            default: 'ssh -F ${HOME}/lhg-review.sshconfig'
+        - string:
+            name: AUTH_GROUPS
+            default: 'playready-confidential-access'
+    disabled: true
+    node: master
+    display-name: 'MMWG PlayReady - OpenEmbedded (rocko)'
+    triggers:
+        - gerrit:
+            server-name: 'lhg-review.linaro.org'
+            override-votes: true
+            gerrit-build-successful-codereview-value: 1
+            gerrit-build-failed-codereview-value: -1
+            readable-message: true
+            successful-message: 'OE Rocko Build Sanity Check Successful'
+            start-message: 'OE Rocko Build Sanity Check Started'
+            failure-message: 'OE Rocko Build Sanity Check Failed'
+            trigger-for-unreviewed-patches: true
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'lhg/playready'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: '3.3.4472'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'optee-playready'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: '3.3.4472'
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'lhg/meta-lhg-prop'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'rocko'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+#                - 'hikey960'
+                - 'hikey'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb-wayland
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-stretch-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '8ed98f80-b4d8-4861-9a8a-15f1e89ba083'
+    builders:
+        - shell:
+            !include-raw: rpb-openembedded/builders-lhg.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/buildinfo-protected.sh
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
diff --git a/linaro-art-build-metrics.yaml b/linaro-art-build-metrics.yaml
deleted file mode 100644
index 87505ecb3b..0000000000
--- a/linaro-art-build-metrics.yaml
+++ /dev/null
@@ -1,56 +0,0 @@
-- job:
-    name: linaro-art-build-metrics
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'ART: Build Metrics'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 200
-        - credentials-binding:
-            - text:
-                credential-id: ART_METRICS_TOKEN
-                variable: ART_METRICS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-            rm -rf art-build-tests android
-            #set -xe
-
-            git clone git://git.linaro.org/people/vishal.bhoj/art-build-tests.sh.git art-build-tests
-            cd art-build-tests/job-metrics/
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y xml-twig-tools bc
-            . ./metrics.sh ${ART_METRICS_TOKEN}
-            cat results.txt
-    publishers:
-        - email-ext:
-            recipients: 'linaro-art@linaro.org'
-            content-type: text
-            subject: 'Build Time statistics for ART CI Jobs'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                ${BUILD_LOG_REGEX, regex=".*Build Time.*", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            always: true
diff --git a/linaro-art-julien-playground.yaml b/linaro-art-julien-playground.yaml
deleted file mode 100644
index f9041cf163..0000000000
--- a/linaro-art-julien-playground.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-- job:
-    name: linaro-art-julien-sandbox
-    project-type: freestyle
-    defaults: global
-    description: >
-      This job is for Julien to update NUC device
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            julien.duraj@linaro.org:
-                - job-build
-                - job-configure
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-        - copyartifact:
-            projects: post-build-reports
-    disabled: false
-    node: docker-utopic-art-test
-    display-name: 'Tip: Benchmarks Baseline (Intel Nuc)'
-    concurrent: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            # Get the ip address of the nuc to connect to adb over network
-            source /home/buildslave/srv/nexus-config
-            export ANDROID_SERIAL=${NUC}
-            ./setup_host.sh
-            ./setup_android.sh
-
-
-    publishers:
-        - archive:
-            artifacts: '*.txt, *.xml, *.json'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
-        - trigger-parameterized-builds:
-            - project: 'post-build-reports'
-              property-file: post_build_reports_parameters
diff --git a/linaro-art-scripts-presubmit.yaml b/linaro-art-scripts-presubmit.yaml
deleted file mode 100644
index c745192745..0000000000
--- a/linaro-art-scripts-presubmit.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- job:
-    name: linaro-art-scripts-presubmit
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    node: aosp
-    display-name: 'Scripts: Presubmit Test'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: android-review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/art-build-scripts'
-                  branches:
-                      - branch-pattern: 'master'
-            silent: false
-            silent-start: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 10
-    builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-
-            if [[ -e "${ART_BUILD_SCRIPTS_DIR}/.git" ]]; then
-              cd "${ART_BUILD_SCRIPTS_DIR}"
-              # We want to keep the gitignored shellcheck binary, so no -x flag
-              git clean -fd
-              git reset --hard
-            else
-              # Make sure the target dir does not exist, so the clone won't fail
-              rm -rf "${ART_BUILD_SCRIPTS_DIR}"
-              git clone "https://android-git.linaro.org/git/linaro-art/art-build-scripts.git" \
-                        "${ART_BUILD_SCRIPTS_DIR}"
-              cd "${ART_BUILD_SCRIPTS_DIR}"
-            fi
-
-            if ! { git fetch "http://${GERRIT_HOST}/${GERRIT_PROJECT}" "${GERRIT_REFSPEC}" &&
-                        git checkout FETCH_HEAD; }; then
-              git reset --hard
-              echo "Error: *** Applying patch with git fetch && git checkout FAILED"
-              exit 1
-            fi
-
-            perl ${ART_BUILD_SCRIPTS_DIR}/jenkins/test_launcher.pl \
-              ${ART_BUILD_SCRIPTS_DIR}/presubmit.sh
-    publishers:
-        - email:
-            recipients: 'vishal.bhoj@linaro.org daniel.diaz@linaro.org julien.duraj@linaro.org'
diff --git a/linaro-art-stable-build-ARTHostTest.yaml b/linaro-art-stable-build-ARTHostTest.yaml
deleted file mode 100644
index b0afa17434..0000000000
--- a/linaro-art-stable-build-ARTHostTest.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-- scm:
-    name: art
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: build
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/build.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: vixl
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/external/vixl.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: linaro-art-stable-build-ARTHostTest
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_host.sh">Host Tests</a>
-      on the stable branch.
-
-      The git revisions all track the linaro-stable branch for the following projects (in order):
-        - art
-        - build
-        - external/vixl
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-stable'
-    disabled: true
-    node: docker-utopic-art
-    display-name: 'Stable: Host Test'
-    concurrent: true
-    scm:
-        - art
-        - build
-        - vixl
-    triggers:
-        - pollscm: 'H/5 * * * *'
-        - gerrit:
-            server-name: 'dev-private-review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            ulimit -c unlimited
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_art_host.sh
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/tests.groovy
-                - linaro-art/global.groovy
diff --git a/linaro-art-stable-build-ARTTargetTest.yaml b/linaro-art-stable-build-ARTTargetTest.yaml
deleted file mode 100644
index 5fed78deb0..0000000000
--- a/linaro-art-stable-build-ARTTargetTest.yaml
+++ /dev/null
@@ -1,165 +0,0 @@
-- scm:
-    name: art
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: build
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/build.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: vixl
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/external/vixl.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: linaro-art-stable-build-ARTTargetTest
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs  the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_target.sh">Target Tests</a>
-      on a device via adb using android root.<br>
-      The build slave in the cloud is able to reach the physical device using port forwarding via SSH.<br>
-      This job is for the stable branch.<br>
-
-      The git revisions all track the linaro-stable branch for the following projects (in order):<br>
-        - art<br>
-        - build<br>
-        - external/vixl
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-stable'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-stable'
-    disabled: true
-    node: docker-utopic-art
-    display-name: 'Stable: Target Test'
-    concurrent: true
-    scm:
-        - art
-        - build
-        - vixl
-    triggers:
-        - pollscm: 'H/5 * * * *'
-        - gerrit:
-            server-name: 'dev-private-review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            # Port forwarding magic to have access to Nexus devices
-            source /home/buildslave/srv/nexus-config
-            export ANDROID_SERIAL=${BULLHEAD}
-            ./setup_adb.sh
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_art_target.sh --default
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/tests.groovy
-                - linaro-art/global.groovy
diff --git a/linaro-art-stable-build-ARTVixlTest.yaml b/linaro-art-stable-build-ARTVixlTest.yaml
deleted file mode 100644
index 25dc0adc34..0000000000
--- a/linaro-art-stable-build-ARTVixlTest.yaml
+++ /dev/null
@@ -1,179 +0,0 @@
-- scm:
-    name: art
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: build
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/build.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: vixl
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/external/vixl.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: linaro-art-stable-build-ARTVixlTest
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_vixl.sh">Vixl Tests</a>
-      on the stable branch.<br>
-
-      The git revisions all track the linaro-stable branch for the following projects (in order):<br>
-        - art<br>
-        - build<br>
-        - external/vixl
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-stable'
-    disabled: true
-    node: docker-utopic-art
-    display-name: 'Stable: VIXL Test'
-    concurrent: true
-    scm:
-        - art
-        - build
-        - vixl
-    triggers:
-        - gerrit:
-            server-name: dev-private-review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Some Docker instances mount ${HOME}/.ssh/config from the host.
-            mv ${HOME}/.ssh{,.not}
-            mkdir -p "${HOME}/bin"
-            export PATH="${HOME}/bin:${PATH}"
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            # clang-format-3.6
-            wget -q http://mirrors.kernel.org/ubuntu/pool/universe/l/llvm-toolchain-3.6/clang-format-3.6_3.6-2ubuntu1~trusty1_amd64.deb \
-              http://mirrors.kernel.org/ubuntu/pool/main/l/llvm-toolchain-3.6/libllvm3.6_3.6-2ubuntu1~trusty1_amd64.deb
-            sudo dpkg -i clang-format-3.6_3.6-2ubuntu1~trusty1_amd64.deb libllvm3.6_3.6-2ubuntu1~trusty1_amd64.deb
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            perl ${ART_BUILD_SCRIPTS_DIR}/jenkins/test_launcher.pl \
-              ${ART_BUILD_SCRIPTS_DIR}/tests/test_art_vixl.sh
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
-        - plot:
-            - title: 'Sync Time'
-              group: 'Time Measurements'
-              yaxis: 'Seconds'
-              style: line
-              series:
-                  - file: time_repo.txt
-                    format: properties
-            - title: 'Test Time'
-              group: 'Time Measurements'
-              yaxis: 'Seconds'
-              style: line
-              series:
-                  - file: time_test.txt
-                    format: properties
diff --git a/linaro-art-stable-build-MicroBenchmarks.yaml b/linaro-art-stable-build-MicroBenchmarks.yaml
deleted file mode 100644
index abbee5c6cb..0000000000
--- a/linaro-art-stable-build-MicroBenchmarks.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- scm:
-    name: art
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: build
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/build.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: vixl
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/external/vixl.git
-            branches:
-                - origin/linaro-stable
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: linaro-art-stable-build-MicroBenchmarks
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs  the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/benchmarks/benchmarks_run_target.sh">Microbenchmarks Test script</a>
-      on the stable branch.<br>
-
-      The git revisions all track the linaro-stable branch for the following projects (in order):<br>
-        - art<br>
-        - build<br>
-        - external/vixl
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-        - copyartifact:
-            projects: post-build-reports
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-stable'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-stable'
-    disabled: true
-    node: docker-utopic-art
-    display-name: 'Stable: Benchmarks (Nexus 5X)'
-    concurrent: true
-    scm:
-        - art
-        - build
-        - vixl
-    triggers:
-        - pollscm: 'H/5 * * * *'
-        - gerrit:
-            server-name: dev-private-review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'linaro-stable'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            # Port forwarding magic to have access to Nexus devices
-            source /home/buildslave/srv/nexus-config
-            export ANDROID_SERIAL=${BULLHEAD}
-            ./setup_adb.sh
-            ./setup_host.sh
-            ./setup_android.sh
-
-            alias python=python3
-            cd ${ANDROID_BUILD_DIR}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/benchmarks/benchmarks_run_target.sh --default
-
-            # create parameters for post-build-reports
-            cat << EOF > ${WORKSPACE}/post_build_reports_parameters
-            SOURCE_PROJECT_NAME=${JOB_NAME}
-            SOURCE_BUILD_NUMBER=${BUILD_NUMBER}
-            SOURCE_BUILD_ID=${BUILD_NUMBER}
-            SOURCE_BUILD_URL=${BUILD_URL}
-            ART_URL=https://art-reports.linaro.org/api/
-            SOURCE_BRANCH_NAME=linaro-stable
-            QA_REPORTS_URL=https://qa-reports.linaro.org
-            EOF
-
-            if [[ ${GERRIT_CHANGE_NUMBER} ]]; then
-              echo SOURCE_GERRIT_CHANGE_NUMBER=${GERRIT_CHANGE_NUMBER} >> ${WORKSPACE}/post_build_reports_parameters
-            fi
-            if [[ ${GERRIT_CHANGE_ID} ]]; then
-              echo SOURCE_GERRIT_CHANGE_ID=${GERRIT_CHANGE_ID} >> ${WORKSPACE}/post_build_reports_parameters
-            fi
-            if [[ ${GERRIT_CHANGE_URL} ]]; then
-              echo SOURCE_GERRIT_CHANGE_URL=${GERRIT_CHANGE_URL} >> ${WORKSPACE}/post_build_reports_parameters
-            fi
-            if [[ ${GERRIT_PATCHSET_NUMBER} ]]; then
-              echo SOURCE_GERRIT_PATCHSET_NUMBER=${GERRIT_PATCHSET_NUMBER} >> ${WORKSPACE}/post_build_reports_parameters
-            fi
-
-    publishers:
-        - archive:
-            artifacts: '*.txt, *.xml, *.json'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
-        - trigger-parameterized-builds:
-            - project: 'post-build-reports'
-              property-file: post_build_reports_parameters
diff --git a/linaro-art-testing-presubmit-test.yaml b/linaro-art-testing-presubmit-test.yaml
deleted file mode 100644
index c236ff7b8d..0000000000
--- a/linaro-art-testing-presubmit-test.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-- job:
-    name: linaro-art-testing-presubmit-test
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro/art-testing.git/tree/test/test.py">Art Testing Presubmit Tests</a>.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    node: docker-xenial-amd64
-    display-name: 'Benchmarks: Presubmit Test'
-    concurrent: true
-    triggers:
-        - gerrit:
-            server-name: android-review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro/art-testing'
-                  branches:
-                      - branch-pattern: 'master'
-            silent: false
-            silent-start: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 60
-    builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            export PATH="${HOME}/bin:${PATH}"
-
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/
-            ./jenkins/setup_host.sh
-            ./jenkins/presubmit_art_testing.sh
-    publishers:
-        - email:
-            recipients: 'daniel.diaz@linaro.org'
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
diff --git a/linaro-art-tip-build-ARTBoot2guiTest.yaml b/linaro-art-tip-build-ARTBoot2guiTest.yaml
deleted file mode 100644
index aa2bda5bdb..0000000000
--- a/linaro-art-tip-build-ARTBoot2guiTest.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-- job:
-    name: linaro-art-tip-build-ARTBoot2guiTest
-    project-type: freestyle
-    defaults: global
-    description: >
-      Builds the tip of AOSP nightly and tests whether boot to gui is successful using the emulator.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 90
-            num-to-keep: 90
-    parameters:
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'Tip: Boot to GUI Test'
-    concurrent: true
-    triggers:
-        - timed: '@daily'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_boot_to_gui_emulator.sh
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
diff --git a/linaro-art-tip-build-ARTHostTest.yaml b/linaro-art-tip-build-ARTHostTest.yaml
deleted file mode 100644
index fa6157dcac..0000000000
--- a/linaro-art-tip-build-ARTHostTest.yaml
+++ /dev/null
@@ -1,148 +0,0 @@
-- job:
-    name: linaro-art-tip-build-ARTHostTest
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_host.sh">Host Tests</a>
-      on the tip.<br>
-      This build can be triggered by adding the comment "IncludeAllTests"
-      in your Gerrit patch.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'Tip: Host Test'
-    concurrent: true
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-        - gerrit:
-            server-name: 'dev-private-review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeAllTests.*'
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeHostTests.*'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/art-build-scripts'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            export LC_ALL=C.UTF-8
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_art_host.sh
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/tests.groovy
-                - linaro-art/global.groovy
-        - plot:
-            - title: 'Sync Time'
-              group: 'Time Measurements'
-              yaxis: 'Seconds'
-              style: line
-              series:
-                  - file: time_repo.txt
-                    format: properties
-            - title: 'Test Time'
-              group: 'Time Measurements'
-              yaxis: 'Seconds'
-              style: line
-              series:
-                  - file: time_test.txt
-                    format: properties
diff --git a/linaro-art-tip-build-ARTTargetTest.yaml b/linaro-art-tip-build-ARTTargetTest.yaml
deleted file mode 100644
index c1898727f1..0000000000
--- a/linaro-art-tip-build-ARTTargetTest.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-- job:
-    name: linaro-art-tip-build-ARTTargetTest
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_target.sh">Target Tests</a>
-      on a device via adb using android root.<br>
-      The build slave in the cloud is
-      able to reach the physical device using port forwarding via SSH.<br>
-      This job is for the tip.<br>
-      This build can be triggered by adding the comment "IncludeAllTests" or "IncludeTargetTests"
-      in your Gerrit patch.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-tip'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'Tip: Target Test'
-    concurrent: true
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeAllTests.*'
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeTargetTests.*'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/art-build-scripts'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            export LC_ALL=C.UTF-8
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            # Port forwarding magic to have access to Nexus devices
-            source /home/buildslave/srv/nexus-config
-            export ANDROID_SERIAL=${BULLHEAD_TARGET_TEST}
-            ./setup_adb.sh
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_art_target.sh --default
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/tests.groovy
-                - linaro-art/global.groovy
diff --git a/linaro-art-tip-build-ARTVixlTest.yaml b/linaro-art-tip-build-ARTVixlTest.yaml
index 7651da59e5..73057184fd 100644
--- a/linaro-art-tip-build-ARTVixlTest.yaml
+++ b/linaro-art-tip-build-ARTVixlTest.yaml
@@ -18,6 +18,7 @@
                 - job-workspace
             linaro-art:
                 - job-build
+                - job-cancel
                 - job-read
                 - job-extended-read
                 - job-workspace
@@ -33,9 +34,9 @@
             default: 'master'
         - string:
             name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-xenial-aosp
+            default: 'linaro-art-tip-short'
+    disabled: true
+    node: docker-bionic-art
     display-name: 'Tip: VIXL Test'
     concurrent: true
     triggers:
@@ -111,7 +112,7 @@
         - archive:
             artifacts: '*.txt, *.xml'
         - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
+            parse-rules: '/var/jenkins_home/userContent/android-art.parse'
             unstable-on-warning: false
             fail-on-error: false
         - groovy-postbuild:
diff --git a/linaro-art-tip-build-MicroBenchmarks-Baseline-intel.yaml b/linaro-art-tip-build-MicroBenchmarks-Baseline-intel.yaml
deleted file mode 100644
index ae432c1517..0000000000
--- a/linaro-art-tip-build-MicroBenchmarks-Baseline-intel.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-- scm:
-    name: art
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: bionic
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/bionic.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: build
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/build.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: linaro-art-tip-build-MicroBenchmarks-Baseline-intel
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/benchmarks/benchmarks_run_target.sh">Microbenchmarks Test script</a>
-      on the tip.<br>
-      The script is run on the intel platform (i5 NUC)<br>
-      This job is for baseline builds only.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-        - copyartifact:
-            projects: post-build-reports
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-tip'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-utopic-art-test
-    display-name: 'Tip: Benchmarks Baseline (Intel Nuc)'
-    concurrent: false
-    scm:
-        - art
-        - bionic
-        - build
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            # Get the ip address of the nuc to connect to adb over network
-            source /home/buildslave/srv/nexus-config
-            export ANDROID_SERIAL=${NUC}
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            alias python=python3
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/benchmarks/benchmarks_run_target.sh --linux --x86 --sudo --ip-address ${ANDROID_SERIAL}
-            export ANDROID_SERIAL=${VOYOv1}
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/benchmarks/benchmarks_run_target.sh --linux --x86 --sudo --ip-address ${ANDROID_SERIAL}
-
-            # create parameters for post-build-reports
-            cat << EOF > ${WORKSPACE}/post_build_reports_parameters
-            SOURCE_PROJECT_NAME=${JOB_NAME}
-            SOURCE_BUILD_NUMBER=${BUILD_NUMBER}
-            SOURCE_BUILD_ID=${BUILD_NUMBER}
-            SOURCE_BUILD_URL=${BUILD_URL}
-            ART_URL=https://art-reports.linaro.org/api/
-            SOURCE_BRANCH_NAME=master
-            QA_REPORTS_URL=https://qa-reports.linaro.org
-            EOF
-
-    publishers:
-        - archive:
-            artifacts: '*.txt, *.xml, *.json'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
-        - trigger-parameterized-builds:
-            - project: 'post-build-reports'
-              property-file: post_build_reports_parameters
diff --git a/linaro-art-tip-build-MicroBenchmarks-Baseline.yaml b/linaro-art-tip-build-MicroBenchmarks-Baseline.yaml
deleted file mode 100644
index ce4971137c..0000000000
--- a/linaro-art-tip-build-MicroBenchmarks-Baseline.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-- scm:
-    name: art
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: bionic
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/bionic.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: build
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/build.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- scm:
-    name: vixl
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/external/vixl.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-- job:
-    name: linaro-art-tip-build-MicroBenchmarks-Baseline
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/benchmarks/benchmarks_run_target.sh">Microbenchmarks Test script</a>
-      on the tip.<br>
-      The script is run sequentially, on Nexus 5x first, and on Google Pixel second.<br>
-      This job is for baseline builds only.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-        - copyartifact:
-            projects: post-build-reports
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-tip'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'Tip: Benchmarks Baseline (Nexus 5X and Pixel)'
-    concurrent: true
-    scm:
-        - art
-        - bionic
-        - build
-        - vixl
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-         !include: linaro-art/microbenchmarks/baseline-builders.yaml.inc
-    publishers:
-        - archive:
-            artifacts: '*.txt, *.xml, *.json'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
-        - trigger-parameterized-builds:
-            - project: 'post-build-reports'
-              property-file: post_build_reports_parameters
diff --git a/linaro-art-tip-build-MicroBenchmarks.yaml b/linaro-art-tip-build-MicroBenchmarks.yaml
deleted file mode 100644
index 63be9b6acc..0000000000
--- a/linaro-art-tip-build-MicroBenchmarks.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-- job:
-    name: linaro-art-tip-build-MicroBenchmarks
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/benchmarks/benchmarks_run_target.sh">Microbenchmarks Test script </a>
-      on the tip.<br>
-      This runs on the Nexus 5X only.
-      This build is part of the builds that are triggered using the "IncludeAllTests" comment in a Gerrit patch.<br>
-      This build can also be triggered in isolation with the  "IncludeBenchmarks" comment.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-        - copyartifact:
-            projects: post-build-reports
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-tip'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: false
-    node: docker-utopic-art
-    display-name: 'Tip: Benchmarks (Nexus 5X)'
-    concurrent: true
-    triggers:
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeAllTests.*'
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeBenchmarks.*'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/build'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/external/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-         !include: linaro-art/microbenchmarks/builders.yaml.inc
-    publishers:
-        - archive:
-            artifacts: '*.txt, *.xml, *.json'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/global.groovy
-        - trigger-parameterized-builds:
-            - project: 'post-build-reports'
-              property-file: post_build_reports_parameters
diff --git a/linaro-art-vixl-art-host-test.yaml b/linaro-art-vixl-art-host-test.yaml
deleted file mode 100644
index 7113b72e83..0000000000
--- a/linaro-art-vixl-art-host-test.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-- job:
-    name: linaro-art-vixl-art-host-test
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the ART
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_host.sh">Host Tests</a>
-      on the tip using the
-      <a href="https://git.linaro.org/arm/vixl.git">latest VIXL tree.</a><br>
-      This job will be launched nightly.<br>
-      This build can also be triggered by adding the comment "IncludeVixlArtTests" in your Gerrit patch.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-                - job-read
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: true
-    node: docker-utopic-art
-    display-name: 'VIXL: ART Host Tests'
-    concurrent: true
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeVixlArtTests.*'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'arm/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            rm -rf external/vixl
-            git clone https://git.linaro.org/arm/vixl external/vixl
-            cp external/vixl/third_party/android/Android.* external/vixl/
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_art_host.sh
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/tests.groovy
-                - linaro-art/global.groovy
-        - plot:
-            - title: 'Sync Time'
-              group: 'Time Measurements'
-              yaxis: 'Seconds'
-              style: line
-              series:
-                  - file: time_repo.txt
-                    format: properties
-            - title: 'Test Time'
-              group: 'Time Measurements'
-              yaxis: 'Seconds'
-              style: line
-              series:
-                  - file: time_test.txt
-                    format: properties
diff --git a/linaro-art-vixl-art-target-test.yaml b/linaro-art-vixl-art-target-test.yaml
deleted file mode 100644
index ebc58fb953..0000000000
--- a/linaro-art-vixl-art-target-test.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-- job:
-    name: linaro-art-vixl-art-target-test
-    project-type: freestyle
-    defaults: global
-    description: >
-      Runs the ART
-      <a href="https://android-git.linaro.org/linaro-art/art-build-scripts.git/tree/tests/test_art_target.sh">Target Tests</a>
-      on a device via adb using android root.<br>
-      The build slave in the cloud is
-      able to reach the physical device using port forwarding via SSH.<br>
-      This job is using the latest VIXL tree.<br>
-      This job will be launched nightly.<br>
-      This build can also be triggered by adding the comment "IncludeVixlArtTests" in your Gerrit patch.
-    properties:
-        - authorization:
-            anonymous:
-                - job-discover
-                - job-read
-            linaro-android-builders:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-art:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: ADB_VERSION
-            default: 'adb-tip'
-        - string:
-            name: BUILD_CONFIG_REPO
-            default: 'git://android-git.linaro.org/android-build-configs.git'
-        - string:
-            name: BUILD_CONFIG_BRANCH
-            default: 'master'
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'linaro-art-tip'
-    disabled: true
-    node: docker-utopic-art
-    display-name: 'VIXL: ART Target Tests'
-    concurrent: true
-    scm:
-        - git:
-            url: ssh://git@dev-private-git.linaro.org/linaro-art/platform/art.git
-            branches:
-                - origin/master
-            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - gerrit:
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - comment-added-contains-event:
-                    comment-contains-value: '.*IncludeVixlArtTests.*'
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'linaro-art/platform/art'
-                  branches:
-                      - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'arm/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-        - ssh-agent-credentials:
-                users:
-                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},julien.duraj@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash -xe
-
-            # Build scripts
-            ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/jenkins
-            # Port forwarding magic to have access to Nexus devices
-            source /home/buildslave/srv/nexus-config
-            export ANDROID_SERIAL=${BULLHEAD}
-            ./setup_adb.sh
-            ./setup_host.sh
-            ./setup_android.sh
-
-            cd ${ANDROID_BUILD_DIR}
-            rm -rf external/vixl
-            git clone https://git.linaro.org/arm/vixl external/vixl
-            cp external/vixl/third_party/android/Android.* external/vixl/
-            perl scripts/jenkins/test_launcher.pl \
-              scripts/tests/test_art_target.sh --default
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.txt, *.xml'
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android-art.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - groovy-postbuild:
-            script:
-              !include-raw:
-                - linaro-art/tests.groovy
-                - linaro-art/global.groovy
diff --git a/linaro-art-vixlpresubmit-macos.yaml b/linaro-art-vixlpresubmit-macos.yaml
index 61ed598312..67fb98135d 100644
--- a/linaro-art-vixlpresubmit-macos.yaml
+++ b/linaro-art-vixlpresubmit-macos.yaml
@@ -4,9 +4,9 @@
     defaults: global
     description: >
       Runs the
-      <a href="https://git.linaro.org/arm/vixl.git/tree/tools/test.py">Vixl Presubmit Tests</a>
+      <a href="https://github.com/Linaro/vixl/blob/master/tools/test.py">Vixl Presubmit Tests</a>
       using the
-      <a href="https://git.linaro.org/arm/vixl.git/about/">Linaro VIXL tree</a> on mac os.
+      <a href="https://github.com/Linaro/vixl/">Linaro VIXL tree</a> on mac os.
     properties:
         - authorization:
             anonymous:
@@ -29,38 +29,43 @@
         - build-discarder:
             days-to-keep: 60
             num-to-keep: 60
-    disabled: false
+        - github:
+            url: https://github.com/Linaro/vixl
+    disabled: true
     node: macos
     display-name: 'VIXL: Presubmit Test on mac os'
     concurrent: true
+    scm:
+        - git:
+            url: https://github.com/Linaro/vixl.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            basedir: vixl
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
     triggers:
-        - gerrit:
-            server-name: review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'arm/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-            silent: false
-            silent-start: true
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            white-list-target-branches:
+                - 'main'
+                - 'master'
+                - 'mte'
+            auth-id: 'GITHUB_TOKEN'
+            status-context: 'VIXL Presubmit MacOS Test'
+            success-status: 'presubmit macos test succeeded'
+            failure-status: 'presubmit macos test failed'
+            error-status: 'presubmit macos test error'
     wrappers:
         - timestamps
         - timeout:
-            timeout: 180
+            timeout: 300
     builders:
-        - shell: |
-            #!/bin/bash -xe
-            rm -rf art-build-scripts
-            git clone --depth=1 https://android-git.linaro.org/git/linaro-art/art-build-scripts.git
-            (cd art-build-scripts && ./jenkins/presubmit_vixl_test_mac.sh)
+        - shell: !include-raw: linaro-art/vixl/presubmit-macos.sh
     publishers:
-        - email:
-            recipients: 'vishal.bhoj@linaro.org daniel.diaz@linaro.org julien.duraj@linaro.org'
         - groovy-postbuild:
             script:
               !include-raw:
diff --git a/linaro-art-vixlpresubmit-native-armv8.yaml b/linaro-art-vixlpresubmit-native-armv8.yaml
index 87bea1e124..23ff0e943f 100644
--- a/linaro-art-vixlpresubmit-native-armv8.yaml
+++ b/linaro-art-vixlpresubmit-native-armv8.yaml
@@ -4,9 +4,9 @@
     defaults: global
     description: >
       Runs the
-      <a href="https://git.linaro.org/arm/vixl.git/tree/tools/test.py">Vixl Presubmit Tests</a>
+      <a href="https://github.com/Linaro/vixl/blog/master/tools/test.py">Vixl Presubmit Tests</a>
       using the
-      <a href="https://git.linaro.org/arm/vixl.git/about">Linaro VIXL tree</a> on ARMv8 hardware.
+      <a href="https://github.com/Linaro/vixl">Linaro VIXL tree</a> on ARMv8 hardware.
     properties:
         - authorization:
             anonymous:
@@ -29,44 +29,47 @@
         - build-discarder:
             days-to-keep: 60
             num-to-keep: 60
-    disabled: false
-    node: docker-xenial-arm64-05
+        - github:
+            url: https://github.com/Linaro/vixl
+    disabled: true
+    node: docker-bionic-arm64
     display-name: 'VIXL: Presubmit Test on ARMv8 hardware'
     concurrent: true
+    scm:
+        - git:
+            url: https://github.com/Linaro/vixl.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            basedir: vixl
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    parameters:
+      - string:
+          name: VIXL_TEST_ARGS
+          default: "--fail-early --compiler=g++"
     triggers:
-        - gerrit:
-            server-name: review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'arm/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-            silent: false
-            silent-start: true
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            white-list-target-branches:
+                - 'main'
+                - 'master'
+                - 'mte'
+            auth-id: 'GITHUB_TOKEN'
+            status-context: 'VIXL ARMv8 Presubmit Test'
+            success-status: 'presubmit armv8 test succeeded'
+            failure-status: 'presubmit armv8 test failed'
+            error-status: 'presubmit armv8 test error'
     wrappers:
         - timestamps
         - timeout:
-            timeout: 120
+            timeout: 480
     builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            export PATH="${HOME}/bin:${PATH}"
-
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/
-            ./jenkins/setup_host.sh
-            ./jenkins/presubmit_vixl_test.sh
+        - shell: !include-raw: linaro-art/vixl/presubmit.sh
     publishers:
-        - email:
-            recipients: 'vishal.bhoj@linaro.org daniel.diaz@linaro.org julien.duraj@linaro.org'
         - groovy-postbuild:
             script:
               !include-raw:
diff --git a/linaro-art-vixlpresubmit.yaml b/linaro-art-vixlpresubmit.yaml
index e9475aa4d8..017597b9da 100644
--- a/linaro-art-vixlpresubmit.yaml
+++ b/linaro-art-vixlpresubmit.yaml
@@ -4,9 +4,9 @@
     defaults: global
     description: >
       Runs the
-      <a href="https://git.linaro.org/arm/vixl.git/tree/tools/test.py">Vixl Presubmit Tests</a>
+      <a href="https://github.com/Linaro/vixl/blob/master/tools/test.py">Vixl Presubmit Tests</a>
       using the
-      <a href="https://git.linaro.org/arm/vixl.git/about">Linaro VIXL tree.</a>
+      <a href="https://github.com/Linaro/vixl/">Linaro VIXL tree.</a>
     properties:
         - authorization:
             anonymous:
@@ -29,44 +29,47 @@
         - build-discarder:
             days-to-keep: 60
             num-to-keep: 60
-    disabled: false
-    node: docker-xenial-aosp
+        - github:
+            url: https://github.com/Linaro/vixl
+    disabled: true
+    node: docker-bionic-art
     display-name: 'VIXL: Presubmit Test'
     concurrent: true
+    scm:
+        - git:
+            url: https://github.com/Linaro/vixl.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            basedir: vixl
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    parameters:
+      - string:
+          name: VIXL_TEST_ARGS
+          default: "--fail-early --compiler=g++"
     triggers:
-        - gerrit:
-            server-name: review.linaro.org
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            trigger-on:
-                - patchset-created-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'arm/vixl'
-                  branches:
-                      - branch-pattern: 'master'
-            silent: false
-            silent-start: true
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            white-list-target-branches:
+                - 'master'
+                - 'main'
+                - 'mte'
+            auth-id: 'GITHUB_TOKEN'
+            status-context: 'VIXL Presubmit Test'
+            success-status: 'presubmit test succeeded'
+            failure-status: 'presubmit test failed'
+            error-status: 'presubmit test error'
     wrappers:
         - timestamps
         - timeout:
             timeout: 60
     builders:
-        - shell: |
-            #!/bin/bash -xe
-
-            export PATH="${HOME}/bin:${PATH}"
-
-            ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
-            git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git ${ART_BUILD_SCRIPTS_DIR}
-
-            cd ${ART_BUILD_SCRIPTS_DIR}/
-            ./jenkins/setup_host.sh
-            ./jenkins/presubmit_vixl_test.sh
+        - shell: !include-raw: linaro-art/vixl/presubmit.sh
     publishers:
-        - email:
-            recipients: 'vishal.bhoj@linaro.org daniel.diaz@linaro.org julien.duraj@linaro.org'
         - groovy-postbuild:
             script:
               !include-raw:
diff --git a/linaro-art/build/builders.sh b/linaro-art/build/builders.sh
new file mode 100644
index 0000000000..a20f38cd1f
--- /dev/null
+++ b/linaro-art/build/builders.sh
@@ -0,0 +1,40 @@
+#!/bin/bash -xe
+
+# Build scripts
+ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
+mkdir -p "${ANDROID_BUILD_DIR}"
+
+ART_BUILD_SCRIPTS_DIR="${WORKSPACE}/art-build-scripts"
+git clone https://android-git.linaro.org/git/linaro-art/art-build-scripts.git "${ART_BUILD_SCRIPTS_DIR}"
+git -C "${ART_BUILD_SCRIPTS_DIR}" fetch --tags --progress origin "${ART_BUILD_SCRIPTS_REFSPEC}"
+git -C "${ART_BUILD_SCRIPTS_DIR}" checkout "${ART_BUILD_SCRIPTS_REF}"
+
+cd "${ART_BUILD_SCRIPTS_DIR}/jenkins"
+./setup_host.sh
+./setup_android.sh
+
+cd "${ANDROID_BUILD_DIR}"
+perl "${ART_BUILD_SCRIPTS_DIR}/jenkins/test_launcher.pl" \
+  "${ART_BUILD_SCRIPTS_DIR}/jenkins/build_target.sh" --target arm_krait-eng
+perl "${ART_BUILD_SCRIPTS_DIR}/jenkins/test_launcher.pl" \
+  "${ART_BUILD_SCRIPTS_DIR}/jenkins/build_target.sh" --target armv8-eng
+
+sudo apt-get update
+sudo apt-get install -y python-requests
+
+mkdir -p pub
+mv *.tar.xz pub/
+cp "${WORKSPACE}/"*.xml pub/
+PUB_DEST="${PUB_DEST:-/android/${JOB_NAME}/${BUILD_NUMBER}}"
+
+# Publish
+test -d "${HOME}/bin" || mkdir "${HOME}/bin"
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O "${HOME}/bin/linaro-cp.py"
+time python "${HOME}/bin/linaro-cp.py" \
+  --manifest \
+  --link-latest \
+  --split-job-owner \
+  --server "${PUBLISH_SERVER}" \
+  ./pub/ \
+  "${PUB_DEST}" \
+  --include "^[^/]+[._](tar[^/]*|xml|txt)$" \
diff --git a/linaro-art/microbenchmarks/baseline-builders.yaml.inc b/linaro-art/microbenchmarks/baseline-builders.yaml.inc
index f65fa39829..0f9acacc06 100644
--- a/linaro-art/microbenchmarks/baseline-builders.yaml.inc
+++ b/linaro-art/microbenchmarks/baseline-builders.yaml.inc
@@ -13,13 +13,25 @@
               property-file: post_build_lava_parameters
               block: true
         - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel/microbenchmarks_64.yaml#g" ${WORKSPACE}/post_build_lava_parameters
+            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel3/microbenchmarks_64.yaml#g" ${WORKSPACE}/post_build_lava_parameters
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters
               block: true
         - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel/microbenchmarks_32.yaml#g" ${WORKSPACE}/post_build_lava_parameters
+            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel3/microbenchmarks_32.yaml#g" ${WORKSPACE}/post_build_lava_parameters
+        - trigger-builds:
+            - project: 'post-build-lava'
+              property-file: post_build_lava_parameters
+              block: true
+        - shell: |
+            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel2/microbenchmarks_32.yaml#g" ${WORKSPACE}/post_build_lava_parameters
+        - trigger-builds:
+            - project: 'post-build-lava'
+              property-file: post_build_lava_parameters
+              block: true
+        - shell: |
+            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel2/microbenchmarks_64.yaml#g" ${WORKSPACE}/post_build_lava_parameters
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters
diff --git a/linaro-art/microbenchmarks/builders.sh b/linaro-art/microbenchmarks/builders.sh
index 620a181bcc..cf02658214 100644
--- a/linaro-art/microbenchmarks/builders.sh
+++ b/linaro-art/microbenchmarks/builders.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -xe
 
 sudo apt-get update
-sudo apt-get install -y python-requests
+sudo apt-get install -y python3-requests
 
 # Build scripts
 ANDROID_BUILD_DIR="${HOME}/srv/${JOB_NAME}/android"
@@ -20,18 +20,48 @@ alias python=python3
 perl scripts/jenkins/test_launcher.pl \
   scripts/benchmarks/benchmarks_run_target.sh --skip-run true
 
-tar -cJf test-arm-fs.txz out/host/linux-x86/bin/ out/host/linux-x86/framework/ out/target/product/arm_krait/data/ out/target/product/arm_krait/system/
-tar -cJf test-armv8-fs.txz out/host/linux-x86/bin/ out/host/linux-x86/framework/ out/target/product/armv8/data/ out/target/product/armv8/system/
+tar --exclude-vcs -cJf test-tree.txz \
+  art/ \
+  scripts/ \
+  external-benchmarks/ \
+  benchmarks/ \
+  device/generic/art/ \
+  build/ \
+    Makefile \
+    Android.bp \
+    bootstrap.bash \
+  prebuilts/build-tools/ \
+  prebuilts/go/linux-x86/ \
+  prebuilts/jdk/jdk11/ \
+  external/golang-protobuf/
+
+readonly out_krait=out/target/product/arm_krait
+readonly out_armv8=out/target/product/armv8
+readonly out_host=out/host/linux-x86
+
+tar -cJf test-arm-fs.txz ${out_host}/bin/ ${out_host}/framework/ ${out_krait}/data/ \
+  ${out_krait}/system/ ${out_krait}/linkerconfig/ out/target/common
+tar -cJf test-armv8-fs.txz ${out_host}/bin/ ${out_host}/framework/ ${out_armv8}/data/ \
+  ${out_armv8}/system/ ${out_armv8}/linkerconfig/ out/target/common
 
 mkdir -p pub
 mv ${WORKSPACE}/*.xml *.txz pub/
 PUB_DEST=${PUB_DEST:-/android/${JOB_NAME}/${BUILD_NUMBER}}
 
+# Only grant access to artifacts to the linaro-art group.
+cat << EOF > ${WORKSPACE}/BUILD-INFO.txt
+Format-Version: 0.5
+Files-Pattern: *
+License-Type: protected
+Auth-Groups: linaro-art
+EOF
+
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --manifest \
+  --build-info ${WORKSPACE}/BUILD-INFO.txt \
   --link-latest \
   --split-job-owner \
   --server ${PUBLISH_SERVER} \
@@ -43,7 +73,7 @@ time python ${HOME}/bin/linaro-cp.py \
 
 # Construct post-build-lava parameters
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-DEVICE_TYPE=nexus5x
+DEVICE_TYPE=pixel3
 TARGET_PRODUCT=pixel
 MAKE_TARGETS=droidcore
 JOB_NAME=${JOB_NAME}
@@ -56,7 +86,7 @@ GERRIT_CHANGE_URL=${GERRIT_CHANGE_URL}
 GERRIT_CHANGE_ID=${GERRIT_CHANGE_ID}
 FRONTEND_JOB_NAME=${JOB_NAME}
 DOWNLOAD_URL=http://snapshots.linaro.org/android/$JOB_NAME/$BUILD_NUMBER
-CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/nexus5x/microbenchmarks_32.yaml
+CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel3/microbenchmarks_32.yaml
 SKIP_REPORT=true
 QA_REPORTS_TOKEN=${QA_REPORTS_TOKEN}
 EOF
diff --git a/linaro-art/microbenchmarks/builders.yaml.inc b/linaro-art/microbenchmarks/builders.yaml.inc
index 921be6aab2..e81b4b2a20 100644
--- a/linaro-art/microbenchmarks/builders.yaml.inc
+++ b/linaro-art/microbenchmarks/builders.yaml.inc
@@ -7,7 +7,7 @@
               property-file: post_build_lava_parameters
               block: true
         - shell: |
-            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/nexus5x/microbenchmarks_64.yaml#g" ${WORKSPACE}/post_build_lava_parameters
+            sed -i "s#CUSTOM_JSON_URL=.*#CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/plain/android/pixel3/microbenchmarks_64.yaml#g" ${WORKSPACE}/post_build_lava_parameters
         - trigger-builds:
             - project: 'post-build-lava'
               property-file: post_build_lava_parameters
diff --git a/linaro-art/vixl/presubmit-macos.sh b/linaro-art/vixl/presubmit-macos.sh
new file mode 100644
index 0000000000..a976e1cf76
--- /dev/null
+++ b/linaro-art/vixl/presubmit-macos.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -xe
+
+vixl_repo="https://github.com/Linaro/vixl.git"
+
+cd vixl/
+./tools/test.py --fail-early --nolint --noclang-format
diff --git a/linaro-art/vixl/presubmit.sh b/linaro-art/vixl/presubmit.sh
new file mode 100644
index 0000000000..ca0d51cd9b
--- /dev/null
+++ b/linaro-art/vixl/presubmit.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -xe
+
+vixl_repo="https://github.com/Linaro/vixl.git"
+
+mkdir -p "${HOME}/bin"
+export PATH="${HOME}/bin:${PATH}"
+
+# Only x86 image contains no clang tools.
+if [[ "$(uname -p)" == "x86_64" ]]; then
+  sudo apt-get update
+  sudo apt-get install -y clang-4.0 scons clang-format-4.0 clang-tidy-4.0
+fi
+
+wget --no-verbose --output-document "${HOME}/bin/cpplint.py" \
+  https://raw.githubusercontent.com/google/styleguide/gh-pages/cpplint/cpplint.py
+chmod +x "${HOME}/bin/cpplint.py"
+
+git config --global user.name "vixl-build-bot"
+git config --global user.email "vixl-build-bot@fake-email.invalid"
+
+cd vixl/
+./tools/test.py ${VIXL_TEST_ARGS}
diff --git a/linaro-edk2-capsule.yaml b/linaro-edk2-capsule.yaml
deleted file mode 100644
index 5cb1c546c7..0000000000
--- a/linaro-edk2-capsule.yaml
+++ /dev/null
@@ -1,134 +0,0 @@
-- job:
-    name: linaro-edk2-capsule
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/leg-edk2/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'rtsm_fvp_base-aemv8a'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    display-name: 'Linaro EDK II - Capsule'
-    scm:
-        - git:
-            url: http://git.linaro.org/git/uefi/linaro-edk2.git
-            refspec: +refs/heads/linaro-topic-capsule:refs/remotes/origin/linaro-topic-capsule
-            name: origin
-            branches:
-                - refs/heads/linaro-topic-capsule
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                -  gcc-linaro-aarch64-linux-gnu-4.8-2014.04_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf arm64-tc
-              rm -rf arm-trusted-firmware
-              rm -rf uefi-tools
-              rm -rf out
-            }
-
-            # Install custom toolchain
-            mkdir arm64-tc
-            tar --strip-components=1 -C ${WORKSPACE}/arm64-tc -xf gcc-linaro-aarch64-linux-gnu-4.8-*_linux.tar.xz
-            export PATH="${WORKSPACE}/arm64-tc/bin:$PATH"
-
-            # Check out arm-trusted-firmware - at a locked-down known-good version
-            git clone -b v1.0 --depth 1 https://github.com/ARM-software/arm-trusted-firmware.git
-
-            git clone git://git.linaro.org/uefi/uefi-tools.git
-
-            export AARCH64_TOOLCHAIN=GCC48
-            export EDK2_DIR=${WORKSPACE}/linaro-edk2
-            export UEFI_TOOLS_DIR=${WORKSPACE}/uefi-tools
-            export JENKINS_WORKSPACE=${WORKSPACE}
-            unset WORKSPACE
-
-            cd ${EDK2_DIR}
-            ${UEFI_TOOLS_DIR}/uefi-build.sh -b RELEASE -a ../arm-trusted-firmware fvp
-
-            unset WORKSPACE
-            export WORKSPACE=${JENKINS_WORKSPACE}
-
-            cd ${WORKSPACE}
-            mkdir out
-            cp -a ${EDK2_DIR}/Build/ArmVExpress-FVP-AArch64/RELEASE_GCC48/FV/*.bin out/
-            cp -a ${EDK2_DIR}/Build/ArmVExpress-FVP-AArch64/RELEASE_GCC48/FV/*.fd out/
-            ${HOME}/bin/linaro-cp --api_version 3 out components/kernel/${JOB_NAME}/${BUILD_NUMBER}
-
-            IMAGE_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/linux-leg/lastSuccessfulBuild/buildNumber`
-            cat << EOF > lava_job_definition_parameters
-            IMAGE_URL=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/vexpress64-leg-sd.img.gz
-            STARTUP_NSH=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/startup.nsh
-            EOF
-        - inject:
-            properties-file: lava_job_definition_parameters
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/components/kernel/${JOB_NAME}/${BUILD_NUMBER}/fip.bin
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-capsule/lava-job-definitions/${DEVICE_TYPE}/template.json \
-                > custom_lava_job_definition.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/linaro-edk2-prep-matrix.yaml b/linaro-edk2-prep-matrix.yaml
deleted file mode 100644
index a603f9d828..0000000000
--- a/linaro-edk2-prep-matrix.yaml
+++ /dev/null
@@ -1,498 +0,0 @@
-- job:
-    name: linaro-edk2-prep-matrix
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/leg-edk2/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro EDK II - UEFI Continuous Integration (pre-release) - Matrix'
-    scm:
-        - git:
-            url: http://git.linaro.org/git/uefi/linaro-edk2.git
-            refspec: +refs/heads/release-prep:refs/remotes/origin/release-prep
-            name: origin
-            branches:
-                - refs/heads/release-prep
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    axes:
-        - axis:
-            type: user-defined
-            name: MX_B
-            values:
-                - qemu64
-                - fvp-base-armbds
-                - qemu
-                - fvp-foundation-armbds
-                - juno-armbds
-#                - mustang
-                - rtsm_a15mpcore-armbds
-                - tc2-armbds
-                - beagle-armbds
-                - xen64
-        - axis:
-            type: user-defined
-            name: MX_TYPE
-            values:
-                - RELEASE
-                - DEBUG
-        - axis:
-            type: user-defined
-            name: MX_TC
-            values:
-
-                - 48
-                - 49
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-    execution-strategy:
-        sequential: true
-# Touchstone is used to build "most interesting" board first, and to also
-# key actions that should only be done once per build (such as creating
-# source tarball.
-        touchstone:
-            expr: 'MX_B=="qemu64" && MX_TYPE=="RELEASE" && MX_TC=="48"'
-    wrappers:
-        - timestamps
-#        - build-name:
-#            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            export JOB_NAME=linaro-edk2-prep-matrix
-            pwd
-            echo "JOB_URL: ${JOB_URL}"
-            echo "BUILD_URL: ${BUILD_URL}"
-            echo "WORKSPACE: ${WORKSPACE}"
-            echo "BUILD_NUMBER: ${BUILD_NUMBER}"
-
-            # Create lower case debug/release string for use in paths
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            set -ex
-
-            sudo apt-get update
-            sudo apt-get install -y acpica-tools python-requests zip
-            wget --progress=dot -e dotbytes=2M http://ftp.de.debian.org/debian/pool/main/a/acpica-unix/acpica-tools_20140926-1_amd64.deb -O acpica-tools_20140926-1_amd64.deb
-            sudo dpkg -i --force-all acpica-tools_*.deb
-            rm -f acpica-tools_*.deb
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf uefi-ci uefi-tools
-              rm -rf ${JOB_NAME}-build
-              rm -rf out
-            }
-
-            # Use pre-installed linaro toolchain
-            [ ${MX_TC} == "48" ] && export PATH="${HOME}/srv/toolchain/arm-tc-14.04/bin:${HOME}/srv/toolchain/arm64-tc-14.04/bin:$PATH"
-            [ ${MX_TC} == "49" ] && export PATH="${HOME}/srv/toolchain/arm-tc-15.02/bin:${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-
-            git clone git://git.linaro.org/uefi/uefi-tools.git
-            git clone git://git.linaro.org/people/roy.franz/uefi-ci.git -b rfranz-jenkins-test uefi-ci
-            bash -x uefi-ci/uefi.sh
-
-            builddir=${WORKSPACE}/${JOB_NAME}-build
-            outdir=${WORKSPACE}/out
-
-            rm -rf ${outdir}
-            mkdir -p ${outdir}/gcc-${MX_TC}
-
-            # move any *orig.tar.bz2 files separately to non-gcc based dir
-            for f in ${builddir}/*orig.tar.bz2; do
-                ## Check if the glob gets expanded to existing files.
-                ## If not, f here will be exactly the pattern above
-                ## and the exists test will evaluate to false.
-                [ -e "$f" ]  || break  # No files exist, $f is glob pattern
-
-                mv ${builddir}/*orig.tar.bz2 ${outdir}/
-                break
-            done
-            mv ${builddir}/* ${outdir}/gcc-${MX_TC}
-            find ${outdir}/ -name '*QEMU_EFI.fd' -exec bash -c 'in=${1}; out=${in%fd}img; cat $in /dev/zero | dd iflag=fullblock bs=1M count=64 of=$out; gzip -9 $out' _ {} \;
-
-            if [ "${MX_B}" == "qemu64" ]; then
-               echo "The default boot selection will start in" > out/gcc-${MX_TC}/${BUILD_TYPE}/qemu64/startup-qemu-aarch64.nsh
-               echo "Image console=ttyAMA0 root=/dev/vda2 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel" >> out/gcc-${MX_TC}/${BUILD_TYPE}/qemu64/startup-qemu-aarch64.nsh
-            fi
-
-            IMAGE_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/linux-leg/lastSuccessfulBuild/buildNumber`
-            cat << EOF > lava_job_definition_parameters
-            IMAGE_URL=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/vexpress64-leg-sd.img.gz
-            STARTUP_NSH=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/startup.nsh
-            EOF
-
-            # Publish to snapshots
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --link-latest \
-              out components/kernel/${JOB_NAME}/${BUILD_NUMBER}
-        - inject:
-            properties-file: lava_job_definition_parameters
-
-
-###############################################################################
-# qemu64 iSCSI boot
-###############################################################################
-        - shell: |
-            #!/bin/bash
-
-            # Test only valid for qemu64
-            if [ "${MX_B}" != "qemu64" ]; then
-               echo "Missing post_build_lava_parameters_qemu_iscsi_in_kvm file is expected"
-               exit 0
-            fi
-            DEVICE_TYPE=kvm
-            # Convert MX_TYPE to lower case for use in path
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            if [ "${MX_TYPE}" == "DEBUG" ];then
-                PREFIX="debug-"
-            else
-                PREFIX=""
-            fi
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            QEMU_EFI_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/qemu64/${PREFIX}QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-test-case\" : \"qemu64-iscsi\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-job\" : \"edk2-prep-matrix\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-matrix-type\" : \"${MX_TC},${MX_B},${MX_TYPE}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TC\" : \"${MX_TC}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_B\" : \"${MX_B}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TYPE\" : \"${MX_TYPE}\",|"  \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-
-###############################################################################
-# FVP base GRUB install
-###############################################################################
-        - shell: |
-            #!/bin/bash
-
-            # Test only valid for fvp-base-armbds
-            if [ "${MX_B}" != "fvp-base-armbds" ]; then
-               echo "Missing post_build_lava_parameters_grub_install file is expected"
-               exit 0
-            fi
-            DEVICE_TYPE=rtsm_fvp_base-aemv8a
-            # Convert MX_TYPE to lower case for use in path
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            BL1_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/fip.bin
-            INITRD_URL=http://releases.linaro.org/14.12/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20141212-729.rootfs.cpio.gz
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-test-case\" : \"fvp-grub-install\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-job\" : \"edk2-prep-matrix\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-matrix-type\" : \"${MX_TC},${MX_B},${MX_TYPE}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TC\" : \"${MX_TC}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_B\" : \"${MX_B}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TYPE\" : \"${MX_TYPE}\",|"  \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-grub-install.json \
-                > custom_lava_job_definition_grub_install.json
-
-            cat << EOF > post_build_lava_parameters_grub_install
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_grub_install.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_grub_install
-              block: true
-
-
-###############################################################################
-# FVP base startup_boot
-###############################################################################
-        - shell: |
-            #!/bin/bash
-            # Test only valid for fvp-base-armbds
-            if [ "${MX_B}" != "fvp-base-armbds" ]; then
-               echo "Missing post_build_lava_parameters_startup_boot file is expected"
-               exit 0
-            fi
-            DEVICE_TYPE=rtsm_fvp_base-aemv8a
-            # Convert MX_TYPE to lower case for use in path
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            BL1_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-test-case\" : \"fvp-startup-boot\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-job\" : \"edk2-prep-matrix\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-matrix-type\" : \"${MX_TC},${MX_B},${MX_TYPE}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TC\" : \"${MX_TC}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_B\" : \"${MX_B}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TYPE\" : \"${MX_TYPE}\",|"  \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-startup-boot.json \
-                > custom_lava_job_definition_startup_boot.json
-
-            cat << EOF > post_build_lava_parameters_startup_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_startup_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_startup_boot
-              block: true
-
-###############################################################################
-# FVP base menu boot
-###############################################################################
-
-        - shell: |
-            #!/bin/bash
-            # Test only valid for fvp-base-armbds
-            if [ "${MX_B}" != "fvp-base-armbds" ]; then
-               echo "Missing post_build_lava_parameters_menu_boot file is expected"
-               exit 0
-            fi
-            DEVICE_TYPE=rtsm_fvp_base-aemv8a
-            # Convert MX_TYPE to lower case for use in path
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            BL1_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-test-case\" : \"fvp-menu-boot\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-job\" : \"edk2-prep-matrix\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-matrix-type\" : \"${MX_TC},${MX_B},${MX_TYPE}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TC\" : \"${MX_TC}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_B\" : \"${MX_B}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TYPE\" : \"${MX_TYPE}\",|"  \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot.json \
-                > custom_lava_job_definition_menu_boot.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot
-              block: true
-
-###############################################################################
-# FVP base menu boot w/initrd
-###############################################################################
-
-        - shell: |
-            #!/bin/bash
-            # Test only valid for fvp-base-armbds
-            if [ "${MX_B}" != "fvp-base-armbds" ]; then
-               echo "Missing post_build_lava_parameters_menu_boot_with_initrd file is expected"
-               exit 0
-            fi
-            DEVICE_TYPE=rtsm_fvp_base-aemv8a
-            # Convert MX_TYPE to lower case for use in path
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            INITRD_URL=http://releases.linaro.org/14.12/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20141212-729.rootfs.cpio.gz
-            BL1_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-test-case\" : \"fvp-menu-boot-initrd\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-job\" : \"edk2-prep-matrix\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-matrix-type\" : \"${MX_TC},${MX_B},${MX_TYPE}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TC\" : \"${MX_TC}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_B\" : \"${MX_B}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TYPE\" : \"${MX_TYPE}\",|"  \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot-with-initrd.json \
-                > custom_lava_job_definition_menu_boot_with_initrd.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot_with_initrd
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot_with_initrd.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot_with_initrd
-              block: true
-
-###############################################################################
-# qemu64 parameters
-###############################################################################
-
-        - shell: |
-            #!/bin/bash
-
-            echo "Skipping tests on staging.linaro.org during downtime"
-            exit 0
-            # Test only valid for qemu64
-            if [ "${MX_B}" != "qemu64" ]; then
-               echo "Missing post_build_lava_parameters_qemu_aarch64_uefi file is expected"
-               exit 0
-            fi
-            DEVICE_TYPE=qemu-aarch64
-            # Convert MX_TYPE to lower case for use in path
-            BUILD_TYPE="${MX_TYPE,,}"
-
-            # qemu-aarch64 not available in production yet.
-            BUNDLE_STREAM_NAME=/anonymous/debug/
-            LAVA_SERVER=staging.validation.linaro.org/RPC2/
-
-            QEMU_EFI_URL=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/qemu64/${PREFIX}QEMU_EFI.img.gz
-            STARTUP_NSH=https://snapshots.linaro.org/components/kernel/linaro-edk2-prep-matrix/${BUILD_NUMBER}/gcc-${MX_TC}/${BUILD_TYPE}/qemu64/startup-qemu-aarch64.nsh
-
-            QEMU_PFLASH_URL=http://people.linaro.org/~fu.wei/LAVA/test/QEMU/flash1.uefishell.qemu.gz
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${QEMU_PFLASH_URL}|${QEMU_PFLASH_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-test-case\" : \"qemu64-uefi-rtc\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-job\" : \"edk2-prep-matrix\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"edk2-matrix-type\" : \"${MX_TC},${MX_B},${MX_TYPE}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TC\" : \"${MX_TC}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_B\" : \"${MX_B}\",|"  \
-                -e "s|\"metadata\": {|\"metadata\": {\n        \"MX_TYPE\" : \"${MX_TYPE}\",|"  \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template.json \
-                > custom_lava_job_definition_qemu_aarch64_uefi.json
-
-            cat << EOF > post_build_lava_parameters_qemu_aarch64_uefi
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_aarch64_uefi.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_aarch64_uefi
-              block: true
-
diff --git a/linaro-edk2-prep.yaml b/linaro-edk2-prep.yaml
deleted file mode 100644
index 34df0eec10..0000000000
--- a/linaro-edk2-prep.yaml
+++ /dev/null
@@ -1,580 +0,0 @@
-- job:
-    name: linaro-edk2-prep
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/leg-edk2/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'rtsm_fvp_base-aemv8a'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: INITRD_URL
-            default: 'http://releases.linaro.org/14.12/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20141212-729.rootfs.cpio.gz'
-        - string:
-            name: PUB_DEST
-            default: 'components/kernel/linaro-edk2-prep/${AARCH64_TOOLCHAIN}/${BUILD_NUMBER}'
-        - string:
-            name: SCT
-            default: '1'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro EDK II - UEFI Continuous Integration (pre-release)'
-    scm:
-        - git:
-            url: http://git.linaro.org/git/uefi/linaro-edk2.git
-            refspec: +refs/heads/release-prep:refs/remotes/origin/release-prep
-            name: origin
-            branches:
-                - refs/heads/release-prep
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    axes:
-        - axis:
-            type: user-defined
-            name: AARCH64_TOOLCHAIN
-            values:
-                - GCC49
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-            # PRIVATE_KEY user id
-                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf uefi-ci uefi-tools
-              rm -rf linaro-edk2-prep-build
-              rm -rf out
-            }
-
-            # Use pre-installed linaro toolchain
-            [ ${AARCH64_TOOLCHAIN} == "GCC48" ] && export PATH="${HOME}/srv/toolchain/arm-tc-14.04/bin:${HOME}/srv/toolchain/arm64-tc-14.04/bin:$PATH"
-            [ ${AARCH64_TOOLCHAIN} == "GCC49" ] && export PATH="${HOME}/srv/toolchain/arm-tc-15.02/bin:${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-            export AARCH32_TOOLCHAIN=${AARCH64_TOOLCHAIN}
-
-            git clone git://git.linaro.org/uefi/uefi-tools.git
-            git clone git://git.linaro.org/ci/uefi.git uefi-ci
-            JOB_NAME=linaro-edk2-prep bash -x uefi-ci/uefi.sh
-
-            builddir=${WORKSPACE}/linaro-edk2-prep-build
-            outdir=${WORKSPACE}/out
-            mkdir -p ${outdir}
-            mv ${builddir}/* ${outdir}/
-            find ${outdir}/ -name '*QEMU_EFI.fd' -exec bash -c 'in=${1}; out=${in%fd}img; cat $in /dev/zero | dd iflag=fullblock bs=1M count=64 of=$out; gzip -9 $out' _ {} \;
-
-            cat << EOF > out/startup-qemu-aarch64.nsh
-            echo "The default boot selection will start in"
-            Image console=ttyAMA0 root=/dev/vda2 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-
-            cat > out/BUILD-INFO.txt << EOF
-            Format-Version: 0.5
-
-            Files-Pattern: *.bin, *.fd, *.nsh, *.txt, QEMU_EFI.img.gz, edk2-*.tar.bz2
-            License-Type: open
-
-            Files-Pattern: SctPackage*
-            License-Type: protected
-            Auth-Groups: uefi-maintainers
-            EOF
-
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out ${PUB_DEST}
-
-            IMAGE_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/linux-leg/lastSuccessfulBuild/buildNumber`
-            cat << EOF > lava_job_definition_parameters
-            IMAGE_URL=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/vexpress64-leg-sd.img.gz
-            STARTUP_NSH=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/startup.nsh
-            EOF
-        - inject:
-            properties-file: lava_job_definition_parameters
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-grub-install.json \
-                > custom_lava_job_definition_grub_install.json
-
-            cat << EOF > post_build_lava_parameters_grub_install
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_grub_install.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_grub_install
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-startup-boot.json \
-                > custom_lava_job_definition_startup_boot.json
-
-            cat << EOF > post_build_lava_parameters_startup_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_startup_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_startup_boot
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot.json \
-                > custom_lava_job_definition_menu_boot.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot-with-initrd.json \
-                > custom_lava_job_definition_menu_boot_with_initrd.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot_with_initrd
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot_with_initrd.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot_with_initrd
-              block: true
-        - shell: |
-            DEVICE_TYPE=kvm
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/release/qemu64/QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-        - shell: |
-            DEVICE_TYPE=kvm
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/qemu64/debug-QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-        - shell: |
-            DEVICE_TYPE=qemu-aarch64
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/release/qemu64/QEMU_EFI.img.gz
-            QEMU_PFLASH_URL=http://people.linaro.org/~fu.wei/LAVA/test/QEMU/flash1.uefishell.qemu.gz
-            STARTUP_NSH=https://snapshots.linaro.org/${PUB_DEST}/startup-qemu-aarch64.nsh
-
-            BUNDLE_STREAM_NAME=/anonymous/debug/
-            LAVA_SERVER=staging.validation.linaro.org/RPC2/
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${QEMU_PFLASH_URL}|${QEMU_PFLASH_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/qemu-aarch64/template.json \
-                > custom_lava_job_definition_qemu_aarch64_uefi.json
-
-            cat << EOF > post_build_lava_parameters_qemu_aarch64_uefi
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_aarch64_uefi.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_aarch64_uefi
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-grub-install.json \
-                > custom_lava_job_definition_grub_install.json
-
-            cat << EOF > post_build_lava_parameters_grub_install
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_grub_install.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_grub_install
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-startup-boot.json \
-                > custom_lava_job_definition_startup_boot.json
-
-            cat << EOF > post_build_lava_parameters_startup_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_startup_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_startup_boot
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot.json \
-                > custom_lava_job_definition_menu_boot.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot-with-initrd.json \
-                > custom_lava_job_definition_menu_boot_with_initrd.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot_with_initrd
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot_with_initrd.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot_with_initrd
-              block: true
-        - shell: |
-            DEVICE_TYPE=kvm
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/qemu64/QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-        - shell: |
-            DEVICE_TYPE=kvm
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/qemu64/debug-QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-        - shell: |
-            DEVICE_TYPE=qemu-aarch64
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/qemu64/QEMU_EFI.img.gz
-            QEMU_PFLASH_URL=http://people.linaro.org/~fu.wei/LAVA/test/QEMU/flash1.uefishell.qemu.gz
-            STARTUP_NSH=https://snapshots.linaro.org/${PUB_DEST}/startup-qemu-aarch64.nsh
-
-            BUNDLE_STREAM_NAME=/anonymous/debug/
-            LAVA_SERVER=staging.validation.linaro.org/RPC2/
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${QEMU_PFLASH_URL}|${QEMU_PFLASH_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2-prep/lava-job-definitions/qemu-aarch64/template.json \
-                > custom_lava_job_definition_qemu_aarch64_uefi.json
-
-            cat << EOF > post_build_lava_parameters_qemu_aarch64_uefi
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_aarch64_uefi.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_aarch64_uefi
-              block: true
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def matcher = manager.getLogMatcher("^fail\t.*")
-                if (matcher?.matches()) {
-                  resultFailCount = matcher.group(0).split("\t")[1].toInteger()
-                  if (resultFailCount > 0) {
-                    manager.buildUnstable()
-                  }
-                }
-        - email:
-            recipients: 'leif.lindholm@linaro.org fathi.boudra@linaro.org'
diff --git a/linaro-edk2.yaml b/linaro-edk2.yaml
deleted file mode 100644
index a6cd4cf692..0000000000
--- a/linaro-edk2.yaml
+++ /dev/null
@@ -1,339 +0,0 @@
-- job:
-    name: linaro-edk2
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            leif.lindholm@linaro.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/leg-edk2/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'rtsm_fvp_base-aemv8a'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: INITRD_URL
-            default: 'http://releases.linaro.org/14.12/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20141212-729.rootfs.cpio.gz'
-        - string:
-            name: PUB_DEST
-            default: 'components/kernel/${JOB_NAME}/${BUILD_NUMBER}'
-        - string:
-            name: SCT
-            default: '1'
-    disabled: false
-    node: build
-    display-name: 'Linaro EDK II - UEFI Continuous Integration'
-    scm:
-        - git:
-            url: http://git.linaro.org/git/uefi/linaro-edk2.git
-            refspec: +refs/heads/release:refs/remotes/origin/release
-            name: origin
-            branches:
-                - refs/heads/release
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-            # PRIVATE_KEY user id
-                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf uefi-ci uefi-tools
-              rm -rf ${JOB_NAME}-build
-              rm -rf out
-            }
-
-            # Use pre-installed linaro toolchain
-            export PATH="${HOME}/srv/toolchain/arm-tc-15.02/bin:${HOME}/srv/toolchain/arm64-tc-15.02/bin:$PATH"
-
-            git clone git://git.linaro.org/uefi/uefi-tools.git
-            git clone git://git.linaro.org/ci/uefi.git uefi-ci
-            bash -x uefi-ci/uefi.sh
-
-            builddir=${WORKSPACE}/${JOB_NAME}-build
-            outdir=${WORKSPACE}/out
-            mkdir -p ${outdir}
-            mv ${builddir}/* ${outdir}/
-            find ${outdir}/ -name '*QEMU_EFI.fd' -exec bash -c 'in=${1}; out=${in%fd}img; cat $in /dev/zero | dd iflag=fullblock bs=1M count=64 of=$out; gzip -9 $out' _ {} \;
-
-            cat << EOF > out/startup-qemu-aarch64.nsh
-            echo "The default boot selection will start in"
-            Image console=ttyAMA0 root=/dev/vda2 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-
-            cat > out/BUILD-INFO.txt << EOF
-            Format-Version: 0.5
-
-            Files-Pattern: *.bin, *.fd, *.nsh, *.txt, QEMU_EFI.img.gz, edk2-*.tar.bz2
-            License-Type: open
-
-            Files-Pattern: SctPackage*
-            License-Type: protected
-            Auth-Groups: uefi-maintainers
-            EOF
-
-            time python ${HOME}/bin/linaro-cp \
-              --api_version 3 \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out ${PUB_DEST}
-
-            IMAGE_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/linux-leg/lastSuccessfulBuild/buildNumber`
-            cat << EOF > lava_job_definition_parameters
-            IMAGE_URL=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/vexpress64-leg-sd.img.gz
-            STARTUP_NSH=http://snapshots.linaro.org/kernel-hwpack/linux-leg-vexpress64/${IMAGE_BUILD_NUMBER}/startup.nsh
-            EOF
-        - inject:
-            properties-file: lava_job_definition_parameters
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/${DEVICE_TYPE}/template-grub-install.json \
-                > custom_lava_job_definition_grub_install.json
-
-            cat << EOF > post_build_lava_parameters_grub_install
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_grub_install.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_grub_install
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/${DEVICE_TYPE}/template-startup-boot.json \
-                > custom_lava_job_definition_startup_boot.json
-
-            cat << EOF > post_build_lava_parameters_startup_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_startup_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_startup_boot
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot.json \
-                > custom_lava_job_definition_menu_boot.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot
-              block: true
-        - shell: |
-            BL1_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/bl1.bin
-            FIP_URL=https://snapshots.linaro.org/${PUB_DEST}/release/fvp-base-armbds/fip.bin
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/${DEVICE_TYPE}/template-menu-boot-with-initrd.json \
-                > custom_lava_job_definition_menu_boot_with_initrd.json
-
-            cat << EOF > post_build_lava_parameters_menu_boot_with_initrd
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_menu_boot_with_initrd.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_menu_boot_with_initrd
-              block: true
-        - shell: |
-            DEVICE_TYPE=kvm
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/release/qemu64/QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-        - shell: |
-            DEVICE_TYPE=kvm
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/debug/qemu64/debug-QEMU_EFI.fd
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/kvm/template-qemu-iscsi-in-kvm.json \
-                > custom_lava_job_definition_qemu_iscsi_in_kvm.json
-
-            cat << EOF > post_build_lava_parameters_qemu_iscsi_in_kvm
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_iscsi_in_kvm.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_iscsi_in_kvm
-              block: true
-        - shell: |
-            DEVICE_TYPE=qemu-aarch64
-            QEMU_EFI_URL=https://snapshots.linaro.org/${PUB_DEST}/release/qemu64/QEMU_EFI.img.gz
-            QEMU_PFLASH_URL=http://people.linaro.org/~fu.wei/LAVA/test/QEMU/flash1.uefishell.qemu.gz
-            STARTUP_NSH=https://snapshots.linaro.org/${PUB_DEST}/startup-qemu-aarch64.nsh
-
-            BUNDLE_STREAM_NAME=/anonymous/debug/
-            LAVA_SERVER=staging.validation.linaro.org/RPC2/
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${QEMU_EFI_URL}|${QEMU_EFI_URL}|" \
-                -e "s|\${QEMU_PFLASH_URL}|${QEMU_PFLASH_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linaro-edk2/lava-job-definitions/qemu-aarch64/template.json \
-                > custom_lava_job_definition_qemu_aarch64_uefi.json
-
-            cat << EOF > post_build_lava_parameters_qemu_aarch64_uefi
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}ws/custom_lava_job_definition_qemu_aarch64_uefi.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_qemu_aarch64_uefi
-              block: true
-    publishers:
-        - email:
-            recipients: 'leif.lindholm@linaro.org fathi.boudra@linaro.org'
diff --git a/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml b/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
index 46622e5049..a3aa50b7ee 100644
--- a/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
+++ b/linaro-hikey-stable-rc-4.4-merge-and-tag.yaml
@@ -11,7 +11,7 @@
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Linaro HiKey Stable RC 4.4 Merge-and-Tag'
     scm:
         - git:
diff --git a/linux-arm-soc-for-next.yaml b/linux-arm-soc-for-next.yaml
deleted file mode 100644
index 65a61be670..0000000000
--- a/linux-arm-soc-for-next.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-- job:
-    name: linux-arm-soc-for-next
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - file:
-            name: defconfig.properties
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: linaro-kernel-ci
-    child-workspace: .
-    display-name: 'Linux ARM SoC Kernel (for-next)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
-            refspec: +refs/heads/for-next:refs/remotes/origin/for-next
-            name: origin
-            branches: 
-                - refs/heads/for-next
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-                - arm64
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        combination-filter: |
-            (ARCH=="arm" && defconfig!="defconfig") || (ARCH=="arm64" && defconfig=="defconfig")
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -rf configs
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS 
-            export use_ccache=true
-            export make_silent=true
-            export make_deb=false
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export kernel_config="${defconfig}_defconfig"
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            [ "${ARCH}" = "arm64" ] && export kernel_config="${defconfig}"
-            [ "${ARCH}" = "arm64" ] && {
-              export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-              export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-            }
-
-            # XXX work around vexpress defconfig
-            #echo "CONFIG_DEVTMPFS=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_DEVTMPFS_MOUNT=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_REGULATOR=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_REGULATOR_VEXPRESS=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_EXT4_FS=y" >> arch/arm/configs/vexpress_defconfig
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # XXX b2120 vmlinux
-            [ "${defconfig}" = "multi_v7" ] && cp -a builddir-*-${kernel_flavour}/vmlinux out/ || true
-            # XXX mustang uImage
-            [ "${ARCH}" = "arm64" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-arm-soc-for-next/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Start LAVA dance
-            test -d configs || git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            export BUNDLE_STREAM_NAME=/anonymous/fabo/
-            export LAVA_SERVER=validation.linaro.org/RPC2/
-            export KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/linux-arm-soc-for-next/${defconfig}/${BUILD_NUMBER}
-            export DTB_URL=${KERNEL_URL}/dtbs
-            export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20141121-301.rootfs.tar.gz
-            [ "${ARCH}" = "arm64" ] && export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv8/linaro-image-minimal-genericarmv8-20141122-721.rootfs.tar.gz
-
-            # Hack to use submit LAVA jobs directly
-            python lci-build-tools/dtb-to-device.py
diff --git a/linux-eas.yaml b/linux-eas.yaml
deleted file mode 100644
index 112ff9aa4a..0000000000
--- a/linux-eas.yaml
+++ /dev/null
@@ -1,173 +0,0 @@
-- job:
-    name: linux-eas
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - file:
-            name: defconfig.properties
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/eas/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: ROOTFS_BUILD_URL
-            default: 'http://releases.linaro.org/14.12/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20141212-311.rootfs.tar.gz'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linux EAS'
-    scm:
-        - git:
-            url: http://git.linaro.org/kernel/eas-backports.git
-            refspec: +refs/heads/eas-test:refs/remotes/origin/eas-test
-            name: origin
-            branches: 
-                - refs/heads/eas-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        combination-filter: |
-            (ARCH=="arm" && defconfig!="defconfig") || (ARCH=="arm64" && defconfig=="defconfig")
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS 
-            export use_ccache=true
-            export make_silent=false
-            export make_deb=true
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export kernel_config="${defconfig}_defconfig"
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${defconfig}" in
-              omap2plus)
-                export hwpack_type="panda"
-                export kernel_flavour="omap"
-                export DEVICE_TYPE="panda-es"
-                unset kernel_config
-                export use_config_fragment=1
-                export conf_filenames="arch/arm/configs/${defconfig}_defconfig linaro/configs/workaround.conf"
-                # XXX workaround omap2plus defconfig
-                mkdir -p linaro/configs
-                cat << EOF > linaro/configs/workaround.conf
-            CONFIG_USB_EHCI_HCD=y
-            CONFIG_USB_OHCI_HCD=y
-            EOF
-                ;;
-              vexpress)
-                export hwpack_type="vexpress"
-                export kernel_flavour="vexpress"
-                export DEVICE_TYPE="vexpress-tc2"
-                unset kernel_config
-                export use_config_fragment=1
-                export conf_filenames="arch/arm/configs/${defconfig}_defconfig linaro/configs/workaround.conf"
-                # XXX workaround vexpress defconfig
-                mkdir -p linaro/configs
-                cat << EOF > linaro/configs/workaround.conf
-            CONFIG_DEVTMPFS=y
-            CONFIG_DEVTMPFS_MOUNT=y
-            CONFIG_REGULATOR=y
-            CONFIG_REGULATOR_VEXPRESS=y
-            CONFIG_EXT4_FS=y
-            EOF
-                ;;
-            esac
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            [ "${defconfig}" = "omap2plus" ] && mkimage -A arm -O linux -C none -T kernel -a 0x80008000 -e 0x80008000 -n Linux -d out/zImage out/uImage
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-eas/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/linux-eas/${defconfig}/${BUILD_NUMBER}
-            DTB_URL=${KERNEL_URL}/dtbs
-            HWPACK_BUILD_URL=${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}_*_armhf_supported.tar.gz |xargs basename`
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            ./lci-build-tools/yaml-to-json.py configs/linux-eas/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-
-            rm -rf lci-build-tools
-            rm -rf configs
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'alex.shi@linaro.org fathi.boudra@linaro.org'
diff --git a/linux-ilp32.yaml b/linux-ilp32.yaml
deleted file mode 100644
index 95bb3172ac..0000000000
--- a/linux-ilp32.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: linux-ilp32
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 7
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'Linux ARM64 (ilp32)'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
-            refspec: +refs/heads/staging/ilp32-4.12:refs/remotes/origin/staging/ilp32-4.12
-            name: origin
-            basedir: linux
-            branches:
-                - refs/heads/staging/ilp32-4.12
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            cd linux
-            make defconfig
-            make -j10 deb-pkg
-            cd ..
-
-            cat > params <<EOF
-            source=${BUILD_URL}/artifact/$(echo *.dsc)
-            repo=TCWG:ilp32
-            EOF
-    publishers:
-        - archive:
-            artifacts: '*.dsc, *.gz, *.deb'
-        - trigger-parameterized-builds:
-            - project: build-package-obs
-              property-file: params
-              condition: SUCCESS
diff --git a/linux-kvm.yaml b/linux-kvm.yaml
deleted file mode 100644
index ce3afb193c..0000000000
--- a/linux-kvm.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-- job:
-    name: linux-kvm
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: true
-    display-name: 'Linaro KVM image builds'
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - juno
-                - mustang
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-    triggers:
-        - timed: 'H(0-30) H(9-11) * * *'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            rm -rf kvm-ci
-            git clone git://git.linaro.org/ci/kvm-ci.git kvm-ci
-            bash ./kvm-ci/jenkins-run
-
-            # Publish
-            mkdir out
-            mv *.gz uImage* Image* zImage* *.dtb *.deb out/ ||true
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out ubuntu/images/kvm/${hwpack}/${BUILD_NUMBER}
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/linux-leg.yaml b/linux-leg.yaml
deleted file mode 100644
index a543caacc4..0000000000
--- a/linux-leg.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-- job:
-    name: linux-leg
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/leg-kernel/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'rtsm_fvp_base-aemv8a'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: INITRD_URL
-            default: 'http://releases.linaro.org/14.12/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20141212-729.rootfs.cpio.gz'
-        - string:
-            name: BL1_URL
-            default: 'http://releases.linaro.org/15.05/components/kernel/uefi-linaro/release/fvp-base-armbds/bl1.bin'
-        - string:
-            name: FIP_URL
-            default: 'http://releases.linaro.org/15.05/components/kernel/uefi-linaro/release/fvp-base-armbds/fip.bin'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'LEG Kernel'
-    scm:
-        - git:
-            url: git://git.linaro.org/leg/acpi/leg-kernel.git
-            refspec: +refs/heads/leg-kernel:refs/remotes/origin/leg-kernel
-            name: origin
-            branches:
-                - refs/heads/leg-kernel
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - vexpress64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-            }
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y python-requests python-beautifulsoup python-html2text
-
-            export LANG=C
-            export make_install=true
-            export hwpack_type=vexpress64
-            export board_types=${DEVICE_TYPE}
-            export kernel_flavour=vexpress64
-            export use_config_fragment=1
-            export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/vexpress64.conf linaro/configs/distribution.conf linaro/configs/acpi.conf linaro/configs/efi.conf"
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.11/bin"
-            export toolchain_url="https://releases.linaro.org/components/toolchain/binaries/5.2-2015.11-2/aarch64-linux-gnu/gcc-linaro-5.2-2015.11-2-x86_64_aarch64-linux-gnu.tar.xz"
-            export rootfs_arch=armv8
-            export rootfs_type=lamp
-
-            test -d lci-build-tools || git clone https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # Get rootfs
-            rm -f linaro-image-${rootfs_type}-generic*.tar.gz
-            export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-${rootfs_arch}-rootfs/gcc_version=5.2,label=build,rootfs=${rootfs_type}/lastSuccessfulBuild/buildNumber`
-            export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-${rootfs_arch}-rootfs/gcc_version=5.2,label=build,rootfs=${rootfs_type}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-            export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/${rootfs_type}-${rootfs_arch}-gcc-5.2/${ROOTFS_BUILD_NUMBER}/linaro-image-${rootfs_type}-generic${rootfs_arch}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-            wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-            # Create pre-built image(s)
-            linaro-media-create --dev fastmodel --output-directory ${WORKSPACE} --image-size 2G --binary linaro-image-${rootfs_type}-generic${rootfs_arch}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz --hwpack hwpack_linaro-${hwpack_type}*.tar.gz --hwpack-force
-
-            # Compress image(s)
-            mv sd.img ${hwpack}-leg-sd.img
-            gzip -9 ${hwpack}-leg-sd.img
-
-            mv hwpack_* out/
-            mv ${hwpack}-leg-sd.img.gz out/
-            mv *.bin out/
-
-            cat << EOF > out/startup.nsh
-            Image console=ttyAMA0 earlycon=pl011,0x1c090000 root=/dev/vda2 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel acpi=force
-            EOF
-
-            # Publish to snapshots
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out kernel-hwpack/linux-leg-${hwpack}/${BUILD_NUMBER}
-
-            cat << EOF > lava_job_definition_parameters
-            IMAGE_URL=http://snapshots.linaro.org/kernel-hwpack/linux-leg-${hwpack}/${BUILD_NUMBER}/${hwpack}-leg-sd.img.gz
-            STARTUP_NSH=http://snapshots.linaro.org/kernel-hwpack/linux-leg-${hwpack}/${BUILD_NUMBER}/startup.nsh
-            EOF
-        - inject:
-            properties-file: lava_job_definition_parameters
-        - shell: |
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linux-leg/lava-job-definitions/${DEVICE_TYPE}/template.json \
-                > custom_lava_job_definition.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linux-leg/lava-job-definitions/${DEVICE_TYPE}/template-grub-install.json \
-                > custom_lava_job_definition_grub_install.json
-
-            cat << EOF > post_build_lava_parameters_grub_install
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition_grub_install.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_grub_install
-              block: true
-        - shell: |
-            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${BL1_URL}|${BL1_URL}|" \
-                -e "s|\${FIP_URL}|${FIP_URL}|" \
-                -e "s|\${INITRD_URL}|${INITRD_URL}|" \
-                -e "s|\${STARTUP_NSH}|${STARTUP_NSH}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${GIT_BRANCH}|${GIT_BRANCH}|" \
-                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
-                -e "s|\${GIT_URL}|${GIT_URL}|" \
-                -e "s|\${IMAGE_URL}|${IMAGE_URL}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                < configs/linux-leg/lava-job-definitions/${DEVICE_TYPE}/template-acpi.json \
-                > custom_lava_job_definition_acpi.json
-
-            cat << EOF > post_build_lava_parameters_acpi
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition_acpi.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters_acpi
-              block: true
-    publishers:
-        - email:
-            recipients: 'graeme.gregory@linaro.org fathi.boudra@linaro.org'
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge.yaml
deleted file mode 100644
index 03a3f009ae..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.10-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.10-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v3.10-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10-test:refs/remotes/origin/linux-linaro-lsk-v3.10-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.10-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - mustang
-                - panda
-                - vexpress
-                - vexpress-be
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress)
-                export hwpack_type="vexpress"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="vexpress"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress-be)
-                export hwpack_type="lsk-vexpress-be"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="lsk-vexpress-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf linaro/configs/bigendian.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.10-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.10-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                echo "Skip"
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index f30597f1a4..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index 2c44be96f1..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 066779b185..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index 2b56a83b9b..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 9eecec4ddd..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index 0e48350190..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index d8b62f488d..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 8255a6f87d..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template.json
deleted file mode 100644
index 67467752d9..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 9f14e12ab9..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index aca212bcc0..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index 4eaa3eb1f6..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index d77750e109..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 9a8a14c22c..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index da4b2d57d5..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 595004725d..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 7200, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index d6509dd80f..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template-be.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template-be.json
deleted file mode 100644
index 521d024b0b..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template-be.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template-be.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template-be.yaml
deleted file mode 100644
index 23c1406c68..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template-be.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template.json b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template.json
deleted file mode 100644
index a8662cf096..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template.json
+++ /dev/null
@@ -1,465 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart-install.yaml"
-          }
-        ],
-        "timeout": 18000
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/device-tree.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/network-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-         "testdef_repos": [
-           {
-             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-           }
-         ],
-        "timeout": 10800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-       }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/iks-smoke-test.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bL_iks_tests.yaml"
-          }
-        ],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template.yaml b/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template.yaml
deleted file mode 100644
index 1c3ebbe0bf..0000000000
--- a/linux-linaro-stable-lsk-v3.10-pre-merge/lava-job-definitions/vexpress-tc2/template.yaml
+++ /dev/null
@@ -1,261 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart-install.yaml
-    timeout: 18000
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/device-tree.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/network-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-      testdef: ubuntu/ltp.yaml
-    timeout: 10800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/iks-smoke-test.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bL_iks_tests.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.10-rt-pre-merge.yaml b/linux-linaro-stable-lsk-v3.10-rt-pre-merge.yaml
deleted file mode 100644
index a79e6f5f34..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt-pre-merge.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.10-rt-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.10-rt-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v3.10-rt-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10-rt-test:refs/remotes/origin/linux-linaro-lsk-v3.10-rt-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.10-rt-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.10-rt-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.10-rt-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 093a933a5b..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index c74d624a5d..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,221 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 570422365c..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index a713019097..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10-rt.yaml b/linux-linaro-stable-lsk-v3.10-rt.yaml
deleted file mode 100644
index 32ddc8441e..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.10-rt
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.10-rt/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v3.10-rt)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10-rt:refs/remotes/origin/linux-linaro-lsk-v3.10-rt
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.10-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.10-rt-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.10-rt-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 342a9daa25..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,418 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index 89ddbc95c9..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,227 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index fb5971a513..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index 04803a7dfa..0000000000
--- a/linux-linaro-stable-lsk-v3.10-rt/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.10.yaml b/linux-linaro-stable-lsk-v3.10.yaml
deleted file mode 100644
index e8973f48ee..0000000000
--- a/linux-linaro-stable-lsk-v3.10.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.10
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.10/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v3.10)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10:refs/remotes/origin/linux-linaro-lsk-v3.10
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.10
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - mustang
-                - panda
-                - vexpress
-                - vexpress-be
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress)
-                export hwpack_type="vexpress"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="vexpress"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress-be)
-                export hwpack_type="lsk-vexpress-be"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="lsk-vexpress-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf linaro/configs/bigendian.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-MP.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.10-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.10-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                echo "Skip"
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.10/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template.json
deleted file mode 100644
index ed72474b92..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index 8f4dd6da1e..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
-
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 87c65bed0b..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,517 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index f7d4d63360..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index bc7cce64d9..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index c17e4a144c..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,283 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index 5c4e63c09b..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 652b7616b3..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template.json
deleted file mode 100644
index f23e05e481..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,511 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.10"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 4aff27d3e6..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,281 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.10
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index aca212bcc0..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index 4fc5a8e422..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 40cc7f088b..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 35dc12f2e3..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index c5d72872c6..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 2400
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index f66a9bc49b..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,149 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index 29ea6b310f..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template-be.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template-be.json
deleted file mode 100644
index 521d024b0b..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template-be.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template-be.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template-be.yaml
deleted file mode 100644
index 23c1406c68..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template-be.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template.json b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template.json
deleted file mode 100644
index e59427c251..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template.json
+++ /dev/null
@@ -1,477 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart-install.yaml"
-          }
-        ],
-        "timeout": 18000
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/device-tree.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters":
-        {
-            "testdef_repos": [
-            {
-                "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                "testdef": "ubuntu/usb-test-basic.yaml"
-            }],
-            "timeout": 1200
-        }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/network-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-         "testdef_repos": [
-           {
-             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-           }
-         ],
-        "timeout": 10800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-       }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/iks-smoke-test.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bL_iks_tests.yaml"
-          }
-        ],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template.yaml b/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template.yaml
deleted file mode 100644
index 8c74fd66d3..0000000000
--- a/linux-linaro-stable-lsk-v3.10/lava-job-definitions/vexpress-tc2/template.yaml
+++ /dev/null
@@ -1,267 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart-install.yaml
-    timeout: 18000
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/device-tree.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/network-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-      testdef: ubuntu/ltp.yaml
-    timeout: 10800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/iks-smoke-test.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bL_iks_tests.yaml
-    timeout: 3600
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 2400
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge.yaml
deleted file mode 100644
index 79de45cf8e..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge.yaml
+++ /dev/null
@@ -1,294 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.14-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.14-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v3.14-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14-test:refs/remotes/origin/linux-linaro-lsk-v3.14-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.14-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - mustang
-                - panda
-                - vexpress
-                - vexpress-be
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/omap2plus_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress)
-                export hwpack_type="vexpress"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="vexpress"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/booting-test.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress-be)
-                export hwpack_type="lsk-vexpress-be"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="lsk-vexpress-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf linaro/configs/bigendian.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.14-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.14-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                echo "Skip"
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 1ff0cec88d..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index f0a55a60f5..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 977812b0ca..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 2ba1a3a602..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 066779b185..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index 2b56a83b9b..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 9eecec4ddd..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index 0e48350190..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index d8b62f488d..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 8255a6f87d..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template.json
deleted file mode 100644
index 67467752d9..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 9f14e12ab9..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index aca212bcc0..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index 4eaa3eb1f6..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index d77750e109..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 9a8a14c22c..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index da4b2d57d5..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 595004725d..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 7200, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index d6509dd80f..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template-be.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template-be.json
deleted file mode 100644
index 521d024b0b..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template-be.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template-be.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template-be.yaml
deleted file mode 100644
index 23c1406c68..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template-be.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template.json b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template.json
deleted file mode 100644
index 8552b5a00c..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template.json
+++ /dev/null
@@ -1,453 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/alldebug-kernel.yaml"
-          }
-        ],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart-install.yaml"
-          }
-        ],
-        "timeout": 18000
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/device-tree.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/network-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-         "testdef_repos": [
-           {
-             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-           }
-         ],
-        "timeout": 10800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-       }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template.yaml b/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template.yaml
deleted file mode 100644
index 4be7721115..0000000000
--- a/linux-linaro-stable-lsk-v3.14-pre-merge/lava-job-definitions/vexpress-tc2/template.yaml
+++ /dev/null
@@ -1,255 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/alldebug-kernel.yaml
-    timeout: 1800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart-install.yaml
-    timeout: 18000
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/device-tree.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/network-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-      testdef: ubuntu/ltp.yaml
-    timeout: 10800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge.yaml b/linux-linaro-stable-lsk-v3.14-rt-pre-merge.yaml
deleted file mode 100644
index 8ca5bf58ea..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge.yaml
+++ /dev/null
@@ -1,159 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.14-rt-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.14-rt-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v3.14-rt-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14-rt-test:refs/remotes/origin/linux-linaro-lsk-v3.14-rt-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.14-rt-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/omap2plus_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.14-rt-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.14-rt-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 5fdf3140dc..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index a8b3e93cb1..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,221 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 7aafa39e11..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-cpu-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 18000,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 4d913231e9..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-cpu-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 18000
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 570422365c..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index a713019097..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14-rt.yaml b/linux-linaro-stable-lsk-v3.14-rt.yaml
deleted file mode 100644
index 490c8a8f7d..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt.yaml
+++ /dev/null
@@ -1,159 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.14-rt
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.14-rt/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v3.14-rt)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14-rt:refs/remotes/origin/linux-linaro-lsk-v3.14-rt
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.14-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/omap2plus_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.14-rt-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.14-rt-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 065d1f8261..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,418 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index 1e7608c155..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,227 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 4ed50cefa6..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-cpu-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 18000,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 13ab5e7521..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-cpu-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 18000
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index fb5971a513..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index 04803a7dfa..0000000000
--- a/linux-linaro-stable-lsk-v3.14-rt/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.14.yaml b/linux-linaro-stable-lsk-v3.14.yaml
deleted file mode 100644
index 29195f74a6..0000000000
--- a/linux-linaro-stable-lsk-v3.14.yaml
+++ /dev/null
@@ -1,294 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.14
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.14/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v3.14)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14:refs/remotes/origin/linux-linaro-lsk-v3.14
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.14
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - mustang
-                - panda
-                - vexpress
-                - vexpress-be
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/omap2plus_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress)
-                export hwpack_type="vexpress"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="vexpress"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/booting-test.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress-be)
-                export hwpack_type="lsk-vexpress-be"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="lsk-vexpress-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf linaro/configs/bigendian.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.14-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.14-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                echo "Skip"
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.14/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 7d2c095817..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,103 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index aa0376aa83..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 1f5f26bdb4..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 7200
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 2f08d05ee6..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 7200
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 5b85ce1920..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,517 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index 5bc99164c9..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,286 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index d2407885ff..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index f9d75fb605..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,283 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index 4d14a7ae6a..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 4bcbfd2f24..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template.json
deleted file mode 100644
index 19490cc45d..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,511 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 078d4a21ca..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,281 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index 86936bc4c9..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index 4fc5a8e422..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 40cc7f088b..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 18e3702c6c..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,129 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index 2ab968a531..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 959ffc9019..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index 29ea6b310f..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template-be.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template-be.json
deleted file mode 100644
index 521d024b0b..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template-be.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template-be.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template-be.yaml
deleted file mode 100644
index 23c1406c68..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template-be.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template.json b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template.json
deleted file mode 100644
index 9c763b8c63..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template.json
+++ /dev/null
@@ -1,465 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the EFI Application or the kernel:",
-          "sendline uImage",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect File path of the initrd",
-          "sendline uInitrd",
-          "expect Arguments to pass to the binary:",
-          "sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro",
-          "expect Description for this new Entry:",
-          "sendline LAVA Test Image",
-          "expect Choice:",
-          "sendline 4",
-          "expect Select the Boot Device:",
-          "sendline 6",
-          "expect File path of the FDT blob:",
-          "sendline v2p-ca15-tc2.dtb",
-          "expect Choice:",
-          "sendline 5",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/alldebug-kernel.yaml"
-          }
-        ],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart-install.yaml"
-          }
-        ],
-        "timeout": 18000
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/device-tree.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gator-data-streaming-ubuntu.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/network-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-         "testdef_repos": [
-           {
-             "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-           }
-         ],
-        "timeout": 10800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors"
-             },
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 7200
-       }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-       }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template.yaml b/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template.yaml
deleted file mode 100644
index 69dab60c56..0000000000
--- a/linux-linaro-stable-lsk-v3.14/lava-job-definitions/vexpress-tc2/template.yaml
+++ /dev/null
@@ -1,261 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the EFI Application or the kernel:'
-    - 'sendline uImage'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect File path of the initrd'
-    - 'sendline uInitrd'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=tty0 console=ttyAMA0,38400n8 root=/dev/sda1 rootwait ro'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Test Image'
-    - 'expect Choice:'
-    - 'sendline 4'
-    - 'expect Select the Boot Device:'
-    - 'sendline 6'
-    - 'expect File path of the FDT blob:'
-    - 'sendline v2p-ca15-tc2.dtb'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/alldebug-kernel.yaml
-    timeout: 1800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart-install.yaml
-    timeout: 18000
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/bootchart.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/device-tree.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/gator-data-streaming-ubuntu.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/network-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-      testdef: ubuntu/ltp.yaml
-    timeout: 10800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-      testdef: ubuntu/ltp.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge.yaml
deleted file mode 100644
index bf16581172..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.18-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.18-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v3.18-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18-test:refs/remotes/origin/linux-linaro-lsk-v3.18-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.18-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - mustang
-                - panda
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.18-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.18-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=201
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=201
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                    ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 1ff0cec88d..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index f0a55a60f5..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 977812b0ca..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 2ba1a3a602..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 066779b185..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index 2b56a83b9b..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 9eecec4ddd..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index 0e48350190..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json
deleted file mode 100644
index 270364a0a5..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/juno.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the EFI Application or the kernel",
-          "sendline {KERNEL}",
-          "expect Is an EFI Application? [y/n]",
-          "sendline n",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the initrd",
-          "sendline {RAMDISK}",
-          "expect Arguments to pass to the binary:",
-          "sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp",
-          "expect Description for this new Entry:",
-          "sendline LAVA Ramdisk Test Image",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the FDT blob",
-          "sendline {DTB}",
-          "expect Choice:",
-          "sendline 7",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml
deleted file mode 100644
index cbeb71dc40..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/juno.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'expect Start:'
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the EFI Application or the kernel'
-    - 'sendline {KERNEL}'
-    - 'expect Is an EFI Application? [y/n]'
-    - 'sendline n'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the initrd'
-    - 'sendline {RAMDISK}'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Ramdisk Test Image'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the FDT blob'
-    - 'sendline {DTB}'
-    - 'expect Choice:'
-    - 'sendline 7'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index d8b62f488d..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 8255a6f87d..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template.json
deleted file mode 100644
index 67467752d9..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 9f14e12ab9..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index b6c5fbbdbc..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters": {
-            "testdef_repos": [
-                {
-                    "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                    "parameters": {"DeviceID": "/dev/sda"},
-                    "testdef": "ubuntu/fio-test.yaml"
-                }
-            ],
-            "timeout": 2700
-        }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index f564e080aa..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: lava_test_shell
-  parameters:
-    timeout: 2700
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        DeviceID: /dev/sda
-      testdef: ubuntu/fio-test.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 8ce25d07fb..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 9a8a14c22c..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index da4b2d57d5..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
deleted file mode 100644
index e8ec24e473..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/fvp-base-gicv2-psci.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
deleted file mode 100644
index 53ba2d9465..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/fvp-base-gicv2-psci.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 595004725d..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 7200, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index d6509dd80f..0000000000
--- a/linux-linaro-stable-lsk-v3.18-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge.yaml b/linux-linaro-stable-lsk-v3.18-rt-pre-merge.yaml
deleted file mode 100644
index 7f968877fd..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.18-rt-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.18-rt-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v3.18-rt-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18-rt-test:refs/remotes/origin/linux-linaro-lsk-v3.18-rt-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.18-rt-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.18-rt-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.18-rt-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 5fdf3140dc..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index a8b3e93cb1..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,221 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 7aafa39e11..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-cpu-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 18000,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 4d913231e9..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-cpu-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 18000
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 570422365c..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index a713019097..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18-rt.yaml b/linux-linaro-stable-lsk-v3.18-rt.yaml
deleted file mode 100644
index d00a6b954a..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.18-rt
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.18-rt/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v3.18-rt)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18-rt:refs/remotes/origin/linux-linaro-lsk-v3.18-rt
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.18-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.18-rt-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.18-rt-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 065d1f8261..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,418 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index 1e7608c155..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,227 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 4ed50cefa6..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-cpu-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 18000,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 13ab5e7521..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-cpu-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 18000
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index fb5971a513..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index 04803a7dfa..0000000000
--- a/linux-linaro-stable-lsk-v3.18-rt/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.18.yaml b/linux-linaro-stable-lsk-v3.18.yaml
deleted file mode 100644
index 88f28016da..0000000000
--- a/linux-linaro-stable-lsk-v3.18.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v3.18
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v3.18/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v3.18)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18:refs/remotes/origin/linux-linaro-lsk-v3.18
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v3.18
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - mustang
-                - panda
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v3.18-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v3.18-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=201
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=201
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                    ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v3.18/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 1eaa4420d0..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index cfdf6d680c..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 268463e05a..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 7200
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 428d86c2c9..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 7200
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 96a0582c7d..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,518 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index ef18f1bd2e..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,287 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 158825ce1c..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,515 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index a12fecfccc..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-be-ramdisk.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-be-ramdisk.json
deleted file mode 100644
index 270364a0a5..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-be-ramdisk.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/juno.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the EFI Application or the kernel",
-          "sendline {KERNEL}",
-          "expect Is an EFI Application? [y/n]",
-          "sendline n",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the initrd",
-          "sendline {RAMDISK}",
-          "expect Arguments to pass to the binary:",
-          "sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp",
-          "expect Description for this new Entry:",
-          "sendline LAVA Ramdisk Test Image",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the FDT blob",
-          "sendline {DTB}",
-          "expect Choice:",
-          "sendline 7",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-be-ramdisk.yaml
deleted file mode 100644
index cbeb71dc40..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/juno.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'expect Start:'
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the EFI Application or the kernel'
-    - 'sendline {KERNEL}'
-    - 'expect Is an EFI Application? [y/n]'
-    - 'sendline n'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the initrd'
-    - 'sendline {RAMDISK}'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Ramdisk Test Image'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the FDT blob'
-    - 'sendline {DTB}'
-    - 'expect Choice:'
-    - 'sendline 7'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index 532443554a..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 932f1577e9..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template.json
deleted file mode 100644
index 1dcd32e835..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,512 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 8d7486071d..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,282 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index 57fec4e756..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters": {
-            "testdef_repos": [
-                {
-                    "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                    "parameters": {"DeviceID": "/dev/sda"},
-                    "testdef": "ubuntu/fio-test.yaml"
-                }
-            ],
-            "timeout": 2700
-        }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index 05d9d485fc..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: lava_test_shell
-  parameters:
-    timeout: 2700
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        DeviceID: /dev/sda
-      testdef: ubuntu/fio-test.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 40cc7f088b..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index e31c6f8792..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index fbc32231c1..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
deleted file mode 100644
index e8ec24e473..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/fvp-base-gicv2-psci.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
deleted file mode 100644
index 53ba2d9465..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/fvp-base-gicv2-psci.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 959ffc9019..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index 29ea6b310f..0000000000
--- a/linux-linaro-stable-lsk-v3.18/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge.yaml
deleted file mode 100644
index 873a390198..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v4.1-pre-merge
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v4.1-pre-merge/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel - pre-merge (linux-linaro-lsk-v4.1-test)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v4.1-test:refs/remotes/origin/linux-linaro-lsk-v4.1-test
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v4.1-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - mustang
-                - panda
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v4.1-pre-merge-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v4.1-pre-merge-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=201
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=201
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                    ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 1ff0cec88d..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index f0a55a60f5..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 977812b0ca..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 2ba1a3a602..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 066779b185..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index 2b56a83b9b..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 9eecec4ddd..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index 0e48350190..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json
deleted file mode 100644
index 270364a0a5..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/juno.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the EFI Application or the kernel",
-          "sendline {KERNEL}",
-          "expect Is an EFI Application? [y/n]",
-          "sendline n",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the initrd",
-          "sendline {RAMDISK}",
-          "expect Arguments to pass to the binary:",
-          "sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp",
-          "expect Description for this new Entry:",
-          "sendline LAVA Ramdisk Test Image",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the FDT blob",
-          "sendline {DTB}",
-          "expect Choice:",
-          "sendline 7",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml
deleted file mode 100644
index cbeb71dc40..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/juno.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'expect Start:'
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the EFI Application or the kernel'
-    - 'sendline {KERNEL}'
-    - 'expect Is an EFI Application? [y/n]'
-    - 'sendline n'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the initrd'
-    - 'sendline {RAMDISK}'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Ramdisk Test Image'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the FDT blob'
-    - 'sendline {DTB}'
-    - 'expect Choice:'
-    - 'sendline 7'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index d8b62f488d..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 8255a6f87d..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template.json
deleted file mode 100644
index 67467752d9..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 9f14e12ab9..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index b6c5fbbdbc..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters": {
-            "testdef_repos": [
-                {
-                    "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                    "parameters": {"DeviceID": "/dev/sda"},
-                    "testdef": "ubuntu/fio-test.yaml"
-                }
-            ],
-            "timeout": 2700
-        }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index f564e080aa..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: lava_test_shell
-  parameters:
-    timeout: 2700
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        DeviceID: /dev/sda
-      testdef: ubuntu/fio-test.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 8ce25d07fb..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 9a8a14c22c..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index da4b2d57d5..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
deleted file mode 100644
index e8ec24e473..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/fvp-base-gicv2-psci.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
deleted file mode 100644
index 53ba2d9465..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/fvp-base-gicv2-psci.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 595004725d..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 7200, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index d6509dd80f..0000000000
--- a/linux-linaro-stable-lsk-v4.1-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.1-rt.yaml b/linux-linaro-stable-lsk-v4.1-rt.yaml
deleted file mode 100644
index 3dd63af738..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v4.1-rt
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v4.1-rt/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v4.1-rt)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v4.1-rt:refs/remotes/origin/linux-linaro-lsk-v4.1-rt
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v4.1-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-#                - panda
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/preempt-rt.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v4.1-rt-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v4.1-rt-${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=335
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 065d1f8261..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,418 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "async_handler"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "gtod_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "hrtimer-prio"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "matrix_mult"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "measurement"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "periodic_cpu_load"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pi_perf"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-preempt"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "prio-wake"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "pthread_kill_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "rt-migrate"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_football"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_jitter"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "sched_latency"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 3600,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "LTP_REALTIME_TESTS_TO_RUN": "thread_clock"
-            },
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index 1e7608c155..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,227 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: async_handler
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: gtod_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: hrtimer-prio
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: matrix_mult
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: measurement
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: periodic_cpu_load
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pi_perf
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-preempt
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: prio-wake
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: pthread_kill_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: rt-migrate
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_football
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_jitter
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: sched_latency
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        LTP_REALTIME_TESTS_TO_RUN: thread_clock
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 4ed50cefa6..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,220 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-cpu-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 10800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/cyclictest-basic.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/pi-stress-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/rt-migrate-test.yaml"
-        }],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/sendme.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "ubuntu/signaltest.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters":
-      {
-        "skip_install": "deps",
-        "testdef_repos": [
-        {
-          "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-          "testdef": "openembedded/sysbench.yaml"
-        }],
-        "timeout": 3600
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 18000,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 13ab5e7521..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-cpu-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/cyclictest-basic.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pi-stress-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rt-migrate-test.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sendme.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/signaltest.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/sysbench.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 18000
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index fb5971a513..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp-realtime.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index 04803a7dfa..0000000000
--- a/linux-linaro-stable-lsk-v4.1-rt/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp-realtime.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v4.1.yaml b/linux-linaro-stable-lsk-v4.1.yaml
deleted file mode 100644
index 357e61b685..0000000000
--- a/linux-linaro-stable-lsk-v4.1.yaml
+++ /dev/null
@@ -1,303 +0,0 @@
-- job:
-    name: linux-linaro-stable-lsk-v4.1
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-stable-lsk-v4.1/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: linaro-kernel-ci
-    retry-count: 3
-    child-workspace: .
-    display-name: 'Linaro Stable Kernel (linux-linaro-lsk-v4.1)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v4.1:refs/remotes/origin/linux-linaro-lsk-v4.1
-            name: origin
-            branches: 
-                - refs/heads/linux-linaro-lsk-v4.1
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - mustang
-                - panda
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              mustang)
-                unset use_config_fragment
-                export make_deb=false
-                export make_bootwrapper=false
-                export make_install=true
-                export kernel_flavour="mustang"
-                export kernel_config="defconfig"
-                export DEVICE_TYPE="mustang"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="arch/arm/configs/multi_v7_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap4.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                ;;
-              vexpress64-be)
-                export hwpack_type="lsk-vexpress64-be"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="lsk-vexpress64-be"
-                export conf_filenames="arch/arm64/configs/defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress64.conf linaro/configs/bigendian.conf"
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-                cat << EOF > linaro/configs/bigendian.conf
-            CONFIG_CPU_BIG_ENDIAN=y
-            CONFIG_CPU_ENDIAN_BE8=y
-            # CONFIG_VIRTUALIZATION is not set
-            # CONFIG_MMC_DW_IDMAC is not set
-            # CONFIG_VIRTIO is not set
-            # CONFIG_VIRTIO_BLK is not set
-            # CONFIG_VIRTIO_MMIO is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "mustang" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-            [ "${hwpack}" = "vexpress" ] && python linaro-image-tools/linaro-hwpack-append -t `ls hwpack_linaro-${hwpack_type}*.tar.gz` -p `ls linux-image-*-linaro-*-dbg_*.deb` -i -d
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "mustang" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-stable-lsk-v4.1-${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-stable-lsk-v4.1-${hwpack}/${BUILD_NUMBER}"
-            DTB_URL=${KERNEL_URL}/dtbs
-            [ "${hwpack}" != "mustang" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            DTB_URL=${DTB_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=693
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/14.12/ubuntu/utopic-images/developer/linaro-utopic-developer-20141212-693.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildNumber`
-                export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv7ab-rootfs/gcc_version=4.9,label=build,rootfs=minimal/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/minimal-armv7ab-gcc-4.9/${ROOTFS_BUILD_NUMBER}/linaro-image-minimal-genericarmv7ab-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-be.yaml > custom_lava_job_definition.json
-                ;;
-              mustang)
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8/linaro-image-minimal-initramfs-genericarmv8-20150618-754.rootfs.cpio.gz.u-boot"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=754
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64-be)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=201
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                # Per Kevin's request - skip LAVA job submission to FVP model
-                # https://bugs.linaro.org/show_bug.cgi?id=1622
-                #./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=754
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150618-754.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=335
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/lamp-armv7a/linaro-image-lamp-genericarmv7a-20150618-335.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-armv7a-rootfs.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=201
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.06/openembedded/images/minimal-initramfs-armv8b/linaro-image-minimal-initramfs-genericarmv8b-20150618-201.rootfs.cpio.gz"
-
-                    ./lci-build-tools/yaml-to-json.py configs/linux-linaro-stable-lsk-v4.1/lava-job-definitions/${DEVICE_TYPE}/template-be-ramdisk.yaml > custom_lava_job_definition.json
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - warnings:
-            console-log-parsers:
-              - 'GNU C Compiler 4 (gcc)'
-        - email-ext:
-            recipients: 'alex.shi@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 1eaa4420d0..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,104 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index cfdf6d680c..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 268463e05a..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 7200
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 428d86c2c9..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 7200
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 96a0582c7d..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,518 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index ef18f1bd2e..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,287 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 158825ce1c..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,515 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index a12fecfccc..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-be-ramdisk.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-be-ramdisk.json
deleted file mode 100644
index 270364a0a5..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-be-ramdisk.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/juno.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the EFI Application or the kernel",
-          "sendline {KERNEL}",
-          "expect Is an EFI Application? [y/n]",
-          "sendline n",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the initrd",
-          "sendline {RAMDISK}",
-          "expect Arguments to pass to the binary:",
-          "sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp",
-          "expect Description for this new Entry:",
-          "sendline LAVA Ramdisk Test Image",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the FDT blob",
-          "sendline {DTB}",
-          "expect Choice:",
-          "sendline 7",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-be-ramdisk.yaml
deleted file mode 100644
index cbeb71dc40..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/juno.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'expect Start:'
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the EFI Application or the kernel'
-    - 'sendline {KERNEL}'
-    - 'expect Is an EFI Application? [y/n]'
-    - 'sendline n'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the initrd'
-    - 'sendline {RAMDISK}'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Ramdisk Test Image'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the FDT blob'
-    - 'sendline {DTB}'
-    - 'expect Choice:'
-    - 'sendline 7'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index 532443554a..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,514 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 932f1577e9..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,284 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template.json
deleted file mode 100644
index 1dcd32e835..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,512 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-efivarfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-memory-hotplug.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-net.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-ptrace.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "BRANCH": "linux-linaro-stable-3.14"
-            },
-            "testdef": "openembedded/kselftest-vm.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 2400,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 8d7486071d..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,282 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-efivarfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-memory-hotplug.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-net.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-ptrace.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 10800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        BRANCH: linux-linaro-stable-3.14
-      testdef: openembedded/kselftest-vm.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 3600
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index 57fec4e756..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters": {
-            "testdef_repos": [
-                {
-                    "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                    "parameters": {"DeviceID": "/dev/sda"},
-                    "testdef": "ubuntu/fio-test.yaml"
-                }
-            ],
-            "timeout": 2700
-        }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
-
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index 05d9d485fc..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: lava_test_shell
-  parameters:
-    timeout: 2700
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        DeviceID: /dev/sda
-      testdef: ubuntu/fio-test.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 40cc7f088b..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
-
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index e31c6f8792..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/sd-mmc-ubuntu.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "skip_install": "deps",
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "common/gator-data-streaming.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/mmtests.yaml"
-          }
-        ],
-        "timeout": 7200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/openssl.yaml"
-          }
-        ],
-        "timeout": 2400
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index fbc32231c1..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/sd-mmc-ubuntu.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    skip_install: deps
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: common/gator-data-streaming.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/mmtests.yaml
-    timeout: 7200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/openssl.yaml
-    timeout: 3600
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
deleted file mode 100644
index e8ec24e473..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/fvp-base-gicv2-psci.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
deleted file mode 100644
index 53ba2d9465..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/fvp-base-gicv2-psci.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 959ffc9019..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,150 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/rcutorture.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
-
diff --git a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index 29ea6b310f..0000000000
--- a/linux-linaro-stable-lsk-v4.1/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,81 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/rcutorture.yaml
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template-be.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template-be.json
deleted file mode 100644
index 583ecf315e..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template-be.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template-be.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template-be.yaml
deleted file mode 100644
index bf091e270f..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template-be.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template.json
deleted file mode 100644
index 1ff0cec88d..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template.yaml
deleted file mode 100644
index f0a55a60f5..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/arndale/template.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/beaglebone-black/template.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/beaglebone-black/template.json
deleted file mode 100644
index 977812b0ca..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/beaglebone-black/template.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/beaglebone-black/template.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
deleted file mode 100644
index 2ba1a3a602..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/beaglebone-black/template.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
deleted file mode 100644
index 066779b185..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.json
+++ /dev/null
@@ -1,406 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
deleted file mode 100644
index 2b56a83b9b..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs-efi.yaml
+++ /dev/null
@@ -1,228 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
deleted file mode 100644
index 9eecec4ddd..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv7a-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "WORD_SIZE": "32"
-            },
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
deleted file mode 100644
index 0e48350190..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,225 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv7a-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        WORD_SIZE: 32
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json
deleted file mode 100644
index 270364a0a5..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-be-ramdisk.json
+++ /dev/null
@@ -1,97 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/juno.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 3",
-          "expect Choice:",
-          "sendline 3",
-          "expect Delete entry:",
-          "sendline 1",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 1",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the EFI Application or the kernel",
-          "sendline {KERNEL}",
-          "expect Is an EFI Application? [y/n]",
-          "sendline n",
-          "expect Has FDT support? [y/n]",
-          "sendline y",
-          "expect Add an initrd: [y/n]",
-          "sendline y",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the initrd",
-          "sendline {RAMDISK}",
-          "expect Arguments to pass to the binary:",
-          "sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp",
-          "expect Description for this new Entry:",
-          "sendline LAVA Ramdisk Test Image",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendcontrol [",
-          "sendcontrol M",
-          "expect Choice:",
-          "expect Choice:",
-          "sendline 5",
-          "expect Select the Boot Device:",
-          "sendline 8",
-          "expect Get the IP address from DHCP: [y/n]",
-          "sendline y",
-          "expect Get the TFTP server IP address:",
-          "sendline {SERVER_IP}",
-          "expect File path of the FDT blob",
-          "sendline {DTB}",
-          "expect Choice:",
-          "sendline 7",
-          "expect Start:",
-          "sendline 1"
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml
deleted file mode 100644
index cbeb71dc40..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/juno.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    boot_cmds:
-    - 'expect Start:'
-    - 'sendline 3'
-    - 'expect Choice:'
-    - 'sendline 3'
-    - 'expect Delete entry:'
-    - 'sendline 1'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 1'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the EFI Application or the kernel'
-    - 'sendline {KERNEL}'
-    - 'expect Is an EFI Application? [y/n]'
-    - 'sendline n'
-    - 'expect Has FDT support? [y/n]'
-    - 'sendline y'
-    - 'expect Add an initrd: [y/n]'
-    - 'sendline y'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the initrd'
-    - 'sendline {RAMDISK}'
-    - 'expect Arguments to pass to the binary:'
-    - 'sendline console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/ram0 verbose debug ip=dhcp'
-    - 'expect Description for this new Entry:'
-    - 'sendline LAVA Ramdisk Test Image'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendcontrol ['
-    - 'sendcontrol M'
-    - 'expect Choice:'
-    - 'expect Choice:'
-    - 'sendline 5'
-    - 'expect Select the Boot Device:'
-    - 'sendline 8'
-    - 'expect Get the IP address from DHCP: [y/n]'
-    - 'sendline y'
-    - 'expect Get the TFTP server IP address:'
-    - 'sendline {SERVER_IP}'
-    - 'expect File path of the FDT blob'
-    - 'sendline {DTB}'
-    - 'expect Choice:'
-    - 'sendline 7'
-    - 'expect Start:'
-    - 'sendline 1'
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-efi.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-efi.json
deleted file mode 100644
index d8b62f488d..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-efi.json
+++ /dev/null
@@ -1,403 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "customize": {
-          "${STARTUP_NSH}": ["boot:/EFI/BOOT/startup.nsh"]
-        },
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-efi.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-efi.yaml
deleted file mode 100644
index 8255a6f87d..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template-efi.yaml
+++ /dev/null
@@ -1,226 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    customize:
-      '${STARTUP_NSH}':
-      - 'boot:/EFI/BOOT/startup.nsh'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template.json
deleted file mode 100644
index 67467752d9..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template.json
+++ /dev/null
@@ -1,400 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 7200,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "syscalls",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "math",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "timers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fcntl-locktests",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "ipc",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fsx",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "hugetlb",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "io",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "nptl",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "pty",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "containers",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "fs_bind",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "filecaps",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "admin_tools",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "connectors",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-                "TST_CMDFILES": "mm",
-                "SKIPFILE": "skipfile-lsk-juno"
-            },
-            "testdef": "openembedded/ltp.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template.yaml
deleted file mode 100644
index 9f14e12ab9..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/juno/template.yaml
+++ /dev/null
@@ -1,223 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: 'uefi'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: syscalls
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: math
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: timers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fcntl-locktests
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: ipc
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fsx
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: hugetlb
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: io
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: nptl
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: pty
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: containers
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: fs_bind
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: filecaps
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: admin_tools
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: connectors
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        TST_CMDFILES: mm
-        SKIPFILE: skipfile-lsk-juno
-      testdef: openembedded/ltp.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-nfs.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-nfs.json
deleted file mode 100644
index b6c5fbbdbc..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-nfs.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "nfsrootfs": "${ROOTFS_BUILD_URL}",
-        "target_type": "ubuntu"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "ubuntu",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-        "command": "lava_test_shell",
-        "parameters": {
-            "testdef_repos": [
-                {
-                    "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-                    "parameters": {"DeviceID": "/dev/sda"},
-                    "testdef": "ubuntu/fio-test.yaml"
-                }
-            ],
-            "timeout": 2700
-        }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-nfs.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
deleted file mode 100644
index f564e080aa..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-nfs.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    nfsrootfs: '${ROOTFS_BUILD_URL}'
-    target_type: 'ubuntu'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'ubuntu'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: lava_test_shell
-  parameters:
-    timeout: 2700
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      parameters:
-        DeviceID: /dev/sda
-      testdef: ubuntu/fio-test.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-ramdisk.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
deleted file mode 100644
index 81c0fec51a..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "dtb": "${DTB_URL}/apm-mustang.dtb",
-        "kernel": "${KERNEL_URL}/uImage",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "defconfig": "defconfig",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
deleted file mode 100644
index 8ce25d07fb..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    dtb: '${DTB_URL}/apm-mustang.dtb'
-    kernel: '${KERNEL_URL}/uImage'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    defconfig: 'defconfig'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template.yaml
deleted file mode 120000
index df16d27cae..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/mustang/template.yaml
+++ /dev/null
@@ -1 +0,0 @@
-template-ramdisk.yaml
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template-be.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template-be.json
deleted file mode 100644
index ce61286119..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template-be.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-armv7ab-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template-be.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template-be.yaml
deleted file mode 100644
index 709267136f..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template-be.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-armv7ab-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
\ No newline at end of file
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template.json
deleted file mode 100644
index 9a8a14c22c..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template.json
+++ /dev/null
@@ -1,68 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "dtb": "omap4-panda-es.dtb",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "ubuntu",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "developer",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/usb-test-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template.yaml
deleted file mode 100644
index da4b2d57d5..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/panda-es/template.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    dtb: 'omap4-panda-es.dtb'
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'ubuntu'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'developer'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/pwrmgmt.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/smoke-tests-basic.yaml
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: ubuntu/usb-test-basic.yaml
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
deleted file mode 100644
index e8ec24e473..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_kernel",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "dtb": "${DTB_URL}/fvp-base-gicv2-psci.dtb",
-        "kernel": "${KERNEL_URL}/Image",
-        "ramdisk": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "build id": "${BUILD_NUMBER}",
-        "distribution": "openembedded",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "minimal-initramfs-armv8b-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image"
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 3600
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
deleted file mode 100644
index 53ba2d9465..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template-be-ramdisk.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-actions:
-- command: deploy_linaro_kernel
-  parameters:
-    bootloadertype: 'uefi'
-    dtb: '${DTB_URL}/fvp-base-gicv2-psci.dtb'
-    kernel: '${KERNEL_URL}/Image'
-    ramdisk: '${ROOTFS_BUILD_URL}'
-  metadata:
-    build id: '${BUILD_NUMBER}'
-    distribution: 'openembedded'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'minimal-initramfs-armv8b-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 3600
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
deleted file mode 100644
index 595004725d..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.json
+++ /dev/null
@@ -1,137 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "bootloadertype": "uefi",
-        "hwpack": "${HWPACK_BUILD_URL}",
-        "rootfs": "${ROOTFS_BUILD_URL}"
-      },
-      "metadata": {
-        "distribution": "openembedded",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "${hwpack_type}",
-        "rootfs.build": "${ROOTFS_BUILD_NUMBER}",
-        "rootfs.type": "lamp-armv8-gcc-4.9",
-        "git URL": "${GIT_URL}",
-        "git branch": "${GIT_BRANCH}",
-        "git commit": "${GIT_COMMIT}"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "options": [
-          "cluster0.NUM_CORES=2",
-          "cluster1.NUM_CORES=3"
-        ]
-      }
-    },
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/busybox.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/device-tree.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/ethernet.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/kernel-version.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 1800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/perf.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 800, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/toolchain.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell", 
-      "parameters": {
-        "timeout": 7200, 
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git", 
-            "testdef": "openembedded/libhugetlbfs.yaml"
-          }
-        ]
-      }
-    }, 
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "timeout": 800,
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "openembedded/pointer-tagging-tests.yaml"
-          }
-        ]
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 172800
-}
diff --git a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml b/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
deleted file mode 100644
index d6509dd80f..0000000000
--- a/linux-linaro-stable-lsk-v4.4-pre-merge/lava-job-definitions/rtsm_fvp_base-aemv8a/template.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    bootloadertype: uefi
-    hwpack: '${HWPACK_BUILD_URL}'
-    rootfs: '${ROOTFS_BUILD_URL}'
-  metadata:
-    distribution: 'openembedded'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: '${hwpack_type}'
-    rootfs.build: '${ROOTFS_BUILD_NUMBER}'
-    rootfs.type: 'lamp-armv8-gcc-4.9'
-    git URL: '${GIT_URL}'
-    git branch: '${GIT_BRANCH}'
-    git commit: '${GIT_COMMIT}'
-- command: boot_linaro_image
-  parameters:
-    options:
-    - 'cluster0.NUM_CORES=2'
-    - 'cluster1.NUM_CORES=3'
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/busybox.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/device-tree.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/ethernet.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/kernel-version.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 1800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/perf.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/toolchain.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 7200
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/libhugetlbfs.yaml
-- command: lava_test_shell
-  parameters:
-    timeout: 800
-    testdef_repos:
-    - git-repo: git://git.linaro.org/qa/test-definitions.git
-      testdef: openembedded/pointer-tagging-tests.yaml
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 172800
diff --git a/linux-linaro-tracking-ll-ilp32.yaml b/linux-linaro-tracking-ll-ilp32.yaml
deleted file mode 100644
index 79bedaae03..0000000000
--- a/linux-linaro-tracking-ll-ilp32.yaml
+++ /dev/null
@@ -1,169 +0,0 @@
-- job:
-    name: linux-linaro-tracking-ll-ilp32
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/ilp32/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'juno'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linux Linaro Kernel (tracking) with ILP32'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro-extra:refs/remotes/origin/linux-linaro-extra
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-extra
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: abi
-            values:
-                - ilp32
-                - lp64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -f linux-*.deb
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y python-requests python-beautifulsoup python-html2text
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export hwpack_type="vexpress64"
-            export kernel_flavour="vexpress64"
-            export use_config_fragment=1
-            export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/linaro-base64.conf linaro/configs/distribution.conf linaro/configs/kvm-guest.conf linaro/configs/kvm-host.conf linaro/configs/vexpress64.conf linaro/configs/workaround.conf"
-            export MAKE_DTBS=true
-            export make_bootwrapper=false
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-14.11/bin"
-            export toolchain_url="http://releases.linaro.org/14.11/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2014.11-x86_64_aarch64-linux-gnu.tar.xz"
-
-            echo "# CONFIG_FTRACE is not set" > linaro/configs/workaround.conf
-            [ "${abi}" = "ilp32" ] && echo "CONFIG_AARCH32_EL0=y" >> linaro/configs/workaround.conf
-            [ "${abi}" = "ilp32" ] && echo "CONFIG_ARM64_ILP32=y" >> linaro/configs/workaround.conf
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/ci/lci-build-tools.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            cat << EOF > out/startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-
-            # These tests seem to hang in ILP32
-            cat << EOF >> out/skipfile-ilp32
-            msgctl07
-            msgrcv01
-            msgrcv02
-            msgrcv03
-            msgrcv04
-            msgrcv05
-            msgrcv06
-            msgrcv07
-            msgsnd01
-            EOF
-
-            # Publish to snapshots
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            python ${HOME}/bin/linaro-cp.py out kernel-hwpack/linux-linaro-tracking-ll-ilp32/${abi}/${BUILD_NUMBER}
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-tracking-ll-ilp32/${abi}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            rootfs="lamp"
-            export rootfs_type="lamp-armv8-gcc-4.9"
-            [ "${abi}" = "ilp32" ] && {
-              rootfs="minimal"
-              rootfs_ext="-ltp"
-              export rootfs_type="minimal-ltp-armv8-ilp32-gcc-4.9"
-              img_abi="-ilp32"
-            }
-
-            export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8${img_abi}-rootfs/gcc_version=4.9,label=build,rootfs=${rootfs}${rootfs_ext}/lastSuccessfulBuild/buildNumber`
-            export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8${img_abi}-rootfs/gcc_version=4.9,label=build,rootfs=${rootfs}${rootfs_ext}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-            export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/${rootfs_type}/${ROOTFS_BUILD_NUMBER}/linaro-image-${rootfs}${rootfs_ext}-genericarmv8${img_abi}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-ll-ilp32/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'andrey.konovalov@linaro.org fathi.boudra@linaro.org'
diff --git a/linux-linaro-tracking-ll.yaml b/linux-linaro-tracking-ll.yaml
deleted file mode 100644
index da6aeba4fe..0000000000
--- a/linux-linaro-tracking-ll.yaml
+++ /dev/null
@@ -1,270 +0,0 @@
-- job:
-    name: linux-linaro-tracking-ll
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-tracking-ll/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linux Linaro Kernel (tracking)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro:refs/remotes/origin/linux-linaro
-            name: origin
-            branches:
-                - refs/heads/linux-linaro
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - arndale-octa
-                - arndale-uprobes
-                - beaglebone
-                - beaglebone-uprobes
-                - ifc6410
-                - panda
-                - vexpress
-                - vexpress64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export make_bootwrapper=false
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/kvm-host.conf linaro/configs/xen.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              arndale-octa)
-                export hwpack_type="arndale-octa"
-                export board_types="arndale-octa"
-                export kernel_flavour="arndale-octa"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/arndale_octa.conf"
-                export DEVICE_TYPE="arndale-octa"
-                ;;
-              arndale-uprobes)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/kvm-host.conf linaro/configs/xen.conf linaro/configs/uprobes.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/multi_v7.conf linaro/configs/beaglebone.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              beaglebone-uprobes)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/uprobes.conf linaro/configs/multi_v7.conf linaro/configs/beaglebone.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              ifc6410)
-                export kernel_flavour="ifc6410"
-                export conf_filenames="arch/arm/configs/qcom_defconfig linaro/configs/linaro-base.conf linaro/configs/distribution.conf"
-                export DEVICE_TYPE="ifc6410"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap2plus.conf linaro/configs/panda.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress)
-                export hwpack_type="vexpress"
-                export board_types="vexpress-tc2"
-                export kernel_flavour="vexpress"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/kvm-guest.conf linaro/configs/xen.conf linaro/configs/big-LITTLE-IKS.conf linaro/configs/vexpress.conf"
-                export DEVICE_TYPE="vexpress-tc2"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/linaro-base64.conf linaro/configs/distribution.conf linaro/configs/kvm-guest.conf linaro/configs/kvm-host.conf linaro/configs/audit.conf linaro/configs/vexpress64.conf linaro/configs/workaround.conf"
-                export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                cat << EOF > linaro/configs/workaround.conf
-            CONFIG_PREEMPT=y
-            # CONFIG_DEBUG_PREEMPT is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            rm -rf artifacts
-            mkdir artifacts
-            [ "${hwpack}" = "arndale-uprobes" ] && python linaro-image-tools/linaro-hwpack-replace -t `ls hwpack_linaro-arndale_*_armhf_supported.tar.gz` -p `ls linux-headers-*-linaro-arndale_*.deb` -r linux-headers -d -i
-            [ "${hwpack}" = "beaglebone-uprobes" ] && python linaro-image-tools/linaro-hwpack-replace -t `ls hwpack_linaro-beaglebone_*_armhf_supported.tar.gz` -p `ls linux-headers-*-linaro-am335x_*.deb` -r linux-headers -d -i
-            [ "${hwpack}" = "ifc6410" ] && {
-              cp -a *.deb out/
-              cat builddir-*-${kernel_flavour}/arch/arm/boot/zImage builddir-*-${kernel_flavour}/arch/arm/boot/dts/qcom-apq8064-ifc6410.dtb > out/zImage_ifc6410
-              cp -a linux-[ih]*-linaro-ifc6410_*.deb out/zImage_ifc6410 artifacts/
-            }
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            [ "${hwpack}" != "ifc6410" ] && mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-tracking-ll/${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-tracking-ll/${hwpack}/${BUILD_NUMBER}"
-            [ "${hwpack}" != "ifc6410" ] && HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda|vexpress)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=704
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.05/ubuntu/vivid-images/developer/linaro-vivid-developer-20150522-704.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-ll/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=752
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.05/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150522-752.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-ll/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              arndale-octa|arndale-uprobes|beaglebone-uprobes|ifc6410)
-                echo "Skip"
-                cat << EOF > post_build_lava_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=752
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.05/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150522-752.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-ll/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-ll/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            allow-empty: true
-        - email-ext:
-            recipients: 'andrey.konovalov@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-tracking-llct.yaml b/linux-linaro-tracking-llct.yaml
deleted file mode 100644
index 6012e0ab89..0000000000
--- a/linux-linaro-tracking-llct.yaml
+++ /dev/null
@@ -1,212 +0,0 @@
-- job:
-    name: linux-linaro-tracking-llct
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/private/team/linaro/ci-linux-linaro-tracking-llct/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linux Linaro Kernel (core-tracking)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro-core-tracking:refs/remotes/origin/linux-linaro-core-tracking
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-core-tracking
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - beaglebone
-                - panda
-                - vexpress64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf builddir*
-              rm -rf out
-              rm -f hwpack_linaro-* linux-*.deb
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export use_config_fragment=1
-            export MAKE_DTBS=true
-            export make_bootwrapper=false
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            case "${hwpack}" in
-              arndale)
-                export hwpack_type="arndale"
-                export board_types="arndale"
-                export kernel_flavour="arndale"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/kvm-host.conf linaro/configs/xen.conf linaro/configs/arndale.conf"
-                export DEVICE_TYPE="arndale"
-                ;;
-              beaglebone)
-                export hwpack_type="beaglebone"
-                export board_types="beaglebone-black"
-                export kernel_flavour="am335x"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/multi_v7.conf linaro/configs/beaglebone.conf"
-                export DEVICE_TYPE="beaglebone-black"
-                ;;
-              panda)
-                export hwpack_type="panda"
-                export board_types="panda-es"
-                export kernel_flavour="omap"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/distribution.conf linaro/configs/omap2plus.conf linaro/configs/panda.conf"
-                export DEVICE_TYPE="panda-es"
-                ;;
-              vexpress64)
-                export hwpack_type="vexpress64"
-                export board_types="rtsm_fvp_base-aemv8a"
-                export kernel_flavour="vexpress64"
-                export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/linaro-base64.conf linaro/configs/distribution.conf linaro/configs/kvm-guest.conf linaro/configs/kvm-host.conf linaro/configs/audit.conf linaro/configs/vexpress64.conf linaro/configs/workaround.conf"
-                export DEVICE_TYPE="rtsm_fvp_base-aemv8a"
-                export ARCH="arm64"
-                export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz"
-                cat << EOF > startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-                cat << EOF > linaro/configs/workaround.conf
-            CONFIG_PREEMPT=y
-            # CONFIG_DEBUG_PREEMPT is not set
-            EOF
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mkdir -p out
-            [ "${hwpack}" = "vexpress64" ] && mv startup.nsh out/
-            [ "${hwpack}" = "vexpress64" ] && cp -a builddir-*-${kernel_flavour}/.config kernel.config
-            cp -a builddir-*-${kernel_flavour}/.config out/kernel_config_${kernel_flavour}
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-linaro-tracking-llct/${hwpack}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-tracking-llct/${hwpack}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${hwpack}" in
-              arndale|beaglebone|panda)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=704
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.05/ubuntu/vivid-images/developer/linaro-vivid-developer-20150522-704.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-llct/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-              vexpress64)
-                # Get rootfs URL
-                export ROOTFS_BUILD_NUMBER=752
-                export ROOTFS_BUILD_URL="http://releases.linaro.org/15.05/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150522-752.rootfs.tar.gz"
-
-                ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-llct/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - conditional-step:
-            condition-kind: strings-match
-            condition-string1: '${ENV,var="hwpack"}'
-            condition-string2: 'vexpress64'
-            steps:
-                - shell: |
-                    DEVICE_TYPE=juno
-
-                    # Get rootfs URL
-                    export ROOTFS_BUILD_NUMBER=752
-                    export ROOTFS_BUILD_URL="http://releases.linaro.org/15.05/openembedded/images/lamp-armv8/linaro-image-lamp-genericarmv8-20150522-752.rootfs.tar.gz"
-
-                    if grep -Fxq 'CONFIG_EFI=y' kernel.config; then
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-llct/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-                    else
-                      ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-llct/lava-job-definitions/${DEVICE_TYPE}/template.yaml > custom_lava_job_definition.json
-                    fi
-                - trigger-builds:
-                    - project: 'post-build-lava'
-                      property-file: post_build_lava_parameters
-                      block: true
-    publishers:
-        - email-ext:
-            recipients: 'andrey.konovalov@linaro.org, fathi.boudra@linaro.org'
-            attach-build-log: true
-            matrix-trigger: both
diff --git a/linux-linaro-tracking-mainline-ilp32.yaml b/linux-linaro-tracking-mainline-ilp32.yaml
deleted file mode 100644
index a8637c88c7..0000000000
--- a/linux-linaro-tracking-mainline-ilp32.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: linux-linaro-tracking-mainline-ilp32
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/ilp32/'
-        - string:
-            name: DEVICE_TYPE
-            default: 'juno'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linux Linaro Kernel (mainline) with ILP32'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/andrey.konovalov/linux-linaro-tracking.git
-            refspec: +refs/heads/ILP32-patchset-v6-2015.11.18:refs/remotes/origin/ILP32-patchset-v6-2015.11.18
-            name: origin
-            branches:
-                - refs/heads/ILP32-patchset-v6-2015.11.18
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: abi
-            values:
-                - ilp32
-                - lp64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf linaro
-              rm -rf linaro-configs
-              rm -rf builddir*
-              rm -rf out
-              rm -f linux-*.deb
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y python-requests python-beautifulsoup python-html2text
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export hwpack_type="vexpress64"
-            export kernel_flavour="vexpress64"
-            export use_config_fragment=1
-            export conf_filenames="linaro/configs/linaro-base.conf linaro/configs/linaro-base64.conf linaro/configs/distribution.conf linaro/configs/kvm-guest.conf linaro/configs/kvm-host.conf linaro/configs/vexpress64.conf linaro/configs/workaround.conf"
-            export MAKE_DTBS=true
-            export make_bootwrapper=false
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-14.11/bin"
-            export toolchain_url="http://releases.linaro.org/14.11/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2014.11-x86_64_aarch64-linux-gnu.tar.xz"
-
-            test -d linaro-configs || git clone -b config-tracking --depth 1 https://git.linaro.org/kernel/configs.git linaro-configs
-            test -h linaro || ln -s linaro-configs/linaro
-
-            echo "# CONFIG_FTRACE is not set" > linaro/configs/workaround.conf
-            [ "${abi}" = "ilp32" ] && echo "CONFIG_AARCH32_EL0=y" >> linaro/configs/workaround.conf
-            [ "${abi}" = "ilp32" ] && echo "CONFIG_ARM64_ILP32=y" >> linaro/configs/workaround.conf
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/ci/lci-build-tools.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            mv hwpack_linaro-${hwpack_type}* out/
-
-            cat << EOF > out/startup.nsh
-            fs3:\Image dtb=juno\juno.dtb console=ttyAMA0,115200 earlyprintk=pl011,0x7ff80000 root=/dev/sda5 rootwait rootfstype=ext4 rw verbose debug uefi_debug ignore_loglevel
-            EOF
-
-            # These tests seem to hang in ILP32
-            cat << EOF >> out/skipfile-ilp32
-            msgctl07
-            msgrcv01
-            msgrcv02
-            msgrcv03
-            msgrcv04
-            msgrcv05
-            msgrcv06
-            msgrcv07
-            msgsnd01
-            EOF
-
-            # Publish to snapshots
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            python ${HOME}/bin/linaro-cp.py out kernel-hwpack/linux-linaro-tracking-mainline-ilp32/${abi}/${BUILD_NUMBER}
-
-            KERNEL_URL="http://snapshots.linaro.org/kernel-hwpack/linux-linaro-tracking-mainline-ilp32/${abi}/${BUILD_NUMBER}"
-            HWPACK_BUILD_URL="${KERNEL_URL}/`ls out/hwpack_linaro-${hwpack_type}*.tar.gz |xargs basename`"
-            STARTUP_NSH="${KERNEL_URL}/startup.nsh"
-
-            # Create post-build-lava parameters
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            KERNEL_URL=${KERNEL_URL}
-            HWPACK_BUILD_URL=${HWPACK_BUILD_URL}
-            STARTUP_NSH=${STARTUP_NSH}
-            hwpack_type=${hwpack_type}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            rootfs="lamp"
-            export rootfs_type="lamp-armv8-gcc-4.9"
-            [ "${abi}" = "ilp32" ] && {
-              rootfs="minimal"
-              rootfs_ext="-ltp"
-              export rootfs_type="minimal-ltp-armv8-ilp32-gcc-4.9"
-              img_abi="-ilp32"
-            }
-
-            export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8${img_abi}-rootfs/gcc_version=4.9,label=build,rootfs=${rootfs}${rootfs_ext}/lastSuccessfulBuild/buildNumber`
-            export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/openembedded-armv8${img_abi}-rootfs/gcc_version=4.9,label=build,rootfs=${rootfs}${rootfs_ext}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-            export ROOTFS_BUILD_URL="http://snapshots.linaro.org/openembedded/images/${rootfs_type}/${ROOTFS_BUILD_NUMBER}/linaro-image-${rootfs}${rootfs_ext}-genericarmv8${img_abi}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.rootfs.tar.gz"
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            ./lci-build-tools/yaml-to-json.py configs/linux-linaro-tracking-mainline-ilp32/lava-job-definitions/${DEVICE_TYPE}/template-efi.yaml > custom_lava_job_definition.json
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'andrey.konovalov@linaro.org'
diff --git a/linux-ltsi.yaml b/linux-ltsi.yaml
deleted file mode 100644
index 8a10995b18..0000000000
--- a/linux-ltsi.yaml
+++ /dev/null
@@ -1,130 +0,0 @@
-- job:
-    name: linux-ltsi
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - file:
-            name: defconfig.properties
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: linaro-kernel-ci
-    child-workspace: .
-    display-name: 'Linux LTSI Kernel (linux-3.14.y)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/linux-3.14.y:refs/remotes/origin/linux-3.14.y
-            name: origin
-            branches: 
-                - refs/heads/linux-3.14.y
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-                - arm64
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        combination-filter: |
-            (ARCH=="arm" && defconfig!="defconfig") || (ARCH=="arm64" && defconfig=="defconfig")
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -rf configs
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS 
-            export use_ccache=true
-            export make_silent=true
-            export make_deb=false
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export kernel_config="${defconfig}_defconfig"
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            [ "${ARCH}" = "arm64" ] && export kernel_config="${defconfig}"
-            [ "${ARCH}" = "arm64" ] && {
-              export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-              export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-            }
-
-            git rev-parse -q --verify 3.14.4-ltsi > /dev/null && git branch -D 3.14.4-ltsi
-            test -d ltsi-kernel || git clone --depth 1 http://git.linuxfoundation.org/ltsi-kernel.git
-            bash ltsi-kernel/scripts/generate_git
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # XXX b2120 vmlinux
-            [ "${defconfig}" = "multi_v7" ] && cp -a builddir-*-${kernel_flavour}/vmlinux out/ || true
-            # XXX mustang uImage
-            [ "${ARCH}" = "arm64" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-ltsi/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Start LAVA dance
-            test -d configs || git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            export BUNDLE_STREAM_NAME=/anonymous/fabo/
-            export LAVA_SERVER=validation.linaro.org/RPC2/
-            export KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/linux-ltsi/${defconfig}/${BUILD_NUMBER}
-            export DTB_URL=${KERNEL_URL}/dtbs
-            export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20141121-301.rootfs.tar.gz
-            [ "${ARCH}" = "arm64" ] && export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv8/linaro-image-minimal-genericarmv8-20141122-721.rootfs.tar.gz
-
-            # Hack to use submit LAVA jobs directly
-            python lci-build-tools/dtb-to-device.py
diff --git a/linux-mainline.yaml b/linux-mainline.yaml
deleted file mode 100644
index e7fb61f88b..0000000000
--- a/linux-mainline.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-- job:
-    name: linux-mainline
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - file:
-            name: defconfig.properties
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: linaro-kernel-ci
-    child-workspace: .
-    display-name: 'Linux Mainline Kernel (master)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-                - arm64
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        combination-filter: |
-            (ARCH=="arm" && defconfig!="defconfig") || (ARCH=="arm64" && defconfig=="defconfig")
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -rf configs
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS 
-            export use_ccache=true
-            export make_silent=true
-            export make_deb=false
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export kernel_config="${defconfig}_defconfig"
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            [ "${ARCH}" = "arm64" ] && export kernel_config="${defconfig}"
-            [ "${ARCH}" = "arm64" ] && {
-              export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-              export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-            }
-
-            # XXX work around vexpress defconfig
-            #echo "CONFIG_DEVTMPFS=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_DEVTMPFS_MOUNT=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_REGULATOR=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_REGULATOR_VEXPRESS=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_EXT4_FS=y" >> arch/arm/configs/vexpress_defconfig
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # XXX b2120 vmlinux
-            [ "${defconfig}" = "multi_v7" ] && cp -a builddir-*-${kernel_flavour}/vmlinux out/ || true
-            # XXX mustang uImage
-            [ "${ARCH}" = "arm64" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-mainline/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Start LAVA dance
-            test -d configs || git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            export BUNDLE_STREAM_NAME=/anonymous/fabo/
-            export LAVA_SERVER=validation.linaro.org/RPC2/
-            export KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/linux-mainline/${defconfig}/${BUILD_NUMBER}
-            export DTB_URL=${KERNEL_URL}/dtbs
-            export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20141121-301.rootfs.tar.gz
-            [ "${ARCH}" = "arm64" ] && export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv8/linaro-image-minimal-genericarmv8-20141122-721.rootfs.tar.gz
-
-            # Hack to use submit LAVA jobs directly
-            python lci-build-tools/dtb-to-device.py
diff --git a/linux-next.yaml b/linux-next.yaml
deleted file mode 100644
index 506f8c6062..0000000000
--- a/linux-next.yaml
+++ /dev/null
@@ -1,133 +0,0 @@
-- job:
-    name: linux-next
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - file:
-            name: defconfig.properties
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: linaro-kernel-ci
-    child-workspace: .
-    display-name: 'Linux Next (master)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-                - arm64
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        combination-filter: |
-            (ARCH=="arm" && defconfig!="defconfig") || (ARCH=="arm64" && defconfig=="defconfig")
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -rf configs
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS 
-            export use_ccache=true
-            export make_silent=true
-            export make_deb=false
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export kernel_config="${defconfig}_defconfig"
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            [ "${ARCH}" = "arm64" ] && export kernel_config="${defconfig}"
-            [ "${ARCH}" = "arm64" ] && {
-              export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-              export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-            }
-
-            # XXX work around vexpress defconfig
-            #echo "CONFIG_DEVTMPFS=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_DEVTMPFS_MOUNT=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_REGULATOR=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_REGULATOR_VEXPRESS=y" >> arch/arm/configs/vexpress_defconfig
-            #echo "CONFIG_EXT4_FS=y" >> arch/arm/configs/vexpress_defconfig
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # XXX b2120 vmlinux
-            [ "${defconfig}" = "multi_v7" ] && cp -a builddir-*-${kernel_flavour}/vmlinux out/ || true
-            # XXX mustang uImage
-            [ "${ARCH}" = "arm64" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-next/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Start LAVA dance
-            test -d configs || git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            export BUNDLE_STREAM_NAME=/anonymous/fabo/
-            export LAVA_SERVER=validation.linaro.org/RPC2/
-            export KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/linux-next/${defconfig}/${BUILD_NUMBER}
-            export DTB_URL=${KERNEL_URL}/dtbs
-            export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20141121-301.rootfs.tar.gz
-            [ "${ARCH}" = "arm64" ] && export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv8/linaro-image-minimal-genericarmv8-20141122-721.rootfs.tar.gz
-
-            # Hack to use submit LAVA jobs directly
-            python lci-build-tools/dtb-to-device.py
diff --git a/linux-stable.yaml b/linux-stable.yaml
deleted file mode 100644
index 6e62335a8c..0000000000
--- a/linux-stable.yaml
+++ /dev/null
@@ -1,132 +0,0 @@
-- job:
-    name: linux-stable
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - file:
-            name: defconfig.properties
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: linaro-kernel-ci
-    child-workspace: .
-    display-name: 'Linux Stable Kernel (linux-3.14.y)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/linux-3.14.y:refs/remotes/origin/linux-3.14.y
-            name: origin
-            branches: 
-                - refs/heads/linux-3.14.y
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm
-                - arm64
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - defconfig_list
-        - axis:
-            type: slave
-            name: label
-            values:
-                - linaro-kernel-ci
-    execution-strategy:
-        combination-filter: |
-            (ARCH=="arm" && defconfig!="defconfig") || (ARCH=="arm64" && defconfig=="defconfig")
-        sequential: true
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: linaro-kernel-ci
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -rf configs
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS 
-            export use_ccache=true
-            export make_silent=true
-            export make_deb=false
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour="${defconfig}"
-            export kernel_config="${defconfig}_defconfig"
-            export MAKE_DTBS=true
-            export tcbindir="${HOME}/srv/toolchain/arm-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/arm-linux-gnueabihf/gcc-linaro-4.9-2015.02-3-x86_64_arm-linux-gnueabihf.tar.xz"
-
-            [ "${ARCH}" = "arm64" ] && export kernel_config="${defconfig}"
-            [ "${ARCH}" = "arm64" ] && {
-              export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-              export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-            }
-
-            # XXX upstream doesn't use config fragments - pick up from LSK
-            #mkdir -p linaro/configs
-            #for conf_filename in ${conf_filenames[@]}; do
-            #  wget -q "https://git.linaro.org/gitweb?p=kernel/linux-linaro-stable.git;a=blob_plain;f=${conf_filename};hb=refs/heads/linux-linaro-lsk-v3.10" -O ${conf_filename}
-            #done
-
-            test -d lci-build-tools || git clone --depth 1 https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # XXX b2120 vmlinux
-            [ "${defconfig}" = "multi_v7" ] && cp -a builddir-*-${kernel_flavour}/vmlinux out/ || true
-            # XXX mustang uImage
-            [ "${ARCH}" = "arm64" ] && mkimage -A arm -O linux -C none -T kernel -a 0x00080000 -e 0x00080000 -n Linux -d out/Image out/uImage || true
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/linux-stable/${defconfig}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Start LAVA dance
-            test -d configs || git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            export BUNDLE_STREAM_NAME=/anonymous/fabo/
-            export LAVA_SERVER=validation.linaro.org/RPC2/
-            export KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/linux-stable/${defconfig}/${BUILD_NUMBER}
-            export DTB_URL=${KERNEL_URL}/dtbs
-            export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv7a/linaro-image-minimal-genericarmv7a-20141121-301.rootfs.tar.gz
-            [ "${ARCH}" = "arm64" ] && export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-armv8/linaro-image-minimal-genericarmv8-20141122-721.rootfs.tar.gz
-
-            # Hack to use submit LAVA jobs directly
-            python lci-build-tools/dtb-to-device.py
diff --git a/linux-xen.yaml b/linux-xen.yaml
deleted file mode 100644
index 2b71d5ace7..0000000000
--- a/linux-xen.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-- job:
-    name: linux-xen
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: true
-    display-name: 'Linaro Xen image builds'
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - mustang
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-amd64
-    triggers:
-        - timed: 'H(0-30) H(12) * * *'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash -e
-            rm -rf xen-ci
-            git clone git://git.linaro.org/ci/xen-ci.git xen-ci
-
-            bash ./xen-ci/jenkins/xen-image
-            # Publish
-            mkdir -p out/
-            mv xenlava-${hwpack}.img.xz xenlava-${hwpack}.tar.xz *.dtb Image* uXen* out/||true
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out ubuntu/images/xen/${hwpack}/${BUILD_NUMBER}/
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/lite-aeolus-jerryscript.yaml b/lite-aeolus-jerryscript.yaml
index 3e4d72a17c..6f3949d4fa 100644
--- a/lite-aeolus-jerryscript.yaml
+++ b/lite-aeolus-jerryscript.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -17,20 +17,39 @@
             days-to-keep: 30
             num-to-keep: 30
             artifact-num-to-keep: 30
+        - throttle:
+            option: project
+            max-per-node: 2
+            matrix-configs: true
     parameters:
         - string:
             name: GIT_URL
-            default: 'https://github.com/jerryscript-project/jerryscript'
+            default: 'https://github.com/pfalcon/jerryscript'
         - string:
             name: BRANCH
-            default: 'master'
+            default: 'zephyr-wip'
+        - string:
+            name: ZEPHYR_GIT_URL
+            default: 'https://github.com/zephyrproject-rtos/zephyr'
+        - string:
+            name: ZEPHYR_BRANCH
+            default: 'main'
         - string:
             name: LAVA_SERVER
             default: 'validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
-    disabled: false
+        - string:
+            name: QA_SERVER_GROUP
+            default: 'lite'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'zephyr-jerryscript'
+        - string:
+            name: USE_QA_SERVER
+            default: '1'
+    disabled: true
     node: master
     child-workspace: .
     display-name: 'LITE Aeolus - JerryScript'
@@ -39,10 +58,10 @@
             type: slave
             name: label
             values:
-                - docker-xenial-amd64-13
+                - docker-focal-amd64-lite
         - axis:
             type: user-defined
-            name: ZEPHYR_GCC_VARIANT
+            name: ZEPHYR_TOOLCHAIN_VARIANT
             values:
                 - zephyr
         - axis:
@@ -50,12 +69,9 @@
             name: PLATFORM
             values:
                 - 96b_carbon
-                - arduino_101
                 - disco_l475_iot1
                 - frdm_k64f
-                # Disabled due to Zephyr toolchain bug,
-                # https://github.com/zephyrproject-rtos/meta-zephyr-sdk/issues/91
-                #- frdm_kw41z
+                - frdm_kw41z
                 - qemu_cortex_m3
                 - qemu_x86
     wrappers:
@@ -74,6 +90,10 @@
                 variable: QA_REPORTS_TOKEN
     builders:
         - shell:
+            !include-raw: lite-common/header.sh
+        - shell:
+            !include-raw: lite-common/install-toolchains.sh
+        - shell:
             !include-raw:
                 - lite-aeolus/build-init.sh
                 - lite-aeolus/build-jerryscript.sh
@@ -81,7 +101,7 @@
         - inject:
             properties-file: env_var_parameters
         - build-name-setter:
-            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
+            template: '#${BUILD_NUMBER}-${GIT_COMMIT_ID}'
             macro: true
         - linaro-publish-token
         - shell: |
@@ -92,10 +112,10 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
-              out/${PLATFORM} components/kernel/aeolus-2/jerryscript/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+              out/${PLATFORM} components/kernel/aeolus-2/jerryscript/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
 
             rm -rf out
         - shell: |
@@ -104,9 +124,9 @@
             echo "Preparing to submit to LAVA"
 
             case "${PLATFORM}" in
-              #arduino_101)
-              #  export DEVICE_TYPE=arduino101
-              #  ;;
+              disco_l475_iot1)
+                export DEVICE_TYPE=disco-l475-iot1
+                ;;
               frdm_k64f)
                 export DEVICE_TYPE=frdm-k64f
                 ;;
@@ -123,17 +143,18 @@
 
             rm -rf configs
             git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+            git clone --depth 1 https://github.com/pfalcon/lite-build-tools
 
             cd configs/lite-aeolus
 
-            export IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/jerryscript/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/zephyr.bin"
+            export IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/jerryscript/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/zephyr.bin"
 
             [ -z "${DEVICE_TYPE}" ] || \
-            python submit-for-test.py "Zephyr version"
+            ./submit-test.sh "Zephyr version"
 
     publishers:
         - groovy-postbuild:
             script:
                 !include-raw: lite-aeolus/description-lava-link.groovy
-        - email:
-            recipients: 'paul.sokolovsky@linaro.org'
+#        - email:
+#            recipients: 'first.last@linaro.org'
diff --git a/lite-aeolus-micropython.yaml b/lite-aeolus-micropython.yaml
index 56d4817c98..e0e059f628 100644
--- a/lite-aeolus-micropython.yaml
+++ b/lite-aeolus-micropython.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -26,17 +26,26 @@
             default: 'pfalcon'
         - string:
             name: ZEPHYR_GIT_URL
-            default: 'https://git.linaro.org/lite/zephyr.git'
+            default: 'https://github.com/zephyrproject-rtos/zephyr'
         - string:
             name: ZEPHYR_BRANCH
-            default: 'master'
+            default: 'main'
         - string:
             name: LAVA_SERVER
             default: 'validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
-    disabled: false
+        - string:
+            name: QA_SERVER_GROUP
+            default: 'lite'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'zephyr-micropython'
+        - string:
+            name: USE_QA_SERVER
+            default: '1'
+    disabled: true
     node: master
     child-workspace: .
     display-name: 'LITE Aeolus - MicroPython'
@@ -45,21 +54,21 @@
             type: slave
             name: label
             values:
-                - docker-xenial-amd64-13
+                - docker-focal-amd64-lite
         - axis:
             type: user-defined
-            name: ZEPHYR_GCC_VARIANT
+            name: ZEPHYR_TOOLCHAIN_VARIANT
             values:
                 - zephyr
         - axis:
             type: user-defined
             name: PLATFORM
             values:
-                - 96b_carbon
-                - arduino_101
+                #- 96b_carbon
                 - disco_l475_iot1
                 - frdm_k64f
                 - frdm_kw41z
+                - mps2_an385
                 - qemu_cortex_m3
                 - qemu_x86
     wrappers:
@@ -78,6 +87,10 @@
                 variable: QA_REPORTS_TOKEN
     builders:
         - shell:
+            !include-raw: lite-common/header.sh
+        - shell:
+            !include-raw: lite-common/install-toolchains.sh
+        - shell:
             !include-raw:
                 - lite-aeolus/build-init.sh
                 - lite-aeolus/build-micropython.sh
@@ -85,7 +98,7 @@
         - inject:
             properties-file: env_var_parameters
         - build-name-setter:
-            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
+            template: '#${BUILD_NUMBER}-${GIT_COMMIT_ID}'
             macro: true
         - linaro-publish-token
         - shell: |
@@ -96,10 +109,10 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
-              out/${PLATFORM} components/kernel/aeolus-2/micropython/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+              out/${PLATFORM} components/kernel/aeolus-2/micropython/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
 
             rm -rf out
         - shell: |
@@ -108,9 +121,9 @@
             echo "Preparing to submit to LAVA"
 
             case "${PLATFORM}" in
-              #arduino_101)
-              #  export DEVICE_TYPE=arduino101
-              #  ;;
+              disco_l475_iot1)
+                export DEVICE_TYPE=disco-l475-iot1
+                ;;
               frdm_k64f)
                 export DEVICE_TYPE=frdm-k64f
                 export TEST_TYPE=upy-testsuite
@@ -128,17 +141,18 @@
 
             rm -rf configs
             git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+            git clone --depth 1 https://github.com/pfalcon/lite-build-tools
 
             cd configs/lite-aeolus
 
-            export IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/micropython/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/zephyr.bin"
+            export IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/micropython/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/zephyr.bin"
 
             [ -z "${DEVICE_TYPE}" ] || \
-            python submit-for-test.py "for more information"
+            ./submit-test.sh "for more information"
 
     publishers:
         - groovy-postbuild:
             script:
                 !include-raw: lite-aeolus/description-lava-link.groovy
-        - email:
-            recipients: 'paul.sokolovsky@linaro.org'
+#        - email:
+#            recipients: 'first.last@linaro.org'
diff --git a/lite-aeolus-openamp.yaml b/lite-aeolus-openamp.yaml
new file mode 100644
index 0000000000..9ebd23bd77
--- /dev/null
+++ b/lite-aeolus-openamp.yaml
@@ -0,0 +1,125 @@
+- job:
+    name: lite-aeolus-openamp
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 30
+    parameters:
+        - string:
+            name: GIT_URL
+            default: 'https://github.com/OpenAMP/libmetal'
+        - string:
+            name: BRANCH
+            default: 'master'
+        - string:
+            name: ZEPHYR_GIT_URL
+            default: 'https://github.com/zephyrproject-rtos/zephyr'
+        - string:
+            name: ZEPHYR_BRANCH
+            default: 'master'
+        - string:
+            name: LAVA_SERVER
+            default: 'validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_GROUP
+            default: 'lite'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'openamp'
+        - string:
+            name: USE_QA_SERVER
+            default: '1'
+        # Normally we just pull to existing repo checkouts, but can re-clone
+        # from scratch with this setting.
+        - string:
+            name: GIT_RECLONE
+            default: '0'
+    disabled: true
+    node: master
+    child-workspace: .
+    display-name: 'LITE Aeolus - OpenAMP'
+    axes:
+        - axis:
+            type: slave
+            name: label
+            values:
+                - x86_64-13
+        - axis:
+            type: user-defined
+            name: ZEPHYR_TOOLCHAIN_VARIANT
+            values:
+                - zephyr
+        - axis:
+            type: user-defined
+            name: PLATFORM
+            values:
+                - qemu_xilinx
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            rm -rf job-configs
+            git clone --depth 1 http://git.linaro.org/ci/job/configs.git job-configs
+        - shell: |
+            ./job-configs/lite-aeolus-openamp/install-deps-nonroot.sh
+        - shell: |
+            ./job-configs/lite-aeolus-openamp/build.sh
+        - inject:
+            properties-file: env_var_parameters
+        - build-name-setter:
+            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
+            macro: true
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            echo "Publishing artifacts"
+
+            # Publish. Need to publish out of a directory to make files publicly accessible.
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python ${HOME}/bin/linaro-cp.py \
+              --api_version 3 \
+              --link-latest \
+              out/ components/kernel/aeolus-2/openamp/${BRANCH}/${PLATFORM}/${BUILD_NUMBER}
+
+            rm -rf out
+        - shell: |
+            rm -rf lite-build-tools
+            git clone --depth 1 https://github.com/pfalcon/lite-build-tools
+            ./job-configs/lite-aeolus-openamp/submit-test.sh
+
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw: lite-aeolus/description-lava-link.groovy
+#        - email:
+#            recipients: 'ed.mooring@linaro.org'
diff --git a/lite-aeolus-openamp/build.sh b/lite-aeolus-openamp/build.sh
new file mode 100755
index 0000000000..86d8f91dd1
--- /dev/null
+++ b/lite-aeolus-openamp/build.sh
@@ -0,0 +1,55 @@
+#!/bin/bash
+set -ex
+
+id
+
+# During initial job setup, we didn't build anything, just downloaded
+# pre-built image to check LAVA integration, etc. Left around for
+# debugging.
+#wget -q https://people.linaro.org/~ed.mooring/Images/openamp-image-minimal-zcu102-zynqmp.wic.qemu-sd
+
+if [ "${GIT_RECLONE}" == "1" ]; then
+    rm -rf openamp
+fi
+
+mkdir -p openamp
+cd openamp
+
+if [ ! -d open-amp ]; then
+    git clone https://github.com/OpenAMP/open-amp
+else
+    (cd open-amp; git pull --rebase)
+fi
+if [ ! -d libmetal ]; then
+    git clone https://github.com/OpenAMP/libmetal
+else
+    (cd libmetal; git pull --rebase)
+fi
+if [ ! -d embeddedsw ]; then
+    git clone https://github.com/Xilinx/embeddedsw
+    (cd embeddedsw; git checkout xilinx-v2019.2)
+else
+    (cd embeddedsw; git checkout xilinx-v2019.2)
+fi
+
+(
+    cd open-amp
+    echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > ../../env_var_parameters
+    echo "EXTERNAL_BUILD_ID=$(git rev-parse --short=8 HEAD)-${BUILD_NUMBER}" >> ../../env_var_parameters
+)
+
+cd ..
+
+mkdir -p /home/buildslave/srv/lite-aeolus-openamp/downloads
+
+rm -f xilinx-openamp-build.cid
+docker run --cidfile xilinx-openamp-build.cid \
+    -v /home/buildslave/srv/lite-aeolus-openamp/downloads:/home/build/prj/build/downloads \
+    -v $PWD/openamp:/home/build/prj/openamp \
+    pfalcon/xilinx-openamp-build:v3 \
+    /bin/bash -c "cd ~/prj; source setupsdk; MACHINE=zcu102-zynqmp bitbake openamp-image-minimal"
+
+rm -rf out
+mkdir out
+cid=$(cat xilinx-openamp-build.cid)
+docker cp -L $cid:/home/build/prj/build/tmp/deploy/images/zcu102-zynqmp/openamp-image-minimal-zcu102-zynqmp.wic.qemu-sd out/
diff --git a/lite-aeolus-openamp/install-deps-nonroot.sh b/lite-aeolus-openamp/install-deps-nonroot.sh
new file mode 100755
index 0000000000..51f747920e
--- /dev/null
+++ b/lite-aeolus-openamp/install-deps-nonroot.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -ex
+
+python3 --version
+python3 -c 'import sys; print(sys.path)'
+
+pip3 install --user requests
diff --git a/lite-aeolus-openamp/install-deps.sh b/lite-aeolus-openamp/install-deps.sh
new file mode 100755
index 0000000000..d7fa1fc9a6
--- /dev/null
+++ b/lite-aeolus-openamp/install-deps.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+set -ex
+
+export DEBIAN_FRONTEND=noninteractive
+sudo apt-get -qq update
+sudo apt-get -qq -y install jq python3-pip
+pip3 install yq
diff --git a/lite-aeolus-openamp/submit-test.sh b/lite-aeolus-openamp/submit-test.sh
new file mode 100755
index 0000000000..146fddc7bf
--- /dev/null
+++ b/lite-aeolus-openamp/submit-test.sh
@@ -0,0 +1,27 @@
+#!/bin/sh
+set -ex
+
+export PATH=$HOME/.local/bin:$PATH
+dir=$(dirname $0)
+
+# For now, always check out latest version
+rm -rf lite-lava-docker-compose
+if [ ! -d lite-lava-docker-compose ]; then
+    git clone https://github.com/Linaro/lite-lava-docker-compose
+fi
+
+IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/openamp/${BRANCH}/${PLATFORM}/${BUILD_NUMBER}/openamp-image-minimal-zcu102-zynqmp.wic.qemu-sd"
+
+# Replace image url (passed as docker image command-line arg) in the job
+# template.
+
+# "yq" the Python version, https://github.com/kislyuk/yq, requires jq
+#yq -y ".actions[1].boot.command=\"$IMAGE_URL\"" lite-lava-docker-compose/example/docker-xilinx-qemu-openamp-echo_test.job > lava.job
+
+# "yq" the Go version, https://github.com/mikefarah/yq
+wget -q https://github.com/mikefarah/yq/releases/download/3.1.0/yq_linux_amd64
+chmod +x yq_linux_amd64
+./yq_linux_amd64 w lite-lava-docker-compose/example/docker-xilinx-qemu-openamp-echo_test.job actions[1].boot.command $IMAGE_URL > lava.job
+
+cat lava.job
+python3 $dir/../../lite-build-tools/lava_submit.py lava.job
diff --git a/lite-aeolus-zephyr.js.yaml b/lite-aeolus-zephyr.js.yaml
index b48691c6f9..7cd0749d2d 100644
--- a/lite-aeolus-zephyr.js.yaml
+++ b/lite-aeolus-zephyr.js.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -20,17 +20,17 @@
     parameters:
         - string:
             name: GIT_URL
-            default: 'https://github.com/01org/zephyr.js'
+            default: 'https://git.linaro.org/lite/zephyr.js.git'
         - string:
             name: BRANCH
-            default: 'master'
+            default: 'zephyr-1.14'
         - string:
             name: LAVA_SERVER
             default: 'validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
-    disabled: false
+    disabled: true
     node: master
     child-workspace: .
     display-name: 'LITE Aeolus - Zephyr.js'
@@ -42,7 +42,7 @@
                 - docker-xenial-amd64-13
         - axis:
             type: user-defined
-            name: ZEPHYR_GCC_VARIANT
+            name: ZEPHYR_TOOLCHAIN_VARIANT
             values:
                 - zephyr
         - axis:
@@ -50,7 +50,6 @@
             name: PLATFORM
             values:
                 - 96b_carbon
-                - arduino_101
                 - frdm_k64f
                 - qemu_cortex_m3
                 - qemu_x86
@@ -88,10 +87,10 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
-              out/${PLATFORM} components/kernel/aeolus-2/zephyr.js/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+              out/${PLATFORM} components/kernel/aeolus-2/zephyr.js/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
 
             rm -rf out
         - shell: |
@@ -102,9 +101,9 @@
             BIN_EXT=bin
 
             case "${PLATFORM}" in
-              #arduino_101)
-              #  export DEVICE_TYPE=arduino101
-              #  ;;
+              disco_l475_iot1)
+                export DEVICE_TYPE=disco-l475-iot1
+                ;;
               frdm_k64f)
                 export DEVICE_TYPE=frdm-k64f
                 ;;
@@ -126,14 +125,14 @@
 
             cd configs/lite-aeolus
 
-            export IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/zephyr.js/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/zephyr.${BIN_EXT}"
+            export IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/zephyr.js/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/zephyr.${BIN_EXT}"
 
             [ -z "${DEVICE_TYPE}" ] || \
-            python submit-for-test.py "Hello, ZJS world!"
+            python3 submit-for-test.py "Hello, ZJS world!"
 
     publishers:
         - groovy-postbuild:
             script:
                 !include-raw: lite-aeolus/description-lava-link.groovy
-        - email:
-            recipients: 'paul.sokolovsky@linaro.org'
+#        - email:
+#            recipients: 'paul.sokolovsky@linaro.org'
diff --git a/lite-aeolus/build-init.sh b/lite-aeolus/build-init.sh
index 3bdfc8f161..a935eca6be 100644
--- a/lite-aeolus/build-init.sh
+++ b/lite-aeolus/build-init.sh
@@ -1,40 +1,63 @@
 #!/bin/bash
 set -ex
 
+export LANG=C.UTF-8
+
+if python3 --version | grep -q " 3\.[5]"; then
+    # Zephyr 2.2+ requires Python3.6. As it's not available in official distro
+    # packages for Ubuntu Xenial (16.04) which we use, install it from PPA.
+    echo Upgrading Python from deadsnakes PPA
+    sudo add-apt-repository -y ppa:deadsnakes/ppa
+    sudo apt-get -q=2 update
+    sudo apt-get install -y python3.6
+    sudo ln -sf python3.6 /usr/bin/python3
+fi
+
 sudo apt-get -q=2 update
-#sudo apt-get -q=2 -y install git g++ libc6-dev-i386 g++-multilib python3-ply python3-yaml gcc-arm-none-eabi python-requests rsync device-tree-compiler
-sudo apt-get -q=2 -y install python3-pip python-serial python3-serial socat
+
+# python-is-python2 is needed for Google depot_tools below.
+sudo apt-get -q=2 -y install python3-pip python3-setuptools python3-serial rename socat python-is-python2
+
+# pip as shipped by distro may be not up to date enough to support some
+# quirky PyPI packages, specifically cmake was caught like that.
+sudo pip3 install --upgrade pip
 
 sudo pip3 install pyelftools
+# Zephyr requires very recent version of CMake. Strangely enough, such
+# can be installed from PyPI.
+sudo pip3 install cmake
+
+sudo pip3 install west
+west --version
 
 git clone --depth 1 https://chromium.googlesource.com/chromium/tools/depot_tools ${HOME}/depot_tools
 PATH=${HOME}/depot_tools:${PATH}
 git clone --depth 1 ${GIT_URL} -b ${BRANCH} ${WORKSPACE}
-git-retry submodule sync --recursive
-git-retry submodule update --init --recursive --checkout
-git clean -fdx
-echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters
-
-# Toolchains are pre-installed and come from:
-# https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-# https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.2/zephyr-sdk-0.9.2-setup.run
-# To install Zephyr SDK: ./zephyr-sdk-0.9.2-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.2"
-
-case "${ZEPHYR_GCC_VARIANT}" in
-  gccarmemb)
-    export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-6-2017-q2-update"
-  ;;
-  zephyr)
-    export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.9.2"
-  ;;
-esac
+(cd ${WORKSPACE}; git describe --always)
+
+# We used to call git-retry shell wrapper, until it started to choose
+# a wrong Python interpreter. "_" below is a param ignored when executing
+# git_retry.py directly.
+#python ${HOME}/depot_tools/git_retry.py _ submodule sync --recursive
+#python ${HOME}/depot_tools/git_retry.py _ submodule update --init --recursive --checkout
+
+#git clean -fdx
+
+GIT_COMMIT_ID=$(git rev-parse --short=8 HEAD)
+echo "GIT_COMMIT_ID=${GIT_COMMIT_ID}" >${WORKSPACE}/env_var_parameters
+
+# Toolchains are downloaded once (per release) and cached in a persistent
+# docker volume under ${HOME}/srv/toolchain/.
+# Note that Zephyr SDK is needed even when building with the gnuarmemb
+# toolchain, ZEPHYR_SDK_INSTALL_DIR is needed to find things like conf.
+export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.15.0"
+export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-9-2019-q4-major"
 
 # Set build environment variables
-LANG=C
 ZEPHYR_BASE=${WORKSPACE}
 PATH=${ZEPHYR_BASE}/scripts:${PATH}
-OUTDIR=${HOME}/srv/zephyr/${ZEPHYR_GCC_VARIANT}/${PLATFORM}
-export LANG ZEPHYR_BASE PATH
+OUTDIR=${HOME}/srv/zephyr/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}
+export ZEPHYR_BASE PATH
 CCACHE_DIR="${HOME}/srv/ccache"
 CCACHE_UNIFY=1
 CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
@@ -43,6 +66,23 @@ export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS USE_CCACHE
 env |grep '^ZEPHYR'
 python3 -c "import sys; print(sys.getdefaultencoding())"
 
+# Clone Zephyr
+git clone --depth 1 ${ZEPHYR_GIT_URL} -b ${ZEPHYR_BRANCH} zephyr
+cd zephyr
+git describe --always
+ZEPHYR_GIT_COMMIT_ID=$(git rev-parse --short=8 HEAD)
+echo "ZEPHYR_GIT_COMMIT_ID=${ZEPHYR_GIT_COMMIT_ID}" >>${WORKSPACE}/env_var_parameters
+cd ..
+west init -l zephyr/
+west update
+(cd zephyr; git clean -fdx)
+. zephyr/zephyr-env.sh
+
+# Build ID to use in external systems, like LAVA/SQUAD. Should include
+# ${BUILD_NUMBER}, to avoid mixing up results of different builds of the
+# same project git revision.
+echo "EXTERNAL_BUILD_ID=${GIT_COMMIT_ID}-z${ZEPHYR_GIT_COMMIT_ID}-${BUILD_NUMBER}" >>${WORKSPACE}/env_var_parameters
+
 echo ""
 echo "########################################################################"
 echo "    Build"
diff --git a/lite-aeolus/build-jerryscript.sh b/lite-aeolus/build-jerryscript.sh
index 8c7414cf2c..67dead1c99 100644
--- a/lite-aeolus/build-jerryscript.sh
+++ b/lite-aeolus/build-jerryscript.sh
@@ -1,8 +1,4 @@
-git clone --depth 1 https://git.linaro.org/lite/zephyr.git
-(cd zephyr; git clean -fdx)
-. zephyr/zephyr-env.sh
-
-make -f ./targets/zephyr/Makefile.zephyr BOARD=${PLATFORM}
+timeout 8m make -f ./targets/zephyr/Makefile.zephyr BOARD=${PLATFORM}
 
 cd ${WORKSPACE}
 mkdir -p out/${PLATFORM}
diff --git a/lite-aeolus/build-micropython.sh b/lite-aeolus/build-micropython.sh
index 1e15143078..bfb4034812 100644
--- a/lite-aeolus/build-micropython.sh
+++ b/lite-aeolus/build-micropython.sh
@@ -1,8 +1,3 @@
-git clone --depth 1 ${ZEPHYR_GIT_URL} -b ${ZEPHYR_BRANCH} zephyr-rtos
-(cd zephyr-rtos; git clean -fdx)
-. zephyr-rtos/zephyr-env.sh
-
-
 small_rom() {
     echo "arduino_101" | grep -F -w -q "$1"
 }
@@ -12,7 +7,15 @@ full_testsuite() {
 }
 
 cd ports/zephyr
-if small_rom ${PLATFORM}; then
+
+if [ ${PLATFORM} = "mps2_an385" ]; then
+    # Build and run binary with embedded testsuite
+    timeout 15m ./run-builtin-testsuite.sh
+    # There's a separate build dir used by run-builtin-testsuite.sh,
+    # move binary where the code below expects it.
+    mkdir -p outdir/${PLATFORM}/zephyr/
+    cp outdir/${PLATFORM}-testsuite/zephyr/zephyr.bin outdir/${PLATFORM}/zephyr/
+elif small_rom ${PLATFORM}; then
     ./make-minimal BOARD=${PLATFORM}
 elif full_testsuite ${PLATFORM}; then
     ./make-bin-testsuite BOARD=${PLATFORM}
@@ -20,11 +23,14 @@ else
     make BOARD=${PLATFORM}
 fi
 
-if [ ${PLATFORM} = "qemu_x86" ]; then
-    rm -f /tmp/slip.sock
-    (socat PTY,link=/tmp/slip.dev UNIX-LISTEN:/tmp/slip.sock &)
-    make BOARD=${PLATFORM} test
-fi
+# Disabled - too unreliable with current QEMUs
+#if [ ${PLATFORM} = "qemu_x86" ]; then
+#    # Run testsuite via piping scripts to REPL - doesn't work reliably
+#    # with QEMU, will likely be removed
+#    rm -f /tmp/slip.sock
+#    (socat PTY,link=/tmp/slip.dev UNIX-LISTEN:/tmp/slip.sock &)
+#    make BOARD=${PLATFORM} test
+#fi
 
 cd ${WORKSPACE}
 mkdir -p out/${PLATFORM}
diff --git a/lite-aeolus/lava-job-definitions/arduino101/template.yaml b/lite-aeolus/lava-job-definitions/arduino101/template.yaml
index c2e61ceb0a..679690aea0 100644
--- a/lite-aeolus/lava-job-definitions/arduino101/template.yaml
+++ b/lite-aeolus/lava-job-definitions/arduino101/template.yaml
@@ -39,12 +39,9 @@ actions:
 $TEST_SPEC
 
 metadata:
-  # For some reason, LAVA doesn't allow to query by real job name,
-  # so we need to duplicate it as metadata.
-  job_name: '$JOB_NAME_SHORT'
   build-url: $BUILD_URL
   build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: $ZEPHYR_GCC_VARIANT
+  zephyr-toolchain-variant: $ZEPHYR_TOOLCHAIN_VARIANT
   platform: $PLATFORM
   git-url: $GIT_URL
-  git-commit: $GIT_COMMIT
+  git-commit: $GIT_COMMIT_ID
diff --git a/lite-aeolus/lava-job-definitions/disco-l475-iot1/template.yaml b/lite-aeolus/lava-job-definitions/disco-l475-iot1/template.yaml
new file mode 100644
index 0000000000..ed392f0c31
--- /dev/null
+++ b/lite-aeolus/lava-job-definitions/disco-l475-iot1/template.yaml
@@ -0,0 +1,39 @@
+device_type: '$DEVICE_TYPE'
+job_name: '$JOB_NAME_SHORT $BUILD_DISPLAY_NAME'
+
+timeouts:
+  job:
+    minutes: 6
+  action:
+    minutes: 3
+  actions:
+    wait-usb-device:
+      seconds: 40
+
+priority: medium
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          url: '$IMAGE_URL'
+
+- boot:
+    method: cmsis-dap
+    timeout:
+      minutes: 3
+
+- test:
+$TEST_SPEC
+
+metadata:
+  build-url: $BUILD_URL
+  build-log: ${BUILD_URL}consoleText
+  zephyr-toolchain-variant: $ZEPHYR_TOOLCHAIN_VARIANT
+  platform: $PLATFORM
+  git-url: $GIT_URL
+  git-commit: $GIT_COMMIT_ID
diff --git a/lite-aeolus/lava-job-definitions/frdm-k64f/template-upy-testsuite.yaml b/lite-aeolus/lava-job-definitions/frdm-k64f/template-upy-testsuite.yaml
index 641727f9ab..b8cce8882b 100644
--- a/lite-aeolus/lava-job-definitions/frdm-k64f/template-upy-testsuite.yaml
+++ b/lite-aeolus/lava-job-definitions/frdm-k64f/template-upy-testsuite.yaml
@@ -23,7 +23,8 @@ actions:
           url: '$IMAGE_URL'
 
 - boot:
-    method: cmsis-dap
+    method: pyocd
+    failure_retry: 3
     timeout:
       minutes: 3
 
@@ -39,12 +40,12 @@ actions:
         SKIPPED: skip
 
 metadata:
-  # For some reason, LAVA doesn't allow to query by real job name,
-  # so we need to duplicate it as metadata.
-  job_name: '$JOB_NAME_SHORT'
   build-url: $BUILD_URL
   build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: $ZEPHYR_GCC_VARIANT
+  zephyr-toolchain-variant: $ZEPHYR_TOOLCHAIN_VARIANT
   platform: $PLATFORM
   git-url: $GIT_URL
-  git-commit: $GIT_COMMIT
+  git-commit: $GIT_COMMIT_ID
+  zephyr-git-url: $ZEPHYR_GIT_URL
+  zephyr-git-branch: $ZEPHYR_BRANCH
+  zephyr-git-commit: $ZEPHYR_GIT_COMMIT_ID
diff --git a/lite-aeolus/lava-job-definitions/frdm-k64f/template.yaml b/lite-aeolus/lava-job-definitions/frdm-k64f/template.yaml
index 13a7f1a9ca..f2c821bd88 100644
--- a/lite-aeolus/lava-job-definitions/frdm-k64f/template.yaml
+++ b/lite-aeolus/lava-job-definitions/frdm-k64f/template.yaml
@@ -23,7 +23,8 @@ actions:
           url: '$IMAGE_URL'
 
 - boot:
-    method: cmsis-dap
+    method: pyocd
+    failure_retry: 3
     timeout:
       minutes: 3
 
@@ -31,12 +32,9 @@ actions:
 $TEST_SPEC
 
 metadata:
-  # For some reason, LAVA doesn't allow to query by real job name,
-  # so we need to duplicate it as metadata.
-  job_name: '$JOB_NAME_SHORT'
   build-url: $BUILD_URL
   build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: $ZEPHYR_GCC_VARIANT
+  zephyr-toolchain-variant: $ZEPHYR_TOOLCHAIN_VARIANT
   platform: $PLATFORM
   git-url: $GIT_URL
-  git-commit: $GIT_COMMIT
+  git-commit: $GIT_COMMIT_ID
diff --git a/lite-aeolus/lava-job-definitions/frdm-kw41z/template.yaml b/lite-aeolus/lava-job-definitions/frdm-kw41z/template.yaml
index c377a3134c..864a402411 100644
--- a/lite-aeolus/lava-job-definitions/frdm-kw41z/template.yaml
+++ b/lite-aeolus/lava-job-definitions/frdm-kw41z/template.yaml
@@ -31,12 +31,9 @@ actions:
 $TEST_SPEC
 
 metadata:
-  # For some reason, LAVA doesn't allow to query by real job name,
-  # so we need to duplicate it as metadata.
-  job_name: '$JOB_NAME_SHORT'
   build-url: $BUILD_URL
   build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: $ZEPHYR_GCC_VARIANT
+  zephyr-toolchain-variant: $ZEPHYR_TOOLCHAIN_VARIANT
   platform: $PLATFORM
   git-url: $GIT_URL
-  git-commit: $GIT_COMMIT
+  git-commit: $GIT_COMMIT_ID
diff --git a/lite-aeolus/lava-job-definitions/qemu/template.yaml b/lite-aeolus/lava-job-definitions/qemu/template.yaml
index 04d17aadaf..dd6712c2eb 100644
--- a/lite-aeolus/lava-job-definitions/qemu/template.yaml
+++ b/lite-aeolus/lava-job-definitions/qemu/template.yaml
@@ -37,12 +37,9 @@ actions:
 $TEST_SPEC
 
 metadata:
-  # For some reason, LAVA doesn't allow to query by real job name,
-  # so we need to duplicate it as metadata.
-  job_name: '$JOB_NAME_SHORT'
   build-url: $BUILD_URL
   build-log: ${BUILD_URL}consoleText
-  zephyr-gcc-variant: $ZEPHYR_GCC_VARIANT
+  zephyr-toolchain-variant: $ZEPHYR_TOOLCHAIN_VARIANT
   platform: $PLATFORM
   git-url: $GIT_URL
-  git-commit: $GIT_COMMIT
+  git-commit: $GIT_COMMIT_ID
diff --git a/lite-aeolus/submit-for-test.py b/lite-aeolus/submit-for-test.py
index 698947400c..91aa6b6a47 100644
--- a/lite-aeolus/submit-for-test.py
+++ b/lite-aeolus/submit-for-test.py
@@ -1,7 +1,8 @@
 import os
 import sys
 from string import Template
-import xmlrpclib
+import xmlrpc.client
+
 
 # Actually submit job to LAVA
 SUBMIT = 1
@@ -36,7 +37,7 @@ if SUBMIT:
     username = os.getenv("LAVA_USER")
     token = os.getenv("LAVA_TOKEN")
     uri = os.getenv("LAVA_SERVER")
-    server = xmlrpclib.ServerProxy("https://%s:%s@%s" % (username, token, uri))
+    server = xmlrpc.client.ServerProxy("https://%s:%s@%s" % (username, token, uri))
 
     job_id = server.scheduler.submit_job(jobdef)
     print("LAVA: https://%s../scheduler/job/%s" % (uri, job_id))
diff --git a/lite-aeolus/submit-test.sh b/lite-aeolus/submit-test.sh
new file mode 100755
index 0000000000..8925d9af01
--- /dev/null
+++ b/lite-aeolus/submit-test.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+set -ex
+
+dir=$(dirname $0)
+
+python3 template-jobdef.py "$1" >jobdef.$$
+cat jobdef.$$
+python3 $dir/../../lite-build-tools/lava_submit.py jobdef.$$
diff --git a/lite-aeolus/template-jobdef.py b/lite-aeolus/template-jobdef.py
new file mode 100644
index 0000000000..3d2dfa4dde
--- /dev/null
+++ b/lite-aeolus/template-jobdef.py
@@ -0,0 +1,30 @@
+import os
+import sys
+from string import Template
+
+
+ENV = os.environ
+expect = sys.argv[1]
+
+ENV["JOB_NAME_SHORT"] = ENV["JOB_NAME"].split("/", 1)[0]
+
+tpl_suffix = ENV.get("TEST_TYPE", "")
+if tpl_suffix:
+    tpl_suffix = "-" + tpl_suffix
+
+with open("lava-job-definitions/%s/template%s.yaml" % (ENV["DEVICE_TYPE"], tpl_suffix)) as f:
+    tpl = f.read()
+
+
+TEST_SPEC = """\
+    monitors:
+    - name: "boot_test"
+      start: ""
+      end: "%s"
+      pattern: _unused_
+""" % expect
+
+tpl = Template(tpl)
+jobdef = tpl.safe_substitute(ENV, TEST_SPEC=TEST_SPEC)
+
+print(jobdef)
diff --git a/lite-common/README b/lite-common/README
new file mode 100644
index 0000000000..e459b38e2c
--- /dev/null
+++ b/lite-common/README
@@ -0,0 +1,2 @@
+This directory contains common scripts and files reused by different LITE
+jobs.
diff --git a/lite-common/header.sh b/lite-common/header.sh
new file mode 100644
index 0000000000..21a8b454b3
--- /dev/null
+++ b/lite-common/header.sh
@@ -0,0 +1,13 @@
+cat /etc/issue
+
+echo "PWD: $PWD"
+
+mount
+df -h
+
+ls -l ${HOME}/srv/toolchain/
+
+gcc --version
+g++ --version
+ccache --version
+python3 --version
diff --git a/lite-common/install-toolchains.sh b/lite-common/install-toolchains.sh
new file mode 100644
index 0000000000..b5f5b741ef
--- /dev/null
+++ b/lite-common/install-toolchains.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+# Toolchains are downloaded, installed, and cached on a persistent disk
+# under ${HOME}/srv/toolchain/ .
+
+set -ex
+
+ZEPHYR_SDK_VER="0.15.0"
+
+ZEPHYR_SDK_URL="https://github.com/zephyrproject-rtos/sdk-ng/releases/download/v${ZEPHYR_SDK_VER}/zephyr-sdk-${ZEPHYR_SDK_VER}_linux-x86_64.tar.gz"
+GNUARMEMB_TOOLCHAIN_URL="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2"
+
+ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-${ZEPHYR_SDK_VER}"
+GNUARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-9-2019-q4-major"
+
+install_zephyr_sdk()
+{
+    test -d ${ZEPHYR_SDK_INSTALL_DIR} && return 0
+    test -f ${ZEPHYR_SDK_INSTALL_DIR}.lck && exit 1
+    touch ${ZEPHYR_SDK_INSTALL_DIR}.lck
+    wget -q "${ZEPHYR_SDK_URL}"
+    tar xfa $(basename ${ZEPHYR_SDK_URL}) -C $(dirname ${ZEPHYR_SDK_INSTALL_DIR})
+    (cd ${ZEPHYR_SDK_INSTALL_DIR}; ./zephyr-sdk-x86_64-hosttools-standalone-0.9.sh -y -d .)
+    rm -f ${ZEPHYR_SDK_INSTALL_DIR}.lck
+}
+
+install_arm_toolchain()
+{
+    test -d ${GNUARMEMB_TOOLCHAIN_PATH} && return 0
+    wget -q "${GNUARMEMB_TOOLCHAIN_URL}"
+    top=$(dirname ${GNUARMEMB_TOOLCHAIN_PATH})
+    rm -rf ${top}/_tmp.$$
+    mkdir -p ${top}/_tmp.$$
+    tar -C ${top}/_tmp.$$ -xaf $(basename ${GNUARMEMB_TOOLCHAIN_URL})
+    mv ${top}/_tmp.$$/$(basename ${GNUARMEMB_TOOLCHAIN_PATH}) ${top}
+}
+
+install_zephyr_sdk
+install_arm_toolchain
+
+sudo pip3 install cmake==3.20.2
+
+cmake --version
+${ZEPHYR_SDK_INSTALL_DIR}/sysroots/x86_64-pokysdk-linux/usr/bin/dtc --version
diff --git a/lite-common/lava-submit.py b/lite-common/lava-submit.py
new file mode 100644
index 0000000000..a5222039c6
--- /dev/null
+++ b/lite-common/lava-submit.py
@@ -0,0 +1,29 @@
+import os
+import sys
+import xmlrpc.client
+
+
+# Actually submit job to LAVA
+SUBMIT = 1
+
+ENV = os.environ
+
+with open(sys.argv[1]) as f:
+    jobdef = f.read()
+
+if SUBMIT:
+    username = ENV["LAVA_USER"]
+    token = ENV["LAVA_TOKEN"]
+    uri = ENV["LAVA_SERVER"]
+    if not uri.endswith("/"):
+        uri += "/"
+
+    server = xmlrpc.client.ServerProxy("https://%s:%s@%s" % (username, token, uri))
+
+    job_id = server.scheduler.submit_job(jobdef)
+    # Multinode job submission returns a list of per-node id's. We output
+    # just the first id, as the rest of related jobs are reachable from
+    # LAVA UI.
+    if isinstance(job_id, list):
+        job_id = job_id[0]
+    print("LAVA: https://%s../scheduler/job/%s" % (uri, job_id))
diff --git a/lite-gateway-ubuntu-core.yaml b/lite-gateway-ubuntu-core.yaml
deleted file mode 100644
index bc62f76e26..0000000000
--- a/lite-gateway-ubuntu-core.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job:
-    name: lite-gateway-ubuntu-core
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: MACHINES
-            default: 'dragonboard-410c pi-2 pi-3 hummingboard'
-    disabled: false
-    node: docker-xenial-amd64
-    display-name: 'LITE - Ubuntu Core gateway image'
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - snap.tar
-            relative-to: 'somewhereElse'
-    builders:
-        - shell:
-            !include-raw: lite-gateway-ubuntu-core/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash -e
-
-            mkdir out
-            for machine in ${MACHINES}; do
-                pxz ubuntu-core-16-${machine}-lite.img
-                mv ubuntu-core-16-${machine}-lite.img.xz out/
-            done
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out ubuntu/images/lite-gateway/${BUILD_NUMBER}
-
-            rm -rf out
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org madper.xie@linaro.org'
diff --git a/lite-iot-ci.yaml b/lite-iot-ci.yaml
new file mode 100644
index 0000000000..14e23c80cb
--- /dev/null
+++ b/lite-iot-ci.yaml
@@ -0,0 +1,17 @@
+# This describes Jenkins view for various LITE jobs.
+- view:
+    name: lite-iot-ci
+    view-type: list
+    job-name:
+    - lite-gateway-ubuntu-core
+    - lite-aeolus-jerryscript
+    - lite-aeolus-micropython
+    - lite-aeolus-zephyr.js
+    - lite-aeolus-openamp
+    - lite-tf-m
+    - zephyr-upstream
+    - zephyr-upstream-arm
+    - zephyr-net
+    - trigger-lite-gateway-ubuntu-core
+    - trigger-zephyr-aeolus
+    - trigger-zephyr-upstream
diff --git a/lite-openembedded-zcu102-rocko.yaml b/lite-openembedded-zcu102-rocko.yaml
index 506fa57bd7..4f8dd73108 100644
--- a/lite-openembedded-zcu102-rocko.yaml
+++ b/lite-openembedded-zcu102-rocko.yaml
@@ -30,7 +30,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -55,7 +55,7 @@
         - string:
             name: PUB_DEST
             default: 'openembedded/lite/${BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-    disabled: false
+    disabled: true
     node: docker-stretch-amd64
     display-name: 'LITE - OpenEmbedded for Xilinx ZCU102 (rocko)'
     scm:
@@ -117,7 +117,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --server ${PUBLISH_SERVER} \
               --link-latest \
             ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
diff --git a/lite-tf-m.yaml b/lite-tf-m.yaml
new file mode 100644
index 0000000000..b4941ab06f
--- /dev/null
+++ b/lite-tf-m.yaml
@@ -0,0 +1,124 @@
+- job:
+    name: lite-tf-m
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            paul.sokolovsky@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 30
+        - throttle:
+            option: category
+            categories: [lite-zephyr]
+            matrix-builds: false
+            matrix-configs: true
+    parameters:
+        - string:
+            name: BRANCH
+            default: 'master'
+        - string:
+            name: GIT_COMMIT
+            default: 'd3c5cd90d792'
+        - string:
+            name: LAVA_SERVER
+            default: 'validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_GROUP
+            default: 'lite'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'lite-tf-m'
+        - string:
+            name: USE_QA_SERVER
+            default: '1'
+    disabled: true
+    node: master
+    child-workspace: .
+    display-name: "LITE - TrustedFirmware-M"
+    triggers:
+        - timed: 'H 5 * * *'
+    axes:
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-focal-amd64-lite
+        - axis:
+            type: user-defined
+            name: ZEPHYR_TOOLCHAIN_VARIANT
+            values:
+                - gnuarmemb
+        - axis:
+            type: user-defined
+            name: PLATFORM
+            values:
+                - AN521
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            rm -rf job-configs
+            git clone --depth 1 https://git.linaro.org/ci/job/configs.git job-configs
+        - shell: |
+            ./job-configs/lite-tf-m/install-deps.sh
+        - shell: |
+            ./job-configs/lite-tf-m/build.sh
+        - inject:
+            properties-file: env_var_parameters
+#        - build-name-setter:
+#            template: '#${BUILD_NUMBER}-${GIT_COMMIT_ID}'
+#            macro: true
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            # Publish. Need to publish out of a directory to make files publicly accessible.
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --api_version 3 \
+              --link-latest \
+              out/ components/kernel/aeolus-2/tf-m/${BRANCH}/${PLATFORM}/${BUILD_NUMBER}
+
+        - shell: |
+            #!/bin/bash -ex
+
+            rm -rf configs
+            git clone --depth 1 https://git.linaro.org/ci/job/configs.git
+            git clone --depth 1 https://github.com/pfalcon/lite-build-tools
+            ./configs/lite-tf-m/submit-test.sh
+
+#    publishers:
+#        - email:
+#            recipients: 'paul.sokolovsky@linaro.org'
diff --git a/lite-tf-m/build.sh b/lite-tf-m/build.sh
new file mode 100755
index 0000000000..b45d99bd53
--- /dev/null
+++ b/lite-tf-m/build.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+set -ex
+
+dir=$(dirname $(readlink -f $0))
+
+# We don't build anything so far, just downloading pre-built.
+#wget https://people.linaro.org/~kevin.townsend/lava/an521_tfm_full.hex -O tfm_full.hex
+
+#TOOLCHAINS=${HOME}/srv/toolchain
+TOOLCHAINS=${WORKSPACE}/srv/toolchain
+
+GNUARMEMB_TOOLCHAIN_PATH="${TOOLCHAINS}/gcc-arm-none-eabi-9-2019-q4-major"
+export PATH=${GNUARMEMB_TOOLCHAIN_PATH}/bin:$PATH
+
+git clone https://git.trustedfirmware.org/trusted-firmware-m.git -b ${BRANCH}
+(cd trusted-firmware-m; git checkout ${GIT_COMMIT})
+#git clone --depth 1 https://github.com/ARMmbed/mbed-crypto.git -b mbedcrypto-3.0.1
+git clone --depth 1 https://github.com/ARMmbed/mbedtls.git -b mbedtls-2.23.0
+git clone https://git.trustedfirmware.org/TF-M/tf-m-tests.git
+(cd tf-m-tests; git checkout be6769d4fc773886faedb172f15532a79babe677)
+
+cd trusted-firmware-m
+echo "GIT_COMMIT_ID=$(git rev-parse --short=8 HEAD)" > ${WORKSPACE}/env_var_parameters
+echo "EXTERNAL_BUILD_ID=$(git rev-parse --short=8 HEAD)-${BUILD_NUMBER}" >> ${WORKSPACE}/env_var_parameters
+
+arm-none-eabi-gcc --version
+
+mkdir BUILD
+cp ${dir}/tfm-build.sh BUILD/
+cd BUILD
+./tfm-build.sh
+
+mkdir -p ${WORKSPACE}/out/
+cp *.hex ${WORKSPACE}/out/
diff --git a/lite-tf-m/install-deps.sh b/lite-tf-m/install-deps.sh
new file mode 100755
index 0000000000..7d283b7f04
--- /dev/null
+++ b/lite-tf-m/install-deps.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+set -ex
+
+export DEBIAN_FRONTEND=noninteractive
+sudo apt-get -qq update
+sudo apt-get -qq -y install python3 python3-pip python3-setuptools python3-click srecord libffi-dev libssl-dev
+
+# As a first step, upgrade pip itself. The one shipping with Ubuntu 18.04
+# is rather old by now, and may have issues installing modern .whl packages.
+sudo pip3 install -U pip
+pip3 --version
+
+sudo pip3 install cmake
+pip3 install --user cryptography pyasn1 pyyaml jinja2 cbor
+
+#TOOLCHAINS=${HOME}/srv/toolchain
+TOOLCHAINS=${WORKSPACE}/srv/toolchain
+
+if [ ! -d ${TOOLCHAINS}/gcc-arm-none-eabi-9-2019-q4-major ]; then
+    mkdir -p ${TOOLCHAINS}
+    wget -q https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/RC2.1/gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2
+    tar -xaf gcc-arm-none-eabi-9-2019-q4-major-x86_64-linux.tar.bz2 -C ${TOOLCHAINS}
+fi
+
+# Show filesystem layout and space
+df -h
+
+# List available toolchains
+ls -l ${TOOLCHAINS}
+
+# Preclude spammy "advices"
+git config --global advice.detachedHead false
+
+git config --global user.email "dummy@dummy.com"
+git config --global user.name "Dummy"
diff --git a/lite-tf-m/submit-test.sh b/lite-tf-m/submit-test.sh
new file mode 100755
index 0000000000..347f68ccba
--- /dev/null
+++ b/lite-tf-m/submit-test.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+set -ex
+
+export PATH=$HOME/.local/bin:$PATH
+dir=$(dirname $0)
+
+sudo apt-get -qq -y install jq python3-pip
+# "yq" the Python version, https://github.com/kislyuk/yq, requires jq
+# Used to replace image url in the job template.
+pip3 install yq
+
+# "yq" the Go version, https://github.com/mikefarah/yq
+#wget -q https://github.com/mikefarah/yq/releases/download/3.1.0/yq_linux_amd64
+#chmod +x yq_linux_amd64
+#./yq_linux_amd64 w lite-lava-docker-compose/example/docker-xilinx-qemu-openamp-echo_test.job actions[1].boot.command $IMAGE_URL > lava.job
+
+# For now, always check out latest version
+rm -rf lite-lava-docker-compose
+if [ ! -d lite-lava-docker-compose ]; then
+    git clone --depth 1 https://github.com/Linaro/lite-lava-docker-compose
+fi
+
+IMAGE_URL="http://snapshots.linaro.org/components/kernel/aeolus-2/tf-m/${BRANCH}/${PLATFORM}/${BUILD_NUMBER}/tfm_full.hex"
+#IMAGE_URL="https://people.linaro.org/~kevin.townsend/lava/an521_tfm_full.hex"
+
+JOB_TEMPLATE="lite-lava-docker-compose/example/tfm-regression-qemu.job"
+yq -y ".actions[0].deploy.images.tfm.url=\"$IMAGE_URL\"" $JOB_TEMPLATE > lava.job
+python3 $dir/../../lite-build-tools/lava_submit.py lava.job
+echo
diff --git a/lite-tf-m/tfm-build.sh b/lite-tf-m/tfm-build.sh
new file mode 100755
index 0000000000..edb440f892
--- /dev/null
+++ b/lite-tf-m/tfm-build.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+# Copyright (c) 2020, Linaro. All rights reserved.
+# SPDX-License-Identifier: BSD-3-Clause
+
+# Exit on error
+set -e
+
+# Cleanup previous build artifacts
+rm -rf CMakeCache.txt CMakeFiles cmake_install.cmake install bl2 secure_fw app unit_test test
+
+# Set the readlink binary name:
+if [ "$(uname)" == "Darwin" ]; then
+    # For OS X this should be be 'greadlink' (brew install coreutils)
+    readlink=greadlink
+else
+    # For Linux this should be 'readlink'
+    readlink=readlink
+fi
+
+# Set the config file to use
+#configfile=ConfigRegression
+
+#target=AN521
+
+# Generate the S and NS makefiles
+#cmake -G"Unix Makefiles" \
+#        -DPROJ_CONFIG=`$readlink -f ../configs/$configfile.cmake` \
+#        -DTARGET_PLATFORM=$target \
+#        -DCMAKE_BUILD_TYPE=Debug \
+#        -DBL2=False \
+#        -DCOMPILER=GNUARM \
+#        ../
+
+cmake -DTFM_PLATFORM=mps2/an521 \
+      -DTFM_TOOLCHAIN_FILE=../toolchain_GNUARM.cmake \
+      -DCMAKE_BUILD_TYPE=Debug \
+      -DBL2=False \
+      -DTEST_S=ON -DTEST_NS=ON \
+      -DTFM_TEST_REPO_PATH=../../tf-m-tests \
+      ../
+
+# Build the binaries
+make install
+
+# Convert S and NS binaries to .hex file
+arm-none-eabi-objcopy -S --gap-fill 0xff -O ihex \
+        install/outputs/*/*/tfm_s.axf tfm_s.hex
+arm-none-eabi-objcopy -S --gap-fill 0xff -O ihex \
+        install/outputs/*/*/tfm_ns.axf tfm_ns.hex
+
+# Generate a single hex file for convenience/QEMU sake
+srec_cat tfm_s.hex -Intel tfm_ns.hex -Intel -o tfm_full.hex -Intel
diff --git a/lkft-aosp-member-wrapper.yaml b/lkft-aosp-member-wrapper.yaml
new file mode 100644
index 0000000000..3a4e6ffc33
--- /dev/null
+++ b/lkft-aosp-member-wrapper.yaml
@@ -0,0 +1,120 @@
+- job:
+    name: lkft-aosp-member-wrapper
+    project-type: freestyle
+    defaults: global
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 30
+    properties:
+      - authorization:
+          anonymous:
+            - job-discover
+          android-internal:
+            - job-read
+            - job-build
+            - job-cancel
+            - job-extended-read
+      - build-discarder:
+          days-to-keep: 30
+          num-to-keep: 30
+          artifact-num-to-keep: 1
+    parameters:
+      - string:
+          name: ANDROID_BUILD_CONFIG_REPO_URL
+          default: ssh://git@dev-private-git.linaro.org/android-internal/android-build-configs.git
+    disabled: false
+    node: docker-focal-aosp
+    display-name: 'Wrapper for the lkft-aosp-member build'
+    concurrent: true
+    wrappers:
+      - timestamps
+      - ssh-agent-credentials:
+          users:
+            - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - shell: |
+            #!/bin/bash -ex
+
+            rm -fr params_*.txt test_*.txt
+            ## find the build configs for the branch
+            #rm -fr android-build-configs-private
+            #if git clone -b lkft ${ANDROID_BUILD_CONFIG_REPO_URL} android-build-configs-private; then
+            #    if [ -f android-build-configs-private/lkft-member-builds ]; then
+            #        while read line; do
+            #            android_version=$(echo $line|cut -d= -f1)
+            #            build_configs=$(echo $line|cut -d= -f2|tr -d \")
+            #            for build_config in ${build_configs}; do
+            #                md5sum_val=$(echo "${android_version}-${build_config}"|md5sum|awk '{print $1}')
+            #                f_params="params_${md5sum_val}.txt"
+            #                rm -fr ${f_params}
+            #                echo "ANDROID_BUILD_CONFIG=${build_config}" >> "${f_params}"
+            #                echo "ANDROID_BUILD_CONFIG_REPO_URL=${ANDROID_BUILD_CONFIG_REPO_URL}" >> "${f_params}"
+            #                echo "ANDROID_BUILD_CONFIG_REPO_BRANCH=lkft" >> "${f_params}"
+            #            done
+            #        done < android-build-configs-private/lkft-member-builds
+            #    fi
+            #fi
+
+            public_configs="lkft-aosp-main-db845c lkft-aosp-main-hikey960 lkft-aosp-main-linaro-hikey960 lkft-aosp-main-arm64 lkft-aosp-main-cts lkft-aosp-main-vts"
+            public_configs="${public_configs} lkft-aosp-android14-db845c"
+            public_configs="${public_configs} lkft-aosp-android13-db845c lkft-aosp-android13-hikey960"
+            public_configs="${public_configs} lkft-aosp-android12-hikey lkft-aosp-android12-hikey960 lkft-aosp-android12-db845c"
+            public_configs="${public_configs} lkft-aosp-android11-hikey960 lkft-aosp-android11-db845c lkft-aosp-android11-hikey"
+            public_configs="${public_configs} lkft-aosp-android11-cts lkft-aosp-android11-vts"
+            public_configs="${public_configs} lkft-aosp-android12-cts lkft-aosp-android12-vts"
+            public_configs="${public_configs} lkft-aosp-android13-cts lkft-aosp-android13-vts"
+            public_configs="${public_configs} lkft-aosp-android14-cts lkft-aosp-android14-vts"
+            for config in ${public_configs}; do
+                rm -fr params_${config}
+                echo "ANDROID_BUILD_CONFIG=${config}" >>params_${config}
+            done
+        - trigger-builds:
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android11-hikey960
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android11-db845c
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android11-hikey
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android11-cts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android11-vts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android12-hikey
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android12-hikey960
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android12-db845c
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android12-cts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android12-vts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android13-db845c
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android13-hikey960
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android13-cts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android13-vts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android14-db845c
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android14-cts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-android14-vts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-main-db845c
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-main-hikey960
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-main-linaro-hikey960
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-main-cts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-main-vts
+            - project: lkft-aosp
+              property-file: params_lkft-aosp-main-arm64
+    publishers:
+      - email:
+          recipients: 'yongqin.liu@linaro.org sumit.semwal@linaro.org'
diff --git a/lkft-aosp-member.yaml b/lkft-aosp-member.yaml
new file mode 100644
index 0000000000..a3bbb8cd1e
--- /dev/null
+++ b/lkft-aosp-member.yaml
@@ -0,0 +1,102 @@
+- job:
+    name: lkft-aosp-member
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 180
+        numToKeep: 300
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            android-internal:
+                - job-read
+                - job-build
+                - job-cancel
+                - job-extended-read
+    parameters:
+        - string:
+            name: ANDROID_BUILD_CONFIG_REPO_URL
+            default: ssh://git@dev-private-git.linaro.org/android-internal/android-build-configs.git
+        - string:
+            name: ANDROID_BUILD_CONFIG_REPO_BRANCH
+            default: lkft
+        - string:
+            name: ANDROID_BUILD_CONFIG
+            default: ''
+        - string:
+            name: MANIFEST_URL
+            default: ''
+        - string:
+            name: MANIFEST_BRANCH
+            default: ''
+        - string:
+            name: TARGET_PRODUCT
+            default: ''
+        - string:
+            name: MAKE_TARGETS
+            default: ''
+        - string:
+            name: PUBLISH_FILES
+            default: ''
+    disabled: false
+    node: docker-focal-aosp
+    display-name: 'Jobs for pure private aosp builds'
+    concurrent: true
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${ANDROID_BUILD_CONFIG}'
+        - timeout:
+            timeout: 900
+        - ssh-agent-credentials:
+            users:
+               - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - shell: |
+            #!/bin/bash -ex
+
+            #change to use python3 by default
+            if ! python --version|grep 3; then
+                sudo rm -fv /usr/bin/python && sudo ln -s /usr/bin/python3 /usr/bin/python
+            fi
+            sudo apt-get update
+            sudo apt-get install -y --allow-change-held-packages make git gperf python-mako time python-requests genisoimage patch mtools python3-pip libssl-dev
+            # https://source.android.com/setup/build/downloading
+            sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev gcc-multilib g++-multilib libc6-dev-i386 lib32ncurses5-dev x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
+
+            wget --no-check-certificate https://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u162-b12-1_amd64.deb \
+                    https://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u162-b12-1_amd64.deb \
+                    https://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u162-b12-1_amd64.deb
+
+            sudo dpkg -i --force-all *.deb
+            java -version
+
+            mkdir -p ${HOME}/bin
+            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+            chmod a+x ${HOME}/bin/*
+
+            git config --global user.email "ci_notify@linaro.org"
+            git config --global user.name "Linaro CI"
+
+        - shell:
+            !include-raw:
+                - lkft/common/build-aosp-member.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+    publishers:
+        - archive:
+            artifacts: '*.xml,*.json'
+            latest-only: true
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'yongqin.liu@linaro.org tom.gall@linaro.org sumit.semwal@linaro.org'
diff --git a/lkft-aosp.yaml b/lkft-aosp.yaml
new file mode 100644
index 0000000000..7caf2f7339
--- /dev/null
+++ b/lkft-aosp.yaml
@@ -0,0 +1,102 @@
+- job:
+    name: lkft-aosp
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 60
+        numToKeep: 60
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: ANDROID_BUILD_CONFIG
+            default: ''
+        - string:
+            name: KERNEL_BUILD_CONFIG
+            default: ''
+        - string:
+            name: MANIFEST_BRANCH
+            default: ''
+        - string:
+            name: TARGET_PRODUCT
+            default: ""
+    disabled: false
+    node: docker-focal-aosp
+    display-name: 'Jobs for pure aosp builds'
+    concurrent: true
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}${PROPFILE,file="wrappers_parameters",property="WRAPPER_BUILD_NAME"}'
+        - timeout:
+            timeout: 900
+        # needed to publish to snapshots
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell: |
+            #!/bin/bash -ex
+
+            sudo apt-get update
+            # Here is for packages not listed by the source.android.com site below.
+            # But the following packages might not be really necessary,
+            # as the docker image for docker-focal-aosp labelled nodes is linaro/jenkins-amd64-ubuntu:focal
+            # which is defined here: https://git.linaro.org/infrastructure/ci-yadp-builder.git/tree/docker_templates_aosp_amd64.yml#n2
+            # And the packages listed here might be already defined there.
+            sudo apt-get install -y --allow-change-held-packages wget sudo python3 python-is-python3 openjdk-11-jdk-headless
+            java -version
+
+            ## https://source.android.com/docs/setup/start/requirements#hardware-requirements
+            sudo apt-get install -y --allow-change-held-packages git-core gnupg flex bison build-essential zip curl zlib1g-dev libc6-dev-i386 libncurses5 x11proto-core-dev libx11-dev lib32z1-dev libgl1-mesa-dev libxml2-utils xsltproc unzip fontconfig
+
+            mkdir -p ${HOME}/bin
+            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+            chmod a+x ${HOME}/bin/*
+
+            git config --global user.email "ci_notify@linaro.org"
+            git config --global user.name "Linaro CI"
+
+            # set value for the build name
+            if [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+                WRAPPER_BUILD_NAME="-${ANDROID_BUILD_CONFIG}"
+            elif [ -n "${MANIFEST_BRANCH}" ] && [ -n "${TARGET_PRODUCT}" ]; then
+                WRAPPER_BUILD_NAME="-${MANIFEST_BRANCH}-${TARGET_PRODUCT}"
+            fi
+            echo "WRAPPER_BUILD_NAME=${WRAPPER_BUILD_NAME}" > wrappers_parameters
+
+        - shell:
+            !include-raw:
+                - lkft/common/build-aosp.sh
+        - inject:
+            properties-file: publish_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw:
+                - android/linaro-publisher.sh
+        - shell: |
+            #!/bin/bash -ex
+            BUILD_ROOT="${BUILD_ROOT:-/home/buildslave/srv/aosp-public}"
+
+            rm -fr "${BUILD_ROOT}/build/aosp-${BUILD_NUMBER}"
+            rm -fr "${BUILD_ROOT}/build/kernel-${BUILD_NUMBER}"
+            rm -fr "${BUILD_ROOT}/dist-${BUILD_NUMBER}"
+    publishers:
+        - archive:
+            artifacts: '*.xml,*.json'
+            latest-only: true
+        - logparser:
+            parse-rules: '/var/jenkins_home/userContent/android.parse'
+            unstable-on-warning: false
+            fail-on-error: false
+        - fingerprint:
+            files: 'build/fingerprints/*'
+        - email:
+            recipients: 'yongqin.liu@linaro.org sumit.semwal@linaro.org'
diff --git a/lkft-hikey-android-8.0-4.14.yaml b/lkft-hikey-android-8.0-4.14.yaml
deleted file mode 100644
index e8eb5217e4..0000000000
--- a/lkft-hikey-android-8.0-4.14.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: lkft-hikey-android-8.0-4.14
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp-stable/8.0.0_r36/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.14'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.14-android-8.0'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/vts/oreo-vts-release-02152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/cts/android-cts-8.0_r5/'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP Stable 4.14 (Android 8.0.0_r36)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-android-8.0-4.4.yaml b/lkft-hikey-android-8.0-4.4.yaml
deleted file mode 100644
index 7f254fbcee..0000000000
--- a/lkft-hikey-android-8.0-4.4.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: lkft-hikey-android-8.0-4.4
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp-stable/8.0.0_r36/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.4'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.4-android-8.0'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/vts/oreo-vts-release-02152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/cts/android-cts-8.0_r5/'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP Stable 4.4 (Android 8.0.0_r36)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-android-8.0-4.9.yaml b/lkft-hikey-android-8.0-4.9.yaml
deleted file mode 100644
index 968af6b315..0000000000
--- a/lkft-hikey-android-8.0-4.9.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: lkft-hikey-android-8.0-4.9
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp-stable/8.0.0_r36/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.9'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.9-android-8.0'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/vts/oreo-vts-release-02152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/cts/android-cts-8.0_r5/'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP Stable 4.9 (Android 8.0.0_r36)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-android-8.1-4.14.yaml b/lkft-hikey-android-8.1-4.14.yaml
deleted file mode 100644
index f980627fb9..0000000000
--- a/lkft-hikey-android-8.1-4.14.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: lkft-hikey-android-8.1-4.14
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp-stable/8.1.0_r14/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.14'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.14-android-8.1'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/cts/android-cts-8.1_r1/'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP Stable 4.14 (Android 8.1.0_r14)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-             !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-android-8.1-4.4.yaml b/lkft-hikey-android-8.1-4.4.yaml
deleted file mode 100644
index f4ed27c9ea..0000000000
--- a/lkft-hikey-android-8.1-4.4.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: lkft-hikey-android-8.1-4.4
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp-stable/8.1.0_r14/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.4'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.4-android-8.1'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/cts/android-cts-8.1_r1/'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP Stable 4.4 (Android 8.1.0_r14)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-android-8.1-4.9.yaml b/lkft-hikey-android-8.1-4.9.yaml
deleted file mode 100644
index 3f6ebf8959..0000000000
--- a/lkft-hikey-android-8.1-4.9.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: lkft-hikey-android-8.1-4.9
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp-stable/8.1.0_r14/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.9'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.9-android-8.1'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/vts/oreo-mr1-vts-release-02152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/cts/android-cts-8.1_r1/'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP Stable 4.9 (Android 8.1.0_r14)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-             !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-aosp-4.14.yaml b/lkft-hikey-aosp-4.14.yaml
deleted file mode 100644
index 2fde715ed5..0000000000
--- a/lkft-hikey-aosp-4.14.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-- job:
-    name: lkft-hikey-aosp-4.14
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.14'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.14-aosp'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-           name: ANDROID_VERSION
-           default: 'AOSP MASTER'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP 4.14 (Android)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-aosp-4.4.yaml b/lkft-hikey-aosp-4.4.yaml
deleted file mode 100644
index a23554c0f3..0000000000
--- a/lkft-hikey-aosp-4.4.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-- job:
-    name: lkft-hikey-aosp-4.4
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.4'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.4-aosp'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: ANDROID_VERSION
-            default: 'AOSP MASTER'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP 4.4 (Android)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-hikey-aosp-4.9.yaml b/lkft-hikey-aosp-4.9.yaml
deleted file mode 100644
index 3653e3e4ea..0000000000
--- a/lkft-hikey-aosp-4.9.yaml
+++ /dev/null
@@ -1,124 +0,0 @@
-- job:
-    name: lkft-hikey-aosp-4.9
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.9'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.9-aosp'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.validation.linaro.org/lkft/aosp/aosp-master-03052018/'
-        - string:
-           name: ANDROID_VERSION
-           default: 'AOSP MASTER'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP 4.9 (Android)'
-    scm:
-        - git:
-            url: ${KERNEL_REPO}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - timeout:
-            timeout: 500
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-            - text:
-                credential-id: AP_SSID
-                variable: AP_SSID
-            - text:
-                credential-id: AP_KEY
-                variable: AP_KEY
-    builders:
-        - shell:
-            !include-raw:
-                - lkft/hikey-aosp/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            wget -q https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O out/BUILD-INFO.txt
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/BUILD-INFO.txt \
-              --link-latest \
-              out/ android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-
-            PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
-        - shell:
-            !include-raw: lkft/hikey-aosp/submit_for_testing.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            subject: '[CI] HiKey: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/lkft-notify-developer.yaml b/lkft-notify-developer.yaml
new file mode 100644
index 0000000000..aeeb3c7eb5
--- /dev/null
+++ b/lkft-notify-developer.yaml
@@ -0,0 +1,75 @@
+- job:
+    name: lkft-notify-developer
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: BUILD_URL
+            description: 'Developer build API URL; i.e. https://qa-reports.linaro.org/api/builds/9367/'
+        - string:
+            name: EMAIL_DESTINATION
+            description: 'Email address to notify, instead of default behavior'
+        - bool:
+            name: DRY_RUN
+            description: 'Do not notify; just run and echo the report to the console'
+            default: False
+    disabled: false
+    node: master
+    concurrent: false
+    display-name: 'LKFT Notify Developer'
+    scm:
+        - git:
+            url: https://github.com/Linaro/lkft-tools.git
+            refspec: +refs/heads/*:refs/remotes/origin/*
+            name: origin
+            branches:
+                - refs/heads/master
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+            clean:
+                before: true
+    wrappers:
+        - timeout:
+            timeout: 60
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            python ./bin/lkft_notify_developer.py ${BUILD_URL}
+
+            if [ -n "${EMAIL_DESTINATION}" ]; then
+              # Override email.to if EMAIL_DESTINATION is set.
+              echo ${EMAIL_DESTINATION} > email.to
+            fi
+
+            # Append default email addresses
+            echo -n ",dan.rue@linaro.org,daniel.diaz@linaro.org" >> email.to
+
+    publishers:
+        - email-ext:
+            # Send custom email generated in jenkins job
+            recipients: ${FILE,path="email.to"}
+            subject: ${FILE,path="email.subject"}
+            content-type: text
+            body: |
+                ${FILE,path="email.body"}
+            presend-script: "if (${DRY_RUN} == true){logger.println(\"DRY_RUN is set; skipping email notification\"); cancel = true}"
+            success: true
+            failure: false
+        - email:
+             recipients: 'dan.rue@linaro.org daniel.diaz@linaro.org'
diff --git a/lkft-notify-kselftest-next.yaml b/lkft-notify-kselftest-next.yaml
new file mode 100644
index 0000000000..7040b2fd33
--- /dev/null
+++ b/lkft-notify-kselftest-next.yaml
@@ -0,0 +1,71 @@
+- job:
+    name: lkft-notify-kselftest-next
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: BUILD_ID
+            description: 'Next build API ID; i.e. 13138'
+        - string:
+            name: EMAIL_DESTINATION
+            description: 'Email address to notify, instead of default behavior'
+            default: "lkft-triage@lists.linaro.org,dan.rue@linaro.org,anders.roxell@linaro.org,naresh.kamboju@linaro.org,shuah@kernel.org,linux-kselftest@vger.kernel.org"
+        - bool:
+            name: DRY_RUN
+            description: 'Do not notify; just run and echo the report to the console'
+            default: False
+    disabled: false
+    node: master
+    concurrent: false
+    display-name: 'LKFT Notify kselftest on next'
+    scm:
+        - git:
+            url: https://github.com/Linaro/lkft-tools.git
+            refspec: +refs/heads/*:refs/remotes/origin/*
+            name: origin
+            branches:
+                - refs/heads/master
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+            clean:
+                before: true
+    wrappers:
+        - timeout:
+            timeout: 60
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            python ./bin/generate_next_kselftest_report.py --build ${BUILD_ID}
+
+            # Append default email addresses
+            echo -n ${EMAIL_DESTINATION} > email.to
+
+    publishers:
+        - email-ext:
+            # Send custom email generated in jenkins job
+            recipients: ${FILE,path="email.to"}
+            subject: ${FILE,path="email.subject"}
+            content-type: text
+            body: |
+                ${FILE,path="email.body"}
+            presend-script: "if (${DRY_RUN} == true){logger.println(\"DRY_RUN is set; skipping email notification\"); cancel = true}"
+            success: true
+            failure: false
+        - email:
+             recipients: 'dan.rue@linaro.org anders.roxell@linaro.org'
diff --git a/lkft-ssh-testrunner.yaml b/lkft-ssh-testrunner.yaml
deleted file mode 100644
index dd57eff7ae..0000000000
--- a/lkft-ssh-testrunner.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-- job:
-    name: lkft-ssh-testrunner
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    disabled: true
-    node: master
-    display-name: 'LKFT - Submit SSH based test jobs (for evaluation purpose only)'
-    triggers:
-        # run at noon every day
-        - timed: 'H 12 * * *'
-    axes:
-        - axis:
-            type: user-defined
-            name: BUILD_NAME
-            values:
-                - '4.4'
-                - '4.9'
-                - 'linux-lt-4.4'
-                - 'linux-lts-4.4'
-                - 'linux-next'
-                - 'linux-mainline'
-                - 'linux-stable-4.9'
-                - 'linux-stable-rc-4.9'
-        - axis:
-            type: user-defined
-            name: QA_SERVER
-            values:
-                #- 'https://qa-reports.linaro.org'
-                - 'https://staging-qa-reports.linaro.org'
-        - axis:
-            type: user-defined
-            name: LAVA_SERVER
-            values:
-                - 'https://lkft.validation.linaro.org/RPC2/'
-        - axis:
-            type: user-defined
-            name: DEVICE_TYPE
-            values:
-                - 'hi6220-hikey'
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            export SNAPSHOTS_BASE_URL="http://snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/${BUILD_NAME}/latest/"
-
-            MD5_FILENAME="MD5SUMS.txt"
-            wget -O "${MD5_FILENAME}" "${SNAPSHOTS_BASE_URL}${MD5_FILENAME}"
-            ROOTFS_FILENAME=$(grep -E "rpb-console-image-hikey-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}')
-            OE_BUILD_NUMBER="$(echo "${ROOTFS_FILENAME}" | awk -F'-' '{print $NF}' | awk -F'.' '{print $1}')"
-            export SNAPSHOTS_BASE_URL="http://snapshots.linaro.org/openembedded/lkft/morty/hikey/rpb/${BUILD_NAME}/${OE_BUILD_NUMBER}/"
-            BOOT_FILENAME=$(grep -E "boot\S*uefi\.img" "${MD5_FILENAME}" | awk '{print $2}')
-            export BOOT_URL="${SNAPSHOTS_BASE_URL}${BOOT_FILENAME}"
-            export SYSTEM_URL="${SNAPSHOTS_BASE_URL}${ROOTFS_FILENAME}"
-            export KERNEL_BRANCH="lkft-lava-staging-${BUILD_NAME}"
-            export KERNEL_VERSION="lkft-lava-staging-${BUILD_NAME}"
-            export KERNEL_REPO="https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/"
-            export KERNEL_COMMIT="lkft-lava-staging-${BUILD_NUMBER}"
-            export KERNEL_DESCRIBE="Kernel Describe"
-            export KERNEL_CONFIG_URL="${SNAPSHOTS_BASE_URL}/defconfig"
-            export KSELFTESTS_MAINLINE_URL="kselftest_url"
-            export KSELFTESTS_MAINLINE_VERSION="kselftest_version"
-            export LTP_URL="ltp_url"
-            export LTP_VERSION="ltp_version"
-            export LTP_REVISION="ltp_revision"
-            export LIBHUGETLBFS_URL="libhugetlbfs_url"
-            export LIBHUGETLBFS_VERSION="libhugetlbfs_version"
-            export LIBHUGETLBFS_REVISION="libhugetlbfs_revision"
-            export MAKE_KERNELVERSION="make_kernelversion"
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            python configs/lkft-ssh-testrunner/submit_for_testing.py \
-                --device-type ${DEVICE_TYPE} \
-                --build-number ${BUILD_NUMBER} \
-                --lava-server ${LAVA_SERVER} \
-                --qa-server ${QA_SERVER} \
-                --qa-server-team staging-lkft-ssh \
-                --qa-server-project ${BUILD_NAME} \
-                --git-commit ${BUILD_NUMBER} \
-                --template-path configs/lkft-ssh-testrunner/lava-job-definitions \
-                --template-names template-kselftest.yaml template-ltp.yaml template-libhugetlbfs.yaml
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'milosz.wasilewski@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-kselftest.yaml b/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-kselftest.yaml
index 115844ac9e..94e4f5c7f3 100644
--- a/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-kselftest.yaml
+++ b/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-kselftest.yaml
@@ -34,7 +34,7 @@ protocols:
     distribution: debian
     release: jessie
     arch: amd64
-    mirror: http://mirror.bytemark.co.uk/debian
+    mirror: http://deb.debian.org/debian
 
 actions:
 - deploy:
@@ -69,7 +69,7 @@ actions:
     connection: lxc
     images:
       ptable:
-        url: http://releases.linaro.org/reference-platform/embedded/hikey/16.12/rpb/bootloader/ptable-linux-8g.img
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-linux-8g.img
         reboot: hard-reset
       boot:
         url: ${BOOT_URL}
diff --git a/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml b/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml
index a53b94e94c..d36f0debf5 100644
--- a/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml
+++ b/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-libhugetlbfs.yaml
@@ -37,7 +37,7 @@ protocols:
     distribution: debian
     release: jessie
     arch: amd64
-    mirror: http://mirror.bytemark.co.uk/debian
+    mirror: http://deb.debian.org/debian
 
 actions:
 - deploy:
@@ -72,7 +72,7 @@ actions:
     connection: lxc
     images:
       ptable:
-        url: http://releases.linaro.org/reference-platform/embedded/hikey/16.12/rpb/bootloader/ptable-linux-8g.img
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-linux-8g.img
         reboot: hard-reset
       boot:
         url: ${BOOT_URL}
diff --git a/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-ltp.yaml b/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-ltp.yaml
index e38d0157b7..0132ff4673 100644
--- a/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-ltp.yaml
+++ b/lkft-ssh-testrunner/lava-job-definitions/hi6220-hikey/template-ltp.yaml
@@ -37,7 +37,7 @@ protocols:
     distribution: debian
     release: jessie
     arch: amd64
-    mirror: http://mirror.bytemark.co.uk/debian
+    mirror: http://deb.debian.org/debian
 
 actions:
 - deploy:
@@ -72,7 +72,7 @@ actions:
     connection: lxc
     images:
       ptable:
-        url: http://releases.linaro.org/reference-platform/embedded/hikey/16.12/rpb/bootloader/ptable-linux-8g.img
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-linux-8g.img
         reboot: hard-reset
       boot:
         url: ${BOOT_URL}
diff --git a/lkft-staging-lava.yaml b/lkft-staging-lava.yaml
index cf0cc7bea0..e452486623 100644
--- a/lkft-staging-lava.yaml
+++ b/lkft-staging-lava.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -20,7 +20,7 @@
     parameters:
         - matrix-combinations:
             name: MATRIX_COMBINATIONS
-    disabled: false
+    disabled: true
     node: master
     display-name: 'LKFT - Staging LAVA instance'
     description: 'This job submits latest available LKFT builds for testing in lkft-staging.validation.linaro.org instance. By default staging-qa-reports.lianro.org is used to track and report the results.'
@@ -32,12 +32,13 @@
             type: user-defined
             name: BUILD_NAME
             values:
-                #- 'linux-next'
-                - 'linux-mainline'
-                #- 'linux-stable-4.4'
-                #- 'linux-stable-4.9'
-                #- 'linux-stable-4.14'
-                #- 'linux-stable-4.15'
+                #- 'linux-next-oe'
+                - 'linux-mainline-oe'
+                #- 'linux-stable-4.4-oe'
+                #- 'linux-stable-4.9-oe'
+                #- 'linux-stable-4.14-oe'
+                #- 'linux-stable-4.18-oe'
+                #- 'linux-stable-4.19-oe'
         - axis:
             type: user-defined
             name: QA_SERVER
@@ -48,13 +49,15 @@
             name: DEVICE_TYPE
             values:
                 - 'hi6220-hikey'
-                #- 'x86'
+                - 'x86'
+                - 'i386'
                 - 'juno-r2'
                 - 'x15'
-                - 'b2260'
                 - 'dragonboard-410c'
+                - 'qemu_arm'
                 - 'qemu_arm64'
                 - 'qemu_x86_64'
+                - 'qemu_i386'
     execution-strategy:
         sequential: false
     wrappers:
@@ -69,22 +72,23 @@
     builders:
         - shell: |
             #!/bin/bash
+            set -x
 
             # install required python modules
-            pip install --user --force-reinstall Jinja2 requests urllib3 ruamel.yaml
+            pip install --user --force-reinstall Jinja2 requests urllib3 ruamel.yaml==0.16.13
 
             # no LTS 4.4 build for hikey
-            if [ ${DEVICE_TYPE} = hi6220-hikey ] && [ ${BUILD_NAME} = linux-stable-4.4 ]
+            if [ ${DEVICE_TYPE} = hi6220-hikey ] && [ ${BUILD_NAME} = linux-stable-rc-4.4-oe ]
             then
               exit 0
             fi
             # no LTS 4.4 build for QEMU (Hikey build is used)
-            if [ ${DEVICE_TYPE} = qemu_arm64 ] && [ ${BUILD_NAME} = linux-stable-4.4 ]
+            if [ ${DEVICE_TYPE} = qemu_arm64 ] && [ ${BUILD_NAME} = linux-stable-rc-4.4-oe ]
             then
               exit 0
             fi
             # no LTS 4.4 build for dragonboard
-            if [ ${DEVICE_TYPE} = dragonboard-410c ] && [ ${BUILD_NAME} = linux-stable-4.4 ]
+            if [ ${DEVICE_TYPE} = dragonboard-410c ] && [ ${BUILD_NAME} = linux-stable-rc-4.4-oe ]
             then
               exit 0
             fi
@@ -100,19 +104,25 @@
               x15)
                 export MACHINE=am57xx-evm
                 ;;
-              x86)
+              i386)
                 export MACHINE=intel-core2-32
                 ;;
-              b2260)
-                export MACHINE=stih410-b2260
+              x86)
+                export MACHINE=intel-corei7-64
                 ;;
               dragonboard-410c)
                 export MACHINE=dragonboard-410c
                 ;;
+              qemu_arm)
+                export MACHINE=am57xx-evm
+                ;;
               qemu_arm64)
                 export MACHINE=hikey
                 ;;
               qemu_x86_64)
+                export MACHINE=intel-corei7-64
+                ;;
+              qemu_i386)
                 export MACHINE=intel-core2-32
                 ;;
               *)
@@ -120,9 +130,9 @@
             esac
             export PUB_DEST=${BUILD_NAME}
             export DISTRO=rpb
-            export MANIFEST_BRANCH=morty
+            export MANIFEST_BRANCH=rocko
             export SNAPSHOTS_URL=https://snapshots.linaro.org
-            export BASE_URL=openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NAME}/latest
+            export BASE_URL=openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NAME%-oe}/latest
             export ENVIRONMENT=staging
 
             export SNAPSHOTS_BASE_URL=${SNAPSHOTS_URL}/${BASE_URL}
@@ -138,39 +148,72 @@
                 echo "export ${ENVVAR}" >> build_env.sh
             done
             . ./build_env.sh
-            ROOTFS_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}')
-            NFS_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.tar\.xz" "${MD5_FILENAME}" | awk '{print $2}')
-            EXT4_IMAGE_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.ext4\.gz" "${MD5_FILENAME}" | awk '{print $2}')
+            ROOTFS_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}')
+            NFS_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.tar\.xz" "${MD5_FILENAME}" | awk '{print $2}')
+            EXT4_IMAGE_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.ext4\.gz" "${MD5_FILENAME}" | awk '{print $2}')
             BOOT_FILENAME=$(grep -E "boot\S*uefi\.img" "${MD5_FILENAME}" | awk '{print $2}')
             KERNEL_FILENAME=$(grep -E "bzImage" "${MD5_FILENAME}" | awk '{print $2}')
-            HDD_IMG=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.hddimg" "${MD5_FILENAME}" | awk '{print $2}')
+            HDD_IMG=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.hddimg.xz" "${MD5_FILENAME}" | awk '{print $2}')
             case ${DEVICE_TYPE} in
               juno-r2)
-                KERNEL_FILENAME=$(grep -E "Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
-                DTB_FILENAME=$(grep -E "Image.*juno-r2.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
-                ;;
-              b2260)
-                KERNEL_FILENAME=$(grep -E "uImage.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
-                DTB_FILENAME=$(grep -E "uImage.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                KERNEL_FILENAME=$(grep -E " Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
+                DTB_FILENAME=$(grep -E " Image.*juno-r2.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
                 ;;
               dragonboard-410c)
-                BOOT_FILENAME=$(grep -E "boot\S*\.img" "${MD5_FILENAME}" | awk '{print $2}')
+                BOOT_FILENAME=$(grep -E " boot\-\-\S*\.img" "${MD5_FILENAME}" | awk '{print $2}')
                 ;;
               qemu_arm64)
-                KERNEL_FILENAME=$(grep -E "Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
-                DTB_FILENAME=$(grep -E "Image.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                KERNEL_FILENAME=$(grep -E " Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
+                DTB_FILENAME=$(grep -E " Image.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                ;;
+              qemu_arm)
+                KERNEL_FILENAME=$(grep -E " zImage.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
+                DTB_FILENAME=$(grep -E " zImage.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                ;;
+              *)
+                ;;
+            esac
+
+            # Simulate KERNEL_VERSION and KERNEL_VERSION_OVERRIDE behavior from
+            # production.
+            case ${BUILD_NAME} in
+              linux-next-oe)
+                export KERNEL_VERSION=git
+                export KERNEL_VERSION_OVERRIDE=next
+                ;;
+              linux-mainline-oe)
+                export KERNEL_VERSION=git
+                export KERNEL_VERSION_OVERRIDE=mainline
+                ;;
+              linux-stable-rc-4.19-oe)
+                export KERNEL_VERSION=4.19
+                ;;
+              linux-stable-rc-4.18-oe)
+                export KERNEL_VERSION=4.18
+                ;;
+              linux-stable-rc-4.14-oe)
+                export KERNEL_VERSION=4.14
+                ;;
+              linux-stable-rc-4.9-oe)
+                export KERNEL_VERSION=4.9
+                ;;
+              linux-stable-rc-4.4-oe)
+                export KERNEL_VERSION=4.4
                 ;;
               *)
+                echo "Unknown BUILD_NAME: ${BUILD_NAME}"
+                exit 1
                 ;;
             esac
+
             case ${BUILD_NAME} in
-              linux-next)
+              linux-next-oe)
                 export KSELFTESTS_VERSION=${MAKE_KERNELVERSION}
                 export KSELFTESTS_REVISION=${KERNEL_COMMIT_ID}
                 export KSELFTESTS_URL=${KERNEL_REPO}
                 export KSELFTEST_PATH=/opt/kselftests/default-in-kernel/
                 ;;
-              linux-mainline)
+              linux-mainline-oe)
                 export KSELFTESTS_VERSION=${MAKE_KERNELVERSION}
                 export KSELFTESTS_REVISION=${KERNEL_COMMIT_ID}
                 export KSELFTESTS_URL=${KERNEL_REPO}
@@ -183,14 +226,14 @@
                 export KSELFTEST_PATH=/opt/kselftests/mainline/
                 ;;
             esac
+            export TOOLCHAIN=${COMPILER:-unknown}
             export NFSROOTFS_URL="${BUILD_LOCATION}/${NFS_FILENAME}"
             export EXT4_IMAGE_URL="${BUILD_LOCATION}/${EXT4_IMAGE_FILENAME}"
             export BOOT_URL="${BUILD_LOCATION}/${BOOT_FILENAME}"
             export SYSTEM_URL="${BUILD_LOCATION}/${ROOTFS_FILENAME}"
             export KERNEL_COMMIT=${KERNEL_COMMIT_ID}
-            export LAVA_JOB_PRIORITY=low
+            export LAVA_JOB_PRIORITY=25
             export KERNEL_CONFIG_URL=${BUILD_LOCATION}/config
-            export KERNEL_VERSION=${MAKE_KERNELVERSION}
             export KERNEL_DEFCONFIG_URL=${BUILD_LOCATION}/defconfig
             export KERNEL_URL="${BUILD_LOCATION}/${KERNEL_FILENAME}"
             export DTB_URL="${BUILD_LOCATION}/${DTB_FILENAME}"
@@ -200,7 +243,6 @@
             rm build_env.sh
             rm ${MD5_FILENAME}
             rm ${BUILD_CONFIG}
-            export LAVA_JOB_PRIORITY="low"
 
             rm -rf configs
             git clone --depth 1 http://git.linaro.org/ci/job/configs.git
diff --git a/lkft-staging-no-skiplist.yaml b/lkft-staging-no-skiplist.yaml
index 82a7becb7d..190f58ae84 100644
--- a/lkft-staging-no-skiplist.yaml
+++ b/lkft-staging-no-skiplist.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -18,9 +18,17 @@
             num-to-keep: 30
             artifact-num-to-keep: 1
     parameters:
+        - string:
+            name: CONFIGS_REPO_URL_OVERRIDE
+            default: http://git.linaro.org/ci/job/configs.git
+            description: URL to configs repository
+        - string:
+            name: CONFIGS_REPO_REV_OVERRIDE
+            default: master
+            description: Git revision to checkout. May be branch, tag, or sha.
         - matrix-combinations:
             name: MATRIX_COMBINATIONS
-    disabled: false
+    disabled: true
     node: master
     display-name: 'LKFT - Staging no skip list'
     triggers:
@@ -31,12 +39,13 @@
             type: user-defined
             name: BUILD_NAME
             values:
-                - 'linux-next'
-                - 'linux-mainline'
-                - 'linux-stable-4.4'
-                - 'linux-stable-4.9'
-                - 'linux-stable-4.14'
-                - 'linux-stable-4.15'
+                - 'linux-next-oe'
+                - 'linux-mainline-oe'
+                - 'linux-stable-rc-4.4-oe'
+                - 'linux-stable-rc-4.9-oe'
+                - 'linux-stable-rc-4.14-oe'
+                - 'linux-stable-rc-4.18-oe'
+                - 'linux-stable-rc-4.19-oe'
         - axis:
             type: user-defined
             name: QA_SERVER
@@ -48,12 +57,14 @@
             values:
                 - 'hi6220-hikey'
                 - 'x86'
+                - 'i386'
                 - 'juno-r2'
                 - 'x15'
-                - 'b2260'
                 - 'dragonboard-410c'
+                - 'qemu_arm'
                 - 'qemu_arm64'
                 - 'qemu_x86_64'
+                - 'qemu_i386'
     execution-strategy:
         sequential: false
     wrappers:
@@ -71,24 +82,24 @@
             set -x
 
             # install required python modules
-            pip install --user --force-reinstall Jinja2 requests urllib3 ruamel.yaml
+            pip install --user --force-reinstall Jinja2 requests urllib3 ruamel.yaml==0.16.13
 
             # no LTS 4.4 build for hikey
-            if [ ${DEVICE_TYPE} = hi6220-hikey ] && [ ${BUILD_NAME} = linux-stable-4.4 ]
+            if [ ${DEVICE_TYPE} = hi6220-hikey ] && [ ${BUILD_NAME} = linux-stable-rc-4.4-oe ]
             then
               exit 0
             fi
             # no LTS 4.4 build for QEMU (Hikey build is used)
-            if [ ${DEVICE_TYPE} = qemu_arm64 ] && [ ${BUILD_NAME} = linux-stable-4.4 ]
+            if [ ${DEVICE_TYPE} = qemu_arm64 ] && [ ${BUILD_NAME} = linux-stable-rc-4.4-oe ]
             then
               exit 0
             fi
             # no LTS 4.4 build for dragonboard
-            if [ ${DEVICE_TYPE} = dragonboard-410c ] && [ ${BUILD_NAME} = linux-stable-4.4 ]
+            if [ ${DEVICE_TYPE} = dragonboard-410c ] && [ ${BUILD_NAME} = linux-stable-rc-4.4-oe ]
             then
               exit 0
             fi
-            export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
+            export LAVA_SERVER=https://lkft-staging.validation.linaro.org/RPC2/
 
             case ${DEVICE_TYPE} in
               hi6220-hikey)
@@ -100,19 +111,25 @@
               x15)
                 export MACHINE=am57xx-evm
                 ;;
-              x86)
+              i386)
                 export MACHINE=intel-core2-32
                 ;;
-              b2260)
-                export MACHINE=stih410-b2260
+              x86)
+                export MACHINE=intel-corei7-64
                 ;;
               dragonboard-410c)
                 export MACHINE=dragonboard-410c
                 ;;
+              qemu_arm)
+                export MACHINE=am57xx-evm
+                ;;
               qemu_arm64)
                 export MACHINE=hikey
                 ;;
               qemu_x86_64)
+                export MACHINE=intel-corei7-64
+                ;;
+              qemu_i386)
                 export MACHINE=intel-core2-32
                 ;;
               *)
@@ -120,9 +137,9 @@
             esac
             export PUB_DEST=${BUILD_NAME}
             export DISTRO=rpb
-            export MANIFEST_BRANCH=morty
+            export MANIFEST_BRANCH=rocko
             export SNAPSHOTS_URL=https://snapshots.linaro.org
-            export BASE_URL=openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NAME}/latest
+            export BASE_URL=openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${BUILD_NAME%-oe}/latest
             export ENVIRONMENT=staging
 
             export SNAPSHOTS_BASE_URL=${SNAPSHOTS_URL}/${BASE_URL}
@@ -138,27 +155,27 @@
                 echo "export ${ENVVAR}" >> build_env.sh
             done
             . ./build_env.sh
-            ROOTFS_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}')
-            NFS_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.tar\.xz" "${MD5_FILENAME}" | awk '{print $2}')
-            EXT4_IMAGE_FILENAME=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.ext4\.gz" "${MD5_FILENAME}" | awk '{print $2}')
+            ROOTFS_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.img\.gz" "${MD5_FILENAME}" | awk '{print $2}')
+            NFS_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.tar\.xz" "${MD5_FILENAME}" | awk '{print $2}')
+            EXT4_IMAGE_FILENAME=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.rootfs\.ext4\.gz" "${MD5_FILENAME}" | awk '{print $2}')
             BOOT_FILENAME=$(grep -E "boot\S*uefi\.img" "${MD5_FILENAME}" | awk '{print $2}')
             KERNEL_FILENAME=$(grep -E "bzImage" "${MD5_FILENAME}" | awk '{print $2}')
-            HDD_IMG=$(grep -E "rpb-console-image-${MACHINE}-[0-9]{14}-[0-9]+\.hddimg" "${MD5_FILENAME}" | awk '{print $2}')
+            HDD_IMG=$(grep -E "rpb-console-image(-lkft)?-${MACHINE}-[0-9]{14}-[0-9]+\.hddimg.xz" "${MD5_FILENAME}" | awk '{print $2}')
             case ${DEVICE_TYPE} in
               juno-r2)
-                KERNEL_FILENAME=$(grep -E "Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
-                DTB_FILENAME=$(grep -E "Image.*juno-r2.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
-                ;;
-              b2260)
-                KERNEL_FILENAME=$(grep -E "uImage.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
-                DTB_FILENAME=$(grep -E "uImage.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                KERNEL_FILENAME=$(grep -E " Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
+                DTB_FILENAME=$(grep -E " Image.*juno-r2.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
                 ;;
               dragonboard-410c)
-                BOOT_FILENAME=$(grep -E "boot\S*\.img" "${MD5_FILENAME}" | awk '{print $2}')
+                BOOT_FILENAME=$(grep -E " boot\-\-\S*\.img" "${MD5_FILENAME}" | awk '{print $2}')
                 ;;
               qemu_arm64)
-                KERNEL_FILENAME=$(grep -E "Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
-                DTB_FILENAME=$(grep -E "Image.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                KERNEL_FILENAME=$(grep -E " Image.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
+                DTB_FILENAME=$(grep -E " Image.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
+                ;;
+              qemu_arm)
+                KERNEL_FILENAME=$(grep -E " zImage.*.bin" "${MD5_FILENAME}" | awk '{print $2}')
+                DTB_FILENAME=$(grep -E " zImage.*.dtb" "${MD5_FILENAME}" | awk '{print $2}')
                 ;;
               *)
                 ;;
@@ -167,24 +184,27 @@
             # Simulate KERNEL_VERSION and KERNEL_VERSION_OVERRIDE behavior from
             # production.
             case ${BUILD_NAME} in
-              linux-next)
+              linux-next-oe)
                 export KERNEL_VERSION=git
                 export KERNEL_VERSION_OVERRIDE=next
                 ;;
-              linux-mainline)
+              linux-mainline-oe)
                 export KERNEL_VERSION=git
                 export KERNEL_VERSION_OVERRIDE=mainline
                 ;;
-              linux-stable-4.15)
-                export KERNEL_VERSION=4.15
+              linux-stable-rc-4.19-oe)
+                export KERNEL_VERSION=4.19
+                ;;
+              linux-stable-rc-4.18-oe)
+                export KERNEL_VERSION=4.18
                 ;;
-              linux-stable-4.14)
+              linux-stable-rc-4.14-oe)
                 export KERNEL_VERSION=4.14
                 ;;
-              linux-stable-4.9)
+              linux-stable-rc-4.9-oe)
                 export KERNEL_VERSION=4.9
                 ;;
-              linux-stable-4.4)
+              linux-stable-rc-4.4-oe)
                 export KERNEL_VERSION=4.4
                 ;;
               *)
@@ -194,13 +214,13 @@
             esac
 
             case ${BUILD_NAME} in
-              linux-next)
+              linux-next-oe)
                 export KSELFTESTS_VERSION=${MAKE_KERNELVERSION}
                 export KSELFTESTS_REVISION=${KERNEL_COMMIT_ID}
                 export KSELFTESTS_URL=${KERNEL_REPO}
                 export KSELFTEST_PATH=/opt/kselftests/default-in-kernel/
                 ;;
-              linux-mainline)
+              linux-mainline-oe)
                 export KSELFTESTS_VERSION=${MAKE_KERNELVERSION}
                 export KSELFTESTS_REVISION=${KERNEL_COMMIT_ID}
                 export KSELFTESTS_URL=${KERNEL_REPO}
@@ -213,12 +233,13 @@
                 export KSELFTEST_PATH=/opt/kselftests/mainline/
                 ;;
             esac
+            export TOOLCHAIN=${COMPILER:-unknown}
             export NFSROOTFS_URL="${BUILD_LOCATION}/${NFS_FILENAME}"
             export EXT4_IMAGE_URL="${BUILD_LOCATION}/${EXT4_IMAGE_FILENAME}"
             export BOOT_URL="${BUILD_LOCATION}/${BOOT_FILENAME}"
             export SYSTEM_URL="${BUILD_LOCATION}/${ROOTFS_FILENAME}"
             export KERNEL_COMMIT=${KERNEL_COMMIT_ID}
-            export LAVA_JOB_PRIORITY=low
+            export LAVA_JOB_PRIORITY=25
             export KERNEL_CONFIG_URL=${BUILD_LOCATION}/config
             export KERNEL_DEFCONFIG_URL=${BUILD_LOCATION}/defconfig
             export KERNEL_URL="${BUILD_LOCATION}/${KERNEL_FILENAME}"
@@ -229,7 +250,6 @@
             rm build_env.sh
             rm ${MD5_FILENAME}
             rm ${BUILD_CONFIG}
-            export LAVA_JOB_PRIORITY="low"
 
             rm -rf configs
             git clone --depth 1 http://git.linaro.org/ci/job/configs.git
diff --git a/lkft-x15-aosp-userspace.yaml b/lkft-x15-aosp-userspace.yaml
deleted file mode 100644
index a00f25c852..0000000000
--- a/lkft-x15-aosp-userspace.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-- job:
-    name: lkft-x15-aosp-userspace
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-configure
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 30
-    parameters:
-        - string:
-            name: ANDROID_BRANCH
-            default: 'android-8.0.0_r17'
-    disabled: false
-    node: docker-utopic-aosp
-    display-name: 'X15 aosp userspace build for LKFT'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            java -version
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils rsync python-mako zip time python-requests genisoimage patch mtools
-
-            wget -q http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
-              http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
-              http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
-            sudo dpkg -i --force-all *.deb
-
-            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
-            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            chmod a+x ${HOME}/bin/*
-            export PATH=${HOME}/bin:${PATH}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            # Runs as ubuntu
-            set -xe
-            rm -rf build-tools jenkins-tools build/out build/android-patchsets build-configs
-            repo init -u https://android.googlesource.com/platform/manifest -b android-8.0.0_r17
-            cd .repo
-            git clone https://android-git.linaro.org/git/platform/manifest.git -b lkft local_manifests
-            cd -
-            repo sync -j16
-
-            export PATH=$PATH:$PWD/prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-4.9/bin
-
-            git clone --depth=1 git://git.ti.com/android/kernel.git -b p-ti-android-linux-4.4.y x15-kernel
-            pushd x15-kernel
-            ./ti_config_fragments/defconfig_builder.sh -t ti_sdk_am57x_android_release
-            make ARCH=arm CROSS_COMPILE=arm-linux-androideabi- ti_sdk_am57x_android_release_defconfig
-            make ARCH=arm CROSS_COMPILE=arm-linux-androideabi- zImage dtbs modules -j"$(nproc)"
-            export KERNELDIR=${PWD}
-            popd
-
-            source build/envsetup.sh
-            lunch full_am57xevm-userdebug
-            make -j"$(nproc)"
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_DEST=android/lkft/x15-userspace/${BUILD_NUMBER}
-            PUB_SRC=${PWD}/out/target/product/am57xevm
-            PUB_EXTRA_INC=^[^/]+img
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org'
diff --git a/lkft/common/api-callbacks.sh b/lkft/common/api-callbacks.sh
new file mode 100644
index 0000000000..f966dcf5d7
--- /dev/null
+++ b/lkft/common/api-callbacks.sh
@@ -0,0 +1,13 @@
+#!/bin/bash -x
+
+if [ -n "${1}" ] && [ -f "${1}" ]; then
+    source ${1}
+fi
+# call api of android.linaro.org for lkft report check scheduling
+if [ -n "${KERNEL_BRANCH}" ] && \
+    [ -n "${QA_BUILD_VERSION}" ] && \
+    [ -n "${CALLER_JOB_NAME}" ] && \
+    [ -n "${CALLER_BUILD_NUMBER}" ]; then
+    curl -L https://android.linaro.org/lkft/newchanges/${KERNEL_BRANCH}/${QA_BUILD_VERSION}/${CALLER_JOB_NAME}/${CALLER_BUILD_NUMBER} || true
+fi
+
diff --git a/lkft/common/build-aosp-member.sh b/lkft/common/build-aosp-member.sh
new file mode 100755
index 0000000000..0c1df9d444
--- /dev/null
+++ b/lkft/common/build-aosp-member.sh
@@ -0,0 +1,176 @@
+#!/bin/bash -ex
+
+export PATH=${HOME}/bin:${PATH}
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+
+#BUILD_CONFIG_FILENAME=aosp-master-x15
+#KERNEL_REPO_URL=/data/android/aosp-mirror/kernel/omap.git
+#OPT_MIRROR="-m /data/android/aosp-mirror/platform/manifest.git"
+#BUILD_ROOT="/data/android/aosp/pure-master/test-x15-lkft"
+#CLEAN_UP=false
+#IN_JENKINS=false
+
+BUILD_ROOT="${BUILD_ROOT:-/home/buildslave/srv/aosp-private}"
+OPT_MIRROR="${OPT_MIRROR:-}"
+CLEAN_UP=${CLEAN_UP:-true}
+
+ANDROID_ROOT="${BUILD_ROOT}/build/aosp"
+DIR_PUB_SRC="${BUILD_ROOT}/dist"
+ANDROID_IMAGE_FILES="boot.img dtb.img dtbo.img super.img vendor.img product.img system.img system_ext.img vbmeta.img userdata.img ramdisk.img ramdisk-debug.img recovery.img cache.img"
+ANDROID_IMAGE_FILES="${ANDROID_IMAGE_FILES} vendor_boot-debug.img vendor_boot.img"
+
+# functions for clean the environemnt before repo sync and build
+function prepare_environment(){
+    if [ ! -d "${BUILD_ROOT}" ]; then
+      sudo mkdir -p "${BUILD_ROOT}"
+      sudo chmod 777 "${BUILD_ROOT}"
+    fi
+    cd "${BUILD_ROOT}"
+
+    # clean files under ${DIR_SRV_AOSP_MASTER}
+    rm -rf "${ANDROID_ROOT}"
+}
+
+###############################################################
+# Build Android userspace images
+# All operations following should be done under ${ANDROID_ROOT}
+###############################################################
+function build_android(){
+    mkdir -p "${ANDROID_ROOT}" && cd "${ANDROID_ROOT}"
+    rm -fr "${DIR_PUB_SRC}" && mkdir -p "${DIR_PUB_SRC}"
+    rm -fr "${ANDROID_ROOT}/out/pinned-manifest"
+
+    rm -fr android-build-configs linaro-build.sh
+    wget -c https://android-git.linaro.org/android-build-configs.git/plain/linaro-build.sh -O linaro-build.sh
+    chmod +x linaro-build.sh
+    if [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+        opt_cu=""
+        if [ -n "${ANDROID_BUILD_CONFIG_REPO_URL}" ]; then
+            opt_branch=""
+            if [ -n "${ANDROID_BUILD_CONFIG_REPO_BRANCH}" ]; then
+                opt_branch="-b ${ANDROID_BUILD_CONFIG_REPO_BRANCH}"
+            fi
+            # shellcheck disable=SC2086
+            git clone ${opt_branch} ${ANDROID_BUILD_CONFIG_REPO_URL} android-build-configs-private
+            opt_cu="-cu ${ANDROID_ROOT}/android-build-configs-private/${ANDROID_BUILD_CONFIG}"
+        fi
+        # shellcheck disable=SC2086
+        bash -ex ./linaro-build.sh -c "${ANDROID_BUILD_CONFIG}" ${opt_cu}
+        # ${ANDROID_BUILD_CONFIG} will be repo synced after build
+        # shellcheck source=/dev/null
+        source "android-build-configs/${ANDROID_BUILD_CONFIG}"
+        export TARGET_PRODUCT
+    elif [ -n "${TARGET_PRODUCT}" ]; then
+        local opt_manfest_branch="-b master"
+        local opt_maniefst_url="https://android.googlesource.com/platform/manifest"
+        [ -n "${MANIFEST_BRANCH}" ] && opt_manfest_branch="-b ${MANIFEST_BRANCH}"
+        [ -n "${MANIFEST_URL}" ] && opt_maniefst_url="-m ${MANIFEST_URL}"
+        [ -n "${MAKE_TARGETS}" ] && export MAKE_TARGETS
+        # shellcheck disable=SC2086
+        bash -ex ./linaro-build.sh -tp "${TARGET_PRODUCT}" ${opt_maniefst_url} ${opt_manfest_branch}
+    fi
+    if [ "X${TARGET_PRODUCT}X" = "Xaosp_arm64X" ]; then
+        # for cts vts
+        DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/generic_arm64"
+    else
+        DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/${TARGET_PRODUCT}"
+    fi
+
+    mkdir -p "${DIR_PUB_SRC}"
+    # shellcheck disable=SC2086
+    cp -a ${ANDROID_ROOT}/out/pinned-manifest/*-pinned-manifest.xml "${DIR_PUB_SRC}/pinned-manifest.xml"
+    wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lkft/common/build-info/member.txt -O "${DIR_PUB_SRC}/BUILD-INFO.txt"
+
+    if [ -z "${PUBLISH_FILES}" ]; then
+        PUBLISH_FILES="${ANDROID_IMAGE_FILES}"
+    fi
+
+    for f in ${PUBLISH_FILES}; do
+        if [ "X${f}X" = "Xandroid-cts.zipX" ]; then
+            f_src_path="${ANDROID_ROOT}/out/host/linux-x86/cts/android-cts.zip"
+            if [ "X${SPLIT_CTS}X" = "XtrueX" ]; then
+                split -b 4GB -d --additional-suffix=.split "${f_src_path}" "${f_src_path}."
+                # shellcheck disable=SC2086
+                mv -vf ${f_src_path}.*.split "${DIR_PUB_SRC}/"
+                continue
+            fi
+        elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then
+            f_src_path="${ANDROID_ROOT}/out/host/linux-x86/vts/android-vts.zip"
+        else
+            f_src_path="${DIR_PUB_SRC_PRODUCT}/${f}"
+        fi
+
+        if [ ! -f "${f_src_path}" ]; then
+            continue
+        else
+            mv -vf "${f_src_path}" "${DIR_PUB_SRC}/${f}"
+        fi
+
+        if [ "Xramdisk.img" = "X${f}" ] || [ "Xramdisk-debug.img" = "X${f}" ] \
+                || [ "Xandroid-cts.zip" = "X${f}" ] \
+                || [ "Xandroid-vts.zip" = "X${f}" ]; then
+            # files no need to compress
+            continue
+        else
+            xz -T 0 "${DIR_PUB_SRC}/${f}"
+        fi
+    done
+
+    if [ -f "${DIR_PUB_SRC_PRODUCT}/build_fingerprint.txt" ]; then
+        cp -vf "${DIR_PUB_SRC_PRODUCT}/build_fingerprint.txt" "${DIR_PUB_SRC}/"
+    fi
+
+    if [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+        cp -vf "android-build-configs/${ANDROID_BUILD_CONFIG}" "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+    else
+        ANDROID_BUILD_CONFIG="build-config"
+        rm -f "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${TARGET_PRODUCT}" ] && echo "TARGET_PRODUCT=${TARGET_PRODUCT}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${MANIFEST_BRANCH}" ] && echo "MANIFEST_BRANCH=${MANIFEST_BRANCH}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${MANIFEST_URL}" ] && echo "MANIFEST_URL=${MANIFEST_URL}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${MAKE_TARGETS}" ] && echo "MAKE_TARGETS=${MAKE_TARGETS}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${PUBLISH_FILES}" ] && echo "PUBLISH_FILES=${PUBLISH_FILES}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+    fi
+    cd "${DIR_PUB_SRC}" && md5sum ./* > "MD5SUM.txt"
+}
+
+# clean workspace to save space
+function clean_workspace(){
+    # Delete sources after build to save space
+    rm -fr "${ANDROID_ROOT}"
+}
+
+# export parameters for publish/job submission steps
+function export_parameters(){
+    # Publish parameters
+    # The pinned-manifest was copied into the publist directory as pinned-manifest.xml already
+    cp -a "${DIR_PUB_SRC}/pinned-manifest.xml" "${WORKSPACE}/"
+
+    if [ -n "${PUB_DEST_PATH}" ]; then
+        PUB_DEST_TARGET="${PUB_DEST_PATH}"
+    elif [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+        PUB_DEST_TARGET="${ANDROID_BUILD_CONFIG}"
+    elif echo "${PUBLISH_FILES}" |grep android-cts.zip; then
+        PUB_DEST_TARGET="android-cts"
+    elif echo "${PUBLISH_FILES}" |grep android-vts.zip; then
+        PUB_DEST_TARGET="android-vts"
+    else
+        PUB_DEST_TARGET="${TARGET_PRODUCT}"
+    fi
+
+    echo "PUB_DEST=android/lkft/protected/aosp/${PUB_DEST_TARGET}/${BUILD_NUMBER}" > "${WORKSPACE}/publish_parameters"
+    echo "PUB_SRC=${DIR_PUB_SRC}" >> "${WORKSPACE}/publish_parameters"
+    echo "PUB_EXTRA_INC=^[^/]+\.(txt|img|xz|dtb|dtbo|zip|split)$|MLO|vmlinux|System.map" >> "${WORKSPACE}/publish_parameters"
+}
+
+function main(){
+    prepare_environment
+    build_android
+
+    if ${IN_JENKINS} && [ -n "${WORKSPACE}" ]; then
+        export_parameters
+        clean_workspace
+    fi
+}
+
+main "$@"
diff --git a/lkft/common/build-aosp.sh b/lkft/common/build-aosp.sh
new file mode 100755
index 0000000000..61be333f46
--- /dev/null
+++ b/lkft/common/build-aosp.sh
@@ -0,0 +1,201 @@
+#!/bin/bash -ex
+
+export PATH=${HOME}/bin:${PATH}
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+
+BUILD_ROOT="${BUILD_ROOT:-/home/buildslave/srv/aosp-public}"
+OPT_MIRROR="${OPT_MIRROR:-}"
+CLEAN_UP=${CLEAN_UP:-true}
+
+ANDROID_ROOT="${BUILD_ROOT}/build/aosp-${BUILD_NUMBER}"
+KERNEL_ROOT="${BUILD_ROOT}/build/kernel-${BUILD_NUMBER}"
+DIR_PUB_SRC="${BUILD_ROOT}/dist-${BUILD_NUMBER}"
+AOSP_REPO_BACKUP="${BUILD_ROOT}/aosp-repo-backup"
+ANDROID_IMAGE_FILES="boot.img dtb.img dtbo.img super.img vendor.img product.img system.img system_ext.img vbmeta.img userdata.img ramdisk.img ramdisk-debug.img recovery.img cache.img"
+ANDROID_IMAGE_FILES="${ANDROID_IMAGE_FILES} vendor_boot-debug.img vendor_boot.img"
+
+function prepare_environment(){
+    if [ ! -d "${BUILD_ROOT}" ]; then
+      sudo mkdir -p "${BUILD_ROOT}"
+      sudo chmod 777 "${BUILD_ROOT}"
+    fi
+    cd "${BUILD_ROOT}"
+}
+
+###############################################################
+# Build the kernel images that would be used for the userspace
+# All operations following should be done under ${KERNEL_ROOT}
+###############################################################
+function build_kernel(){
+    if [ -z "${KERNEL_BUILD_CONFIG}" ]; then
+        return
+    fi
+    sudo rm -fr "${KERNEL_ROOT}" && mkdir -p "${KERNEL_ROOT}" && cd "${KERNEL_ROOT}"
+    wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O linaro-lkft.sh
+    chmod +x linaro-lkft.sh
+    BUILD_KERNEL_WITH_UPSTREAM_BUILD=true ./linaro-lkft.sh -c "${KERNEL_BUILD_CONFIG}" -obk
+    cp -vf out/"${KERNEL_BUILD_CONFIG}"/pinned-manifest/*-pinned.xml "${DIR_PUB_SRC}/kernel-pinned-manifest.xml"
+    cp -vf "android-build-configs/lkft/${KERNEL_BUILD_CONFIG}" "${DIR_PUB_SRC}/${KERNEL_BUILD_CONFIG}"
+}
+###############################################################
+# Build Android userspace images
+# All operations following should be done under ${ANDROID_ROOT}
+###############################################################
+function build_android(){
+    sudo rm -fr "${ANDROID_ROOT}" && mkdir -p "${ANDROID_ROOT}" && cd "${ANDROID_ROOT}"
+    rm -fr "${ANDROID_ROOT}/out/pinned-manifest"
+
+    rm -fr android-build-configs linaro-build.sh
+    wget -c https://android-git.linaro.org/android-build-configs.git/plain/linaro-build.sh -O linaro-build.sh
+    chmod +x linaro-build.sh
+    if [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+        bash -ex ./linaro-build.sh -c "${ANDROID_BUILD_CONFIG}"
+        # ${ANDROID_BUILD_CONFIG} will be repo synced after build
+        # shellcheck source=/dev/null
+        source "android-build-configs/${ANDROID_BUILD_CONFIG}"
+        export TARGET_PRODUCT
+    elif [ -n "${TARGET_PRODUCT}" ]; then
+        local opt_manfest_branch="-b master"
+        local opt_maniefst_url="https://android.googlesource.com/platform/manifest"
+        [ -n "${MANIFEST_BRANCH}" ] && opt_manfest_branch="-b ${MANIFEST_BRANCH}"
+        [ -n "${MANIFEST_URL}" ] && opt_maniefst_url="-m ${MANIFEST_URL}"
+        [ -n "${MAKE_TARGETS}" ] && export MAKE_TARGETS
+        # shellcheck disable=SC2086
+        bash -ex ./linaro-build.sh -tp "${TARGET_PRODUCT}" ${opt_maniefst_url} ${opt_manfest_branch}
+    fi
+    if echo "${TARGET_PRODUCT}" | grep "trunk_staging"; then
+        # with the main branch, there are release information, like aosp_arm64-trunk_staging
+        TARGET_PRODUCT=$(echo "${TARGET_PRODUCT}"|cut -d- -f1)
+    fi
+    if [ "X${TARGET_PRODUCT}X" = "Xaosp_arm64X" ]; then
+        # for cts, vts, gsi
+        DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/generic_arm64"
+    elif [ "X${TARGET_PRODUCT}X" = "Xbeagle_x15_autoX" ]; then
+        DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/beagle_x15"
+    else
+        DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/${TARGET_PRODUCT}"
+    fi
+
+    mkdir -p "${DIR_PUB_SRC}"
+    # shellcheck disable=SC2086
+    cp -a ${ANDROID_ROOT}/out/pinned-manifest/*-pinned-manifest.xml "${DIR_PUB_SRC}/pinned-manifest.xml"
+    wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O "${DIR_PUB_SRC}/BUILD-INFO.txt"
+
+    if [ -z "${PUBLISH_FILES}" ]; then
+        PUBLISH_FILES="${ANDROID_IMAGE_FILES}"
+    fi
+
+    for f in ${PUBLISH_FILES}; do
+        if [ "X${f}X" = "Xandroid-cts.zipX" ]; then
+            f_src_path="${ANDROID_ROOT}/out/host/linux-x86/cts/android-cts.zip"
+            if [ "X${SPLIT_CTS}X" = "XtrueX" ]; then
+                split -b 4GB -d --additional-suffix=.split "${f_src_path}" "${f_src_path}."
+                # shellcheck disable=SC2086
+                mv -vf ${f_src_path}.*.split "${DIR_PUB_SRC}/"
+                continue
+            fi
+        elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then
+            f_src_path="${ANDROID_ROOT}/out/host/linux-x86/vts/android-vts.zip"
+        elif [ "X${f}X" = "Xuserdebug_plat_sepolicy.cilX" ]; then
+            f_src_path="${DIR_PUB_SRC_PRODUCT}/debug_ramdisk/${f}"
+        else
+            f_src_path="${DIR_PUB_SRC_PRODUCT}/${f}"
+        fi
+
+        if [ ! -f "${f_src_path}" ]; then
+            continue
+        else
+            mv -vf "${f_src_path}" "${DIR_PUB_SRC}/${f}"
+        fi
+
+        if [ "Xramdisk.img" = "X${f}" ] || [ "Xramdisk-debug.img" = "X${f}" ] \
+                || [ "Xuserdebug_plat_sepolicy.cil" = "X${f}" ] \
+                || [ "Xandroid-cts.zip" = "X${f}" ] \
+                || [ "Xandroid-vts.zip" = "X${f}" ]; then
+            # files no need to compress
+            continue
+        else
+            xz -T 0 "${DIR_PUB_SRC}/${f}"
+        fi
+    done
+
+    if [ -f "${DIR_PUB_SRC_PRODUCT}/build_fingerprint.txt" ]; then
+        cp -vf "${DIR_PUB_SRC_PRODUCT}/build_fingerprint.txt" "${DIR_PUB_SRC}/"
+    fi
+
+    if [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+        cp -vf "android-build-configs/${ANDROID_BUILD_CONFIG}" "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+    else
+        ANDROID_BUILD_CONFIG="build-config"
+        rm -f "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${TARGET_PRODUCT}" ] && echo "TARGET_PRODUCT=${TARGET_PRODUCT}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${MANIFEST_BRANCH}" ] && echo "MANIFEST_BRANCH=${MANIFEST_BRANCH}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${MANIFEST_URL}" ] && echo "MANIFEST_URL=${MANIFEST_URL}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${MAKE_TARGETS}" ] && echo "MAKE_TARGETS=${MAKE_TARGETS}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+        [ -n "${PUBLISH_FILES}" ] && echo "PUBLISH_FILES=${PUBLISH_FILES}" >> "${DIR_PUB_SRC}/${ANDROID_BUILD_CONFIG}.txt"
+    fi
+    cd "${DIR_PUB_SRC}" && md5sum ./* > "MD5SUM.txt"
+}
+
+# clean workspace to save space
+function clean_workspace(){
+    # Delete sources after build to save space
+    sudo rm -fr "${ANDROID_ROOT}"
+    sudo rm -fr "${KERNEL_ROOT}"
+}
+
+# export parameters for publish/job submission steps
+function export_parameters(){
+    # Publish parameters
+    # The pinned-manifest was copied into the publist directory as pinned-manifest.xml already
+    cp -a "${DIR_PUB_SRC}/pinned-manifest.xml" "${WORKSPACE}/"
+
+    if [ -n "${PUB_DEST_PATH}" ]; then
+        PUB_DEST="${PUB_DEST_PATH}/${BUILD_NUMBER}"
+    else
+        if [ -n "${ANDROID_BUILD_CONFIG}" ]; then
+            PUB_DEST_TARGET="${ANDROID_BUILD_CONFIG}"
+        elif [ "X${f}X" = "Xandroid-cts.zipX" ]; then
+            PUB_DEST_TARGET="android-cts"
+        elif [ "X${f}X" = "Xandroid-vts.zipX" ]; then
+            PUB_DEST_TARGET="android-vts"
+        elif [ "X${TARGET_PRODUCT}" = "Xbeagle_x15" ]; then
+            # beagle_x15 could not used as part of the url for snapshot site
+            PUB_DEST_TARGET=x15
+        else
+            PUB_DEST_TARGET=${TARGET_PRODUCT}
+        fi
+        PUB_DEST="android/lkft/${PUB_DEST_TARGET}/${BUILD_NUMBER}"
+    fi
+
+    echo "PUB_DEST=${PUB_DEST}" > "${WORKSPACE}/publish_parameters"
+    echo "PUB_SRC=${DIR_PUB_SRC}" >> "${WORKSPACE}/publish_parameters"
+    echo "PUB_EXTRA_INC=^[^/]+\.(txt|img|xz|dtb|dtbo|zip|split|cil)$|MLO|vmlinux|System.map" >> "${WORKSPACE}/publish_parameters"
+}
+
+function main(){
+    # print for debug purpose
+    df -h
+    ls -l1d ${BUILD_ROOT}/build/* || true
+    ls -l1d ${BUILD_ROOT}/* || true
+    ################
+    prepare_environment
+    rm -fr "${DIR_PUB_SRC}" && mkdir -p "${DIR_PUB_SRC}"
+    if [ -n "${KERNEL_BUILD_CONFIG}" ]; then
+        build_kernel
+        export LOCAL_KERNEL_HOME=${KERNEL_ROOT}/out/${KERNEL_BUILD_CONFIG}/vendor-kernel/dist
+        kernel_ver=$(grep GKI_KERNEL_MAKEVERSION "${KERNEL_ROOT}/out/${KERNEL_BUILD_CONFIG}/misc_info.txt" | cut -d= -f2)
+        if [ -z "${kernel_ver}" ]; then
+            kernel_ver=$(grep VENDOR_KERNEL_MAKEVERSION "${KERNEL_ROOT}/out/${KERNEL_BUILD_CONFIG}/misc_info.txt" | cut -d= -f2 )
+        fi
+        export TARGET_KERNEL_USE=${kernel_ver}
+    fi
+    build_android
+
+    if ${IN_JENKINS} && [ -n "${WORKSPACE}" ]; then
+        export_parameters
+        clean_workspace
+    fi
+}
+
+main "$@"
diff --git a/lkft/common/build-info/member.txt b/lkft/common/build-info/member.txt
new file mode 100644
index 0000000000..d92ea4ec77
--- /dev/null
+++ b/lkft/common/build-info/member.txt
@@ -0,0 +1,5 @@
+Format-Version: 0.5
+
+Files-Pattern: *
+License-Type: protected
+Auth-Groups: android-internal
diff --git a/lkft/common/builders-v2.sh b/lkft/common/builders-v2.sh
new file mode 100755
index 0000000000..376907e738
--- /dev/null
+++ b/lkft/common/builders-v2.sh
@@ -0,0 +1,110 @@
+#!/bin/bash -ex
+
+set -o pipefail
+
+# call api of android.linaro.org for lkft report check scheduling
+if [ -n "${KERNEL_BRANCH}" ] && [ -n "${KERNEL_DESCRIBE}" ] && [ -n "${JOB_NAME}" ] && [ -n "${BUILD_NUMBER}" ]; then
+
+    # environments set by the upstream trigger job
+    KERNEL_COMMIT=${SRCREV_kernel}
+    if [ -n "${MAKE_KERNELVERSION}" ] && echo "X${USE_KERNELVERSION_FOR_QA_BUILD_VERSION}" | grep -i "Xtrue"; then
+        QA_BUILD_VERSION=${MAKE_KERNELVERSION}-${KERNEL_COMMIT:0:12}
+    elif [ ! -z "${KERNEL_DESCRIBE}" ]; then
+        QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+    else
+        QA_BUILD_VERSION=${KERNEL_COMMIT:0:12}
+    fi
+
+    curl -L https://android.linaro.org/lkft/newbuild/${KERNEL_BRANCH}/${QA_BUILD_VERSION}/${JOB_NAME}/${BUILD_NUMBER} || true
+fi
+
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+
+#change to use python3 by default
+if ! python --version|grep 3; then
+  sudo rm -fv /usr/bin/python && sudo ln -s /usr/bin/python3 /usr/bin/python
+fi
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="python3-pip openssl libssl-dev coreutils"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+# Install ruamel.yaml and Jinja2 for submit_for_testing.py
+# to submit jobs
+pip3 install --user --force-reinstall ruamel.yaml Jinja2 squad-client
+# install the squad-client with the default pip command
+# so that the squad-client could be found
+pip install --user --force-reinstall squad-client
+
+sudo apt-get update
+sudo apt-get install -y selinux-utils cpio
+
+export LKFT_WORK_ROOT_DIR=/home/buildslave/srv/${BUILD_DIR}
+# NOTE: LKFT_WORK_DIR used by linaro-lkft.sh as well
+export LKFT_WORK_DIR=${LKFT_WORK_ROOT_DIR}/workspace
+
+# temporary workaround for changing to build under ${LKFT_WORK_DIR}
+if [ -d "${LKFT_WORK_ROOT_DIR}/.repo" ]; then
+  sudo rm -fr ${LKFT_WORK_ROOT_DIR}
+fi
+if [ ! -d "${LKFT_WORK_ROOT_DIR}" ]; then
+  sudo mkdir -p ${LKFT_WORK_ROOT_DIR}
+  sudo chmod 777 ${LKFT_WORK_ROOT_DIR}
+fi
+cd ${LKFT_WORK_ROOT_DIR}
+
+# clean the workspace, but keep using the old repo for repo sync speed
+LKFT_REPO_BACKUP=${LKFT_WORK_ROOT_DIR}/.repo-lkft
+LKFT_REPO_UNDER_WORK_DIR=${LKFT_WORK_DIR}/.repo
+rm -fr ${LKFT_REPO_BACKUP} && [ -d ${LKFT_REPO_UNDER_WORK_DIR} ] && mv ${LKFT_REPO_UNDER_WORK_DIR} ${LKFT_REPO_BACKUP}
+rm -fr ${LKFT_WORK_DIR} && mkdir -p ${LKFT_WORK_DIR} && [ -d ${LKFT_REPO_BACKUP} ] && mv ${LKFT_REPO_BACKUP} ${LKFT_REPO_UNDER_WORK_DIR}
+
+cd ${LKFT_WORK_DIR}
+
+# temporary workaround for clean workspace,
+# will be reverted after one build finished successfully
+rm -fr .repo
+
+PRIVATE_CONFIG_PATH=""
+if [ -n "${ANDROID_BUILD_CONFIG_REPO_URL}" ]; then
+    PRIVATE_CONFIG_PATH="${LKFT_WORK_DIR}/android-build-configs-private"
+    rm -fr ${PRIVATE_CONFIG_PATH}
+    git clone -b lkft ${ANDROID_BUILD_CONFIG_REPO_URL} ${PRIVATE_CONFIG_PATH}
+fi
+
+wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O linaro-lkft.sh
+chmod +x linaro-lkft.sh
+for build_config in ${ANDROID_BUILD_CONFIG}; do
+    rm -fr out/${build_config}
+
+    if [ -n "${PRIVATE_CONFIG_PATH}" ]; then
+        ./linaro-lkft.sh -c "${build_config}" -cu "${PRIVATE_CONFIG_PATH}/lkft/${build_config}"
+    else
+        ./linaro-lkft.sh -c "${build_config}"
+    fi
+    mv out/${build_config}/pinned-manifest/*-pinned.xml out/${build_config}/pinned-manifest.xml
+
+    # should be only one .config after the above steps
+    # which is the case of using build/build.sh
+    if [ -d out/${build_config}/vendor-kernel ]; then
+      f_config=`find out/${build_config}/vendor-kernel -name .config`
+      if [ -f "${f_config}" ]; then
+        mv "${f_config}" out/${build_config}/vendor_defconfig
+      fi
+    fi
+    if [ -d out/${build_config}/gki-kernel ]; then
+      f_config=`find out/${build_config}/gki-kernel -name .config`
+      if [ -f "${f_config}" ]; then
+        mv "${f_config}" out/${build_config}/gki_defconfig
+      fi
+    fi
+done
diff --git a/lkft/common/postbuildscript-v2.sh b/lkft/common/postbuildscript-v2.sh
new file mode 100644
index 0000000000..ebe73c5bb0
--- /dev/null
+++ b/lkft/common/postbuildscript-v2.sh
@@ -0,0 +1,22 @@
+#!/bin/bash -e
+export LKFT_WORK_DIR=${LKFT_WORK_DIR:-"/home/buildslave/srv/${BUILD_DIR}/workspace"}
+
+for build_config in ${ANDROID_BUILD_CONFIG}; do
+    # the config file should be in the directory of android-build-configs/lkft
+    # or copied to there by the linaro-lkft.sh build
+    source ${LKFT_WORK_DIR}/android-build-configs/lkft/${build_config}
+
+    KERNEL_COMMIT=${SRCREV_kernel}
+    if [ -n "${MAKE_KERNELVERSION}" ] && echo "X${USE_KERNELVERSION_FOR_QA_BUILD_VERSION}" | grep -i "Xtrue"; then
+        QA_BUILD_VERSION=${MAKE_KERNELVERSION}-${KERNEL_COMMIT:0:12}
+    elif [ ! -z "${KERNEL_DESCRIBE}" ]; then
+        QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+    else
+        QA_BUILD_VERSION=${KERNEL_COMMIT:0:12}
+    fi
+
+    if [ -z "${TEST_QA_SERVER_TEAM}" ]; then
+        TEST_QA_SERVER_TEAM="android-lkft"
+    fi
+    curl --header "Auth-Token: ${QA_REPORTS_TOKEN}" --form tests='{"build_process/build": "fail"}'  ${qa_server}/api/submit/${qa_server_team}/${qa_server_project}/${QA_BUILD_VERSION}/${TEST_DEVICE_TYPE}
+done
diff --git a/lkft/common/publisher-v2.sh b/lkft/common/publisher-v2.sh
new file mode 100644
index 0000000000..147afe6a9f
--- /dev/null
+++ b/lkft/common/publisher-v2.sh
@@ -0,0 +1,46 @@
+#!/bin/bash -ex
+
+# LKFT_WORK_DIR set in lkft/common/builders-v2.sh does not work here
+# the value is empty, so needs to set it again
+export LKFT_WORK_DIR=/home/buildslave/srv/${BUILD_DIR}/workspace
+cd ${LKFT_WORK_DIR}
+
+JOB_OUT_PUBLISH=out/publish
+rm -fr ${JOB_OUT_PUBLISH} && mkdir -p ${JOB_OUT_PUBLISH}
+url_build_info="https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt"
+if [ -n "${SNAPSHOT_SITE_BUILD_INFO_URL}" ]; then
+    url_build_info=${SNAPSHOT_SITE_BUILD_INFO_URL}
+fi
+wget ${url_build_info} -O ${JOB_OUT_PUBLISH}/BUILD-INFO.txt
+
+PUBLISH_COMMON_FILES="pinned-manifest.xml defconfig gki_defconfig upstream_gki_defconfig SHA256SUMS.txt misc_info.txt"
+for build_config in ${ANDROID_BUILD_CONFIG}; do
+    # the config file should be in the directory of android-build-configs/lkft
+    # or copied to there by the linaro-lkft.sh build
+    source ${LKFT_WORK_DIR}/android-build-configs/lkft/${build_config}
+
+    for f in ${PUBLISH_COMMON_FILES} ${PUBLISH_FILES}; do
+        if [ -f out/${build_config}/${f} ]; then
+            if [ "X${f}" = "Xmisc_info.txt" ]; then
+                # the name of misc_info.txt is used by the submit_for_testing-v2.sh
+                # so we can not move it, instead copy it to the workspace directory
+                cp -v out/${build_config}/${f} ${JOB_OUT_PUBLISH}/${build_config}-${f}
+            else
+                mv -v out/${build_config}/${f} ${JOB_OUT_PUBLISH}/${build_config}-${f}
+            fi
+        fi
+    done
+done
+
+# Publish
+PUB_DEST="android/lkft/${JOB_NAME}/${BUILD_NUMBER}"
+if [ -n "${SNAPAHOT_SITE_ROOT}" ]; then
+    PUB_DEST="${SNAPAHOT_SITE_ROOT}/${JOB_NAME}/${BUILD_NUMBER}"
+fi
+HOST_BIN=out/host/bin
+mkdir -p ${HOST_BIN}
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOST_BIN}/linaro-cp.py
+time python3 ${HOST_BIN}/linaro-cp.py \
+  --server ${PUBLISH_SERVER} \
+  --link-latest \
+  ${JOB_OUT_PUBLISH} ${PUB_DEST}
diff --git a/lkft/hikey-aosp/builders.sh b/lkft/hikey-aosp/builders.sh
index aeb0bb2c44..45d066e709 100644
--- a/lkft/hikey-aosp/builders.sh
+++ b/lkft/hikey-aosp/builders.sh
@@ -10,44 +10,65 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="python-pip"
+pkg_list="python-pip openssl libssl-dev coreutils"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
 
-# Install ruamel.yaml
-pip install --user --force-reinstall ruamel.yaml
+# Install ruamel.yaml==0.16.13
+pip install --user --force-reinstall ruamel.yaml==0.16.13
 
 git clone --depth=1 https://android.googlesource.com/platform/prebuilts/gcc/linux-x86/aarch64/aarch64-linux-android-4.9
-export PATH=${PATH}:${PWD}/aarch64-linux-android-4.9/bin/
+git clone --depth=1 https://android.googlesource.com/platform/prebuilts/clang/host/linux-x86
+export PATH=${PWD}/aarch64-linux-android-4.9/bin/:${PWD}/linux-x86/${TOOLCHAIN}/bin/:${PATH}
 
-# Enable VFB locally until the patch is merged
-if echo "${JOB_NAME}" | grep "4.14" ;then
-   CMD="androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug video=vfb:640x480-32@30 vfb.videomemorysize=3145728"
-else
-   CMD="androidboot.console=ttyFIQ0 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug"
+configs_url=https://android.googlesource.com/kernel/configs
+# for not 4.19 premerge ci builds. we use linaro android kernel configs
+if echo "${JOB_NAME}" | grep premerge && ! echo "${KERNEL_BRANCH}" | grep "\-4.19"; then
+    configs_url="https://github.com/tom-gall/LinaroAndroidKernelConfigs"
+elif echo "${JOB_NAME}" | grep premerge && echo "${KERNEL_BRANCH}" | grep "\-4.19"; then
+    git merge --no-edit remotes/origin/${KERNEL_BRANCH}
 fi
+git clone --depth=1 ${configs_url} configs
 
-
-# Need to use TI specific bluetooth driver
-if [ "${JOB_NAME}" = "lkft-hikey-android-8.0-4.9" ]; then
-    git fetch ssh://vishal.bhoj@android-review.linaro.org:29418/kernel/hikey-linaro refs/changes/97/18097/1 && git cherry-pick FETCH_HEAD
+if [ -z "${ANDROID_VERSION}" ]; then
+    export ANDROID_VERSION=$(echo $REFERENCE_BUILD_URL | awk -F"/" '{print$(NF-1)}')
 fi
 
-make ARCH=arm64 hikey_defconfig
-make ARCH=arm64 CROSS_COMPILE=aarch64-linux-android- -j$(nproc) -s Image-dtb
+if echo "${ANDROID_VERSION}" | grep -q  "android-8\." ; then
+  CMD="console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/system/etc/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug"
+else
+  CMD="console=ttyAMA3,115200 androidboot.console=ttyAMA3 androidboot.hardware=hikey firmware_class.path=/vendor/firmware efi=noruntime printk.devkmsg=on buildvariant=userdebug overlay_mgr.overlay_dt_entry=hardware_cfg_enable_android_fstab"
+fi
 
-wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg -O mkbootimg
-wget -q ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img
 
 mkdir -p out
+export CLANG_TRIPLE=aarch64-linux-gnu-
+export CROSS_COMPILE=aarch64-linux-android-
+
+# for not 4.19 premerge ci builds. we use linaro android kernel configs
+if echo "${JOB_NAME}" | grep premerge && ! echo "${KERNEL_BRANCH}" | grep "\-4.19"; then
+    ARCH=arm64 scripts/kconfig/merge_config.sh configs/${CONFIG_FRAGMENTS_PATH}/hikey_defconfig
+else
+    ARCH=arm64 scripts/kconfig/merge_config.sh arch/arm64/configs/hikey_defconfig configs/${CONFIG_FRAGMENTS_PATH}/android-base.config
+fi
+cp .config out/defconfig
+make ARCH=arm64 CC=clang HOSTCC=clang -j$(nproc) -s Image.gz-dtb
+
+wget https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg.py?id=1e40c30b0cc0f2ae007dacc64fe08af52cc731e3 -O mkbootimg
+wget ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img
+
 python mkbootimg \
-  --kernel ${PWD}/arch/arm64/boot/Image-dtb \
-  --cmdline console="${CMD}" \
+  --kernel ${PWD}/arch/arm64/boot/Image.gz-dtb \
+  --cmdline "${CMD}" \
   --os_version O \
   --os_patch_level 2016-11-05 \
   --ramdisk ramdisk.img \
   --output out/boot.img
 xz out/boot.img
+
+rm -rf configs
+
+( cd out && rm -f SHA256SUMS.txt && sha256sum * > SHA256SUMS.txt )
diff --git a/lkft/hikey-aosp/submit_for_testing.sh b/lkft/hikey-aosp/submit_for_testing.sh
index 9a9c1462f0..e671456037 100644
--- a/lkft/hikey-aosp/submit_for_testing.sh
+++ b/lkft/hikey-aosp/submit_for_testing.sh
@@ -1,13 +1,18 @@
-#!/bin/bash
+#!/bin/bash -x
 
 export DEVICE_TYPE=hi6220-hikey
 export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
 export PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
 export DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
 export KERNEL_COMMIT=${SRCREV_kernel}
-export ANDROID_VERSION=$(echo $REFERENCE_BUILD_URL | awk -F"/" '{print$(NF-1)}')
+if [ -z "${ANDROID_VERSION}" ]; then
+    export ANDROID_VERSION=$(echo $REFERENCE_BUILD_URL | awk -F"/" '{print$(NF-1)}')
+else
+    export ANDROID_VERSION
+fi
 export VTS_VERSION=$(echo $VTS_URL | awk -F"/" '{print$(NF-1)}')
 export CTS_VERSION=$(echo $CTS_URL | awk -F"/" '{print$(NF-1)}')
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
 
 if [ ! -z "${KERNEL_DESCRIBE}" ]; then
     export QA_BUILD_VERSION=${KERNEL_DESCRIBE}
@@ -18,6 +23,45 @@ fi
 rm -rf configs
 git clone --depth 1 http://git.linaro.org/ci/job/configs.git
 
+if curl --output /dev/null --silent --head --fail "${REFERENCE_BUILD_URL}/vendor.img.xz"; then
+    echo "This reference build comes with a vendor partition"
+else
+    echo "No vendor partition, so flashing cache partition from the job instead"
+    sed -i "s|vendor.img.xz|cache.img.xz|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+if echo ${KERNEL_BRANCH} | grep "4.4"; then
+   sed -i "s|vendor.img.xz|vendor-4.4.img.xz|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+rm -f reference_build_url_SHA256SUMS.txt
+if curl --output /dev/null --silent --head --fail "${REFERENCE_BUILD_URL}/SHA256SUMS.txt"; then
+    curl  -o reference_build_url_SHA256SUMS.txt "${REFERENCE_BUILD_URL}/SHA256SUMS.txt"
+    sed -i '/BOOT_IMG_SHA256SUM/d' reference_build_url_SHA256SUMS.txt
+fi
+
+[ -z "${BOOT_IMG_SHA256SUM}" ] && export BOOT_IMG_SHA256SUM=$(sha256sum out/boot.img.xz | cut -d\  -f1)
+
+[ -f reference_build_url_SHA256SUMS.txt ] && source reference_build_url_SHA256SUMS.txt
+
+if ! test -z  "${SYSTEM_IMG_SHA256SUM}"; then
+        export SYSTEM_IMG_SHA256SUM
+else
+    sed -i '/SYSTEM_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+if ! test -z "${VENDOR_IMG_SHA256SUM}"; then
+    export VENDOR_IMG_SHA256SUM
+else
+    sed -i '/VENDOR_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+if ! test -z "${USERDATA_IMG_SHA256SUM}"; then
+    export USERDATA_IMG_SHA256SUM
+else
+    sed -i '/USERDATA_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
 python configs/openembedded-lkft/submit_for_testing.py \
     --device-type ${DEVICE_TYPE} \
     --build-number ${BUILD_NUMBER} \
@@ -27,7 +71,7 @@ python configs/openembedded-lkft/submit_for_testing.py \
     --qa-server-project ${QA_SERVER_PROJECT} \
     --git-commit ${QA_BUILD_VERSION} \
     --template-path configs/lkft/lava-job-definitions \
-    --template-names template-boot.yaml template-vts-kernel-part1.yaml template-vts-kernel-part2.yaml template-vts-kernel-part3.yaml template-vts-kernel-part4.yaml template-cts-armeabi-v7a.yaml template-cts-arm64-v8a.yaml \
+    --template-names template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
     --quiet
 
 python configs/openembedded-lkft/submit_for_testing.py \
diff --git a/lkft/lava-job-definitions/common/devices/am65x b/lkft/lava-job-definitions/common/devices/am65x
new file mode 100644
index 0000000000..7e5d7fdd93
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/am65x
@@ -0,0 +1,28 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}am6{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      boot:
+        url: {{DOWNLOAD_URL}}/boot_fit.img
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img
+      system:
+        url: {{REFERENCE_BUILD_URL}}/system.img
+      vendor:
+        url: {{DOWNLOAD_URL}}/vendor.img
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/am65x-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/devices/am65x-boot b/lkft/lava-job-definitions/common/devices/am65x-boot
new file mode 100644
index 0000000000..1b841ab116
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/am65x-boot
@@ -0,0 +1,8 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
diff --git a/lkft/lava-job-definitions/common/devices/dragonboard-845c b/lkft/lava-job-definitions/common/devices/dragonboard-845c
new file mode 100644
index 0000000000..2c42f0d3ee
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/dragonboard-845c
@@ -0,0 +1,67 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}dragonboard-845c{% endblock %}
+{% block device_tags %}
+tags:
+- lcg
+{% endblock device_tags %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      "partition:0":
+        url: "https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/90/dragonboard-845c-bootloader-ufs-aosp-90/gpt_both0.bin"
+      boot:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+      super:
+        url: {{REFERENCE_BUILD_URL}}/super.img.xz
+        compression: xz
+{% if IMAGE_SUPPORTED_VENDOR_BOOT is defined %}
+      vendor_boot:
+        url: {{REFERENCE_BUILD_URL}}/vendor_boot.img.xz
+        compression: xz
+{% endif %}
+{% if IMAGE_SUPPORTED_CACHE is defined %}
+      cache:
+        url: {{REFERENCE_BUILD_URL}}/cache.img.xz
+        compression: xz
+{% endif %}
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+    commands:
+    - format:ext4 metadata
+    - reboot bootloader
+    - oem select-display-panel hdmi
+    - reboot bootloader
+    - oem select-display-panel hdmi
+    - reboot bootloader
+    - oem select-display-panel hdmi
+    - reboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/devices/hikey b/lkft/lava-job-definitions/common/devices/hikey
new file mode 100644
index 0000000000..59d940f4b6
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/hikey
@@ -0,0 +1,57 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}hi6220-hikey-r2{% endblock %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        reboot: hard-reset
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+      system:
+        url: {{REFERENCE_BUILD_URL}}/system.img.xz
+        compression: xz
+      vendor:
+        url: {{REFERENCE_BUILD_URL}}/vendor.img.xz
+        compression: xz
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/devices/hikey960 b/lkft/lava-job-definitions/common/devices/hikey960
new file mode 100644
index 0000000000..8f983873b5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/hikey960
@@ -0,0 +1,67 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}hi960-hikey{% endblock %}
+{% block device_tags %}
+tags:
+- old-firmware
+{% endblock device_tags %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      ptable:
+        url: https://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/85/hikey960/release/prm_ptable.img
+      boot:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+{% if HIKEY960_SUPPORT_SUPER is defined %}
+      super:
+        url: {{REFERENCE_BUILD_URL}}/super.img.xz
+        compression: xz
+{% else %}
+      system:
+        url: {{REFERENCE_BUILD_URL}}/system.img.xz
+        compression: xz
+      vendor:
+        url: {{REFERENCE_BUILD_URL}}/vendor.img.xz
+        compression: xz
+{% endif %}
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+    commands:
+    - format:ext4 cache
+    - reboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/devices/x15 b/lkft/lava-job-definitions/common/devices/x15
new file mode 100644
index 0000000000..b37822941d
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/x15
@@ -0,0 +1,45 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}x15{% endblock %}
+{% block device_tags %}
+tags:
+- hdmi-dongle
+{% endblock device_tags %}
+
+{% block deploy_target %}
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    namespace: target
+    connection: lxc
+    images:
+      boot_a:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      boot_b:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      vbmeta_a:
+        url: {{DOWNLOAD_URL}}/vbmeta.img.xz
+        compression: xz
+      vbmeta_b:
+        url: {{DOWNLOAD_URL}}/vbmeta.img.xz
+        compression: xz
+      userdata:
+        url: {{DOWNLOAD_URL}}/userdata.img.xz
+        compression: xz
+      super:
+        url: {{DOWNLOAD_URL}}/super.img.xz
+        compression: xz
+      recovery:
+        url: {{DOWNLOAD_URL}}/recovery.img.xz
+        compression: xz
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% include "devices/x15-boot" %}
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/devices/x15-boot b/lkft/lava-job-definitions/common/devices/x15-boot
new file mode 100644
index 0000000000..b8057f4f13
--- /dev/null
+++ b/lkft/lava-job-definitions/common/devices/x15-boot
@@ -0,0 +1,16 @@
+- boot:
+    namespace: target
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+{% if X15_BOOT_ARGS is defined %}
+    commands:
+    - setenv bootargs "{{X15_BOOT_ARGS}}"
+    - run findfdt
+    - run emmc_android_boot
+    method: u-boot
+{% else %}
+    method: fastboot
+{% endif %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-andebenchpro2015.yaml b/lkft/lava-job-definitions/common/template-benchmarks-andebenchpro2015.yaml
new file mode 100644
index 0000000000..82444c7e57
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-andebenchpro2015.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "andebenchpro2015" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-antutu6.yaml b/lkft/lava-job-definitions/common/template-benchmarks-antutu6.yaml
new file mode 100644
index 0000000000..89cfe65f04
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-antutu6.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "antutu6" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-base.yaml b/lkft/lava-job-definitions/common/template-benchmarks-base.yaml
new file mode 100644
index 0000000000..722d2f52cf
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-base.yaml
@@ -0,0 +1,34 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-benchmark-{{testname}}{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 90
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}160{% endif %}
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/apk-automation/apk-automation.yaml
+          name: {{testname}}
+          params:
+            SET_GOVERNOR_POLICY: "false"
+            TEST_NAME: {{testname}}
+{% if loopcount is defined %}
+            LOOPS: {{loopcount}}
+{% else %}
+            LOOPS: 1
+{% endif %}
+
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-benchmarkpi.yaml b/lkft/lava-job-definitions/common/template-benchmarks-benchmarkpi.yaml
new file mode 100644
index 0000000000..3ae920b0d8
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-benchmarkpi.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "benchmarkpi" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-caffeinemark.yaml b/lkft/lava-job-definitions/common/template-benchmarks-caffeinemark.yaml
new file mode 100644
index 0000000000..c12f904317
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-caffeinemark.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "caffeinemark" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-cf-bench.yaml b/lkft/lava-job-definitions/common/template-benchmarks-cf-bench.yaml
new file mode 100644
index 0000000000..aec5a35d04
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-cf-bench.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "cf-bench" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-gearses2eclair.yaml b/lkft/lava-job-definitions/common/template-benchmarks-gearses2eclair.yaml
new file mode 100644
index 0000000000..2de17a7471
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-gearses2eclair.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "gearses2eclair" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-geekbench4.yaml b/lkft/lava-job-definitions/common/template-benchmarks-geekbench4.yaml
new file mode 100644
index 0000000000..3fbedef8f5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-geekbench4.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "geekbench4" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-glbenchmark25.yaml b/lkft/lava-job-definitions/common/template-benchmarks-glbenchmark25.yaml
new file mode 100644
index 0000000000..59a05b6830
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-glbenchmark25.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "glbenchmark25" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-javawhetstone.yaml b/lkft/lava-job-definitions/common/template-benchmarks-javawhetstone.yaml
new file mode 100644
index 0000000000..847b4c8ffd
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-javawhetstone.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "javawhetstone" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-jbench.yaml b/lkft/lava-job-definitions/common/template-benchmarks-jbench.yaml
new file mode 100644
index 0000000000..76d94fed81
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-jbench.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "jbench" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-linpack.yaml b/lkft/lava-job-definitions/common/template-benchmarks-linpack.yaml
new file mode 100644
index 0000000000..ace34780af
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-linpack.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "linpack" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-quadrantpro.yaml b/lkft/lava-job-definitions/common/template-benchmarks-quadrantpro.yaml
new file mode 100644
index 0000000000..bb4a41364f
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-quadrantpro.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "quadrantpro" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-rl-sqlite.yaml b/lkft/lava-job-definitions/common/template-benchmarks-rl-sqlite.yaml
new file mode 100644
index 0000000000..74638b1af3
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-rl-sqlite.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "rl-sqlite" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-scimark.yaml b/lkft/lava-job-definitions/common/template-benchmarks-scimark.yaml
new file mode 100644
index 0000000000..bb20e59b5d
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-scimark.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "scimark" %}
diff --git a/lkft/lava-job-definitions/common/template-benchmarks-vellamo3.yaml b/lkft/lava-job-definitions/common/template-benchmarks-vellamo3.yaml
new file mode 100644
index 0000000000..431eff3b6e
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-benchmarks-vellamo3.yaml
@@ -0,0 +1,4 @@
+{% extends "template-benchmarks-base.yaml" %}
+
+{% set job_timeout = 60 %}
+{% set testname = "vellamo3" %}
diff --git a/lkft/lava-job-definitions/common/template-boot.yaml b/lkft/lava-job-definitions/common/template-boot.yaml
new file mode 100644
index 0000000000..1e2b7d112b
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-boot.yaml
@@ -0,0 +1,26 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boot{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-test
+
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-boottime-new.yaml b/lkft/lava-job-definitions/common/template-boottime-new.yaml
new file mode 100644
index 0000000000..dcb655c557
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-boottime-new.yaml
@@ -0,0 +1,206 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boottime{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: fresh-install
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-fresh-install
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-1
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 1
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-2
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 2
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-3
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 3
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-4
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 4
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-5
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 5
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-6
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 6
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-7
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 7
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-reboot
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: 7
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-boottime.yaml b/lkft/lava-job-definitions/common/template-boottime.yaml
new file mode 100644
index 0000000000..24122ca2fe
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-boottime.yaml
@@ -0,0 +1,206 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boottime{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: first-boot
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-first-analyze
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-1
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 1
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-2
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 2
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-3
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 3
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-4
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 4
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-5
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 5
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-6
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 6
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-7
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 7
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-second-analyze
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: 7
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml
new file mode 100644
index 0000000000..0ab69f3168
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v7a.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsDeqpTestCases-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 930
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsDeqpTestCases-v7a"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 900
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts --abi armeabi-v7a -m CtsDeqpTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml
new file mode 100644
index 0000000000..19068b46a7
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases-v8a.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsDeqpTestCases-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 930
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsDeqpTestCases-v8a"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 900
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts --abi arm64-v8a -m CtsDeqpTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases.yaml
new file mode 100644
index 0000000000..1409027411
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-CtsDeqpTestCases.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsDeqpTestCases{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsDeqpTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts -m CtsDeqpTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v7a.yaml
new file mode 100644
index 0000000000..b5988e6fc7
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v7a.yaml
@@ -0,0 +1,37 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsScopedStorageDeviceOnlyTest-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 260
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts CtsScopedStorageDeviceOnlyTest"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 240
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts --abi armeabi-v7a -m CtsScopedStorageDeviceOnlyTest --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v8a.yaml
new file mode 100644
index 0000000000..78c79cea31
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-CtsScopedStorageDeviceOnlyTest-v8a.yaml
@@ -0,0 +1,37 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsScopedStorageDeviceOnlyTest-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 260
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts CtsScopedStorageDeviceOnlyTest"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 240
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts --abi arm64-v8a -m CtsScopedStorageDeviceOnlyTest --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-CtsWindowManagerDeviceTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-CtsWindowManagerDeviceTestCases.yaml
new file mode 100644
index 0000000000..3f85d421ed
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-CtsWindowManagerDeviceTestCases.yaml
@@ -0,0 +1,37 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-CtsWindowManagerDeviceTestCases{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 260
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts CtsWindowManagerDeviceTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 240
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts -m CtsWindowManagerDeviceTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-auto.yaml b/lkft/lava-job-definitions/common/template-cts-auto.yaml
new file mode 100644
index 0000000000..165bc97f0d
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-auto.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-auto{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts -m CtsCarTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-excluded-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-excluded-v7a.yaml
new file mode 100644
index 0000000000..1629840b8e
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-excluded-v7a.yaml
@@ -0,0 +1,63 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-excluded-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 630
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 600
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi armeabi-v7a
+            --include-filter CtsKeystoreTestCases
+            --include-filter CtsWindowManagerDeviceTestCases
+            --include-filter CtsDevicePolicyManagerTestCases
+            --include-filter CtsIdentityTestCases
+            --include-filter CtsJobSchedulerTestCases
+            --include-filter CtsIncidentHostTestCases
+            --include-filter CtsIncidentHostTestCases[instant]
+            --include-filter CtsStatsdHostTestCases[instant]
+            --include-filter CtsStatsdHostTestCases
+            --include-filter CtsPrintTestCases
+            --include-filter CtsPrintTestCases[instant]
+            --include-filter CtsFileSystemTestCases
+            --include-filter CtsFileSystemTestCases[instant]
+            --include-filter CtsUsageStatsTestCases
+            --include-filter CtsTrustedVoiceHostTestCases
+            --include-filter CtsPerfettoTestCases
+            --include-filter CtsShortcutHostTestCases
+            --include-filter CtsNativeHardwareTestCases
+            --include-filter CtsNativeMidiTestCases
+            --include-filter CtsAutoFillServiceTestCases[instant]
+            --include-filter CtsAutoFillServiceTestCases
+            --include-filter CtsBackupHostTestCases
+            --include-filter CtsBackupTestCases
+            --include-filter CtsSecurityBulletinHostTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-excluded-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-excluded-v8a.yaml
new file mode 100644
index 0000000000..6292dd7c2a
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-excluded-v8a.yaml
@@ -0,0 +1,63 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-excluded-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 630
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 600
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi arm64-v8a
+            --include-filter CtsKeystoreTestCases
+            --include-filter CtsWindowManagerDeviceTestCases
+            --include-filter CtsDevicePolicyManagerTestCases
+            --include-filter CtsIdentityTestCases
+            --include-filter CtsJobSchedulerTestCases
+            --include-filter CtsIncidentHostTestCases
+            --include-filter CtsIncidentHostTestCases[instant]
+            --include-filter CtsStatsdHostTestCases[instant]
+            --include-filter CtsStatsdHostTestCases
+            --include-filter CtsPrintTestCases
+            --include-filter CtsPrintTestCases[instant]
+            --include-filter CtsFileSystemTestCases
+            --include-filter CtsFileSystemTestCases[instant]
+            --include-filter CtsUsageStatsTestCases
+            --include-filter CtsTrustedVoiceHostTestCases
+            --include-filter CtsPerfettoTestCases
+            --include-filter CtsShortcutHostTestCases
+            --include-filter CtsNativeHardwareTestCases
+            --include-filter CtsNativeMidiTestCases
+            --include-filter CtsAutoFillServiceTestCases[instant]
+            --include-filter CtsAutoFillServiceTestCases
+            --include-filter CtsBackupHostTestCases
+            --include-filter CtsBackupTestCases
+            --include-filter CtsSecurityBulletinHostTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-excluded.yaml b/lkft/lava-job-definitions/common/template-cts-excluded.yaml
new file mode 100644
index 0000000000..874db8c399
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-excluded.yaml
@@ -0,0 +1,63 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-excluded{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 1230
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 1200
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsKeystoreTestCases
+            --include-filter CtsWindowManagerDeviceTestCases
+            --include-filter CtsDevicePolicyManagerTestCases
+            --include-filter CtsIdentityTestCases
+            --include-filter CtsJobSchedulerTestCases
+            --include-filter CtsIncidentHostTestCases
+            --include-filter CtsIncidentHostTestCases[instant]
+            --include-filter CtsStatsdHostTestCases[instant]
+            --include-filter CtsStatsdHostTestCases
+            --include-filter CtsPrintTestCases
+            --include-filter CtsPrintTestCases[instant]
+            --include-filter CtsFileSystemTestCases
+            --include-filter CtsFileSystemTestCases[instant]
+            --include-filter CtsUsageStatsTestCases
+            --include-filter CtsTrustedVoiceHostTestCases
+            --include-filter CtsPerfettoTestCases
+            --include-filter CtsShortcutHostTestCases
+            --include-filter CtsNativeHardwareTestCases
+            --include-filter CtsNativeMidiTestCases
+            --include-filter CtsAutoFillServiceTestCases[instant]
+            --include-filter CtsAutoFillServiceTestCases
+            --include-filter CtsBackupHostTestCases
+            --include-filter CtsBackupTestCases
+            --include-filter CtsSecurityBulletinHostTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-graphics.yaml b/lkft/lava-job-definitions/common/template-cts-graphics.yaml
new file mode 100644
index 0000000000..9667578a40
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-graphics.yaml
@@ -0,0 +1,41 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-graphics{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 1230
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 1200
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsGraphicsTestCases[instant]
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-libcore.yaml b/lkft/lava-job-definitions/common/template-cts-libcore.yaml
new file mode 100644
index 0000000000..3375ab955c
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-libcore.yaml
@@ -0,0 +1,42 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-libcore{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 630
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsLibcoreOjTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 600
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            -m CtsLibcoreTestCases
+            -m CtsLibcoreOjTestCases
+            -m CtsIcuTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-v2-no-bionic-libcore.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-v2-no-bionic-libcore.yaml
new file mode 100644
index 0000000000..28c3f8500f
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-v2-no-bionic-libcore.yaml
@@ -0,0 +1,56 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-no-bionic-libcore{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsMonkeyTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-v2.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-v2.yaml
new file mode 100644
index 0000000000..ca0b089e60
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-v2.yaml
@@ -0,0 +1,58 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBionicTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsLibcoreTestCases
+            --include-filter CtsMonkeyTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-camera.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-camera.yaml
new file mode 100644
index 0000000000..2c0e170995
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-camera.yaml
@@ -0,0 +1,41 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-powersave-camera{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        SET_GOVERNOR_POWERSAVE: "true"
+        TEST_PARAMS: cts
+            --include-filter CtsCameraTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-libcore.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-libcore.yaml
new file mode 100644
index 0000000000..51dcf14ff0
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-libcore.yaml
@@ -0,0 +1,41 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-powersave-libcore{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        SET_GOVERNOR_POWERSAVE: "true"
+        TEST_PARAMS: cts
+            --include-filter CtsLibcoreTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-no-libcore-camera-webkit.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-no-libcore-camera-webkit.yaml
new file mode 100644
index 0000000000..0b9a0cc1e6
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-no-libcore-camera-webkit.yaml
@@ -0,0 +1,55 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        SET_GOVERNOR_POWERSAVE: "true"
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBionicTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-webkit.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-webkit.yaml
new file mode 100644
index 0000000000..d5525ed261
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15-powersave-webkit.yaml
@@ -0,0 +1,41 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-powersave-webkit{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        SET_GOVERNOR_POWERSAVE: "true"
+        TEST_PARAMS: cts
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft-x15.yaml b/lkft/lava-job-definitions/common/template-cts-lkft-x15.yaml
new file mode 100644
index 0000000000..71fec75cb3
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft-x15.yaml
@@ -0,0 +1,57 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBionicTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsLibcoreTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-lkft.yaml b/lkft/lava-job-definitions/common/template-cts-lkft.yaml
new file mode 100644
index 0000000000..28a9a8a8a7
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-lkft.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-lkft --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-media-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-media-v7a.yaml
new file mode 100644
index 0000000000..1a13daea01
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-media-v7a.yaml
@@ -0,0 +1,43 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-media-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 930
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 900
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi armeabi-v7a
+            --include-filter CtsMediaTestCases
+            --include-filter CtsMediaTestCases[instant]
+            --include-filter CtsMediaV2TestCases
+            --include-filter CtsMediaStressTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-media-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-media-v8a.yaml
new file mode 100644
index 0000000000..5c36b2ace5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-media-v8a.yaml
@@ -0,0 +1,43 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-media-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 930
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 900
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi arm64-v8a
+            --include-filter CtsMediaTestCases
+            --include-filter CtsMediaTestCases[instant]
+            --include-filter CtsMediaV2TestCases
+            --include-filter CtsMediaStressTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-part1-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-part1-v7a.yaml
new file mode 100644
index 0000000000..4ca9eb6de7
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-part1-v7a.yaml
@@ -0,0 +1,54 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part1-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi armeabi-v7a
+            --include-filter CtsContentTestCases
+            --include-filter CtsAppTestCases
+            --include-filter CtsAppTestCases[instant]
+            --include-filter CtsKeystorePerformanceTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsDynamicMimeHostTestCases
+            --include-filter CtsInputMethodTestCases
+            --include-filter CtsInputMethodTestCases[instant]
+            --include-filter CtsJdwpTestCases[instant]
+            --include-filter CtsJdwpTestCases
+            --include-filter CtsNNAPITestCases
+            --include-filter CtsHostsideNetworkTests
+            --include-filter CtsHostsideNetworkTests[instant]
+            --include-filter CtsIcu4cTestCases
+            --include-filter CtsOsTestCases[instant]
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-part1-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-part1-v8a.yaml
new file mode 100644
index 0000000000..a4409e8e7c
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-part1-v8a.yaml
@@ -0,0 +1,54 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part1-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi arm64-v8a
+            --include-filter CtsContentTestCases
+            --include-filter CtsAppTestCases
+            --include-filter CtsAppTestCases[instant]
+            --include-filter CtsKeystorePerformanceTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsDynamicMimeHostTestCases
+            --include-filter CtsInputMethodTestCases
+            --include-filter CtsInputMethodTestCases[instant]
+            --include-filter CtsJdwpTestCases[instant]
+            --include-filter CtsJdwpTestCases
+            --include-filter CtsNNAPITestCases
+            --include-filter CtsHostsideNetworkTests
+            --include-filter CtsHostsideNetworkTests[instant]
+            --include-filter CtsIcu4cTestCases
+            --include-filter CtsOsTestCases[instant]
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-part2-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-part2-v7a.yaml
new file mode 100644
index 0000000000..8523114224
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-part2-v7a.yaml
@@ -0,0 +1,51 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part2-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi armeabi-v7a
+            --include-filter CtsVideoTestCases
+            --include-filter CtsWidgetTestCases[instant]
+            --include-filter CtsThemeHostTestCases
+            --include-filter CtsViewTestCases
+            --include-filter vm-tests-tf
+            --include-filter CtsWidgetTestCases
+            --include-filter CtsTelephonyTestCases
+            --include-filter CtsStatsdAtomHostTestCases[instant]
+            --include-filter CtsStatsdAtomHostTestCases
+            --include-filter CtsSystemUiTestCases[instant]
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsWifiTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-part2-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-part2-v8a.yaml
new file mode 100644
index 0000000000..e9465b9b9f
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-part2-v8a.yaml
@@ -0,0 +1,51 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part2-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi arm64-v8a
+            --include-filter CtsVideoTestCases
+            --include-filter CtsWidgetTestCases[instant]
+            --include-filter CtsThemeHostTestCases
+            --include-filter CtsViewTestCases
+            --include-filter vm-tests-tf
+            --include-filter CtsWidgetTestCases
+            --include-filter CtsTelephonyTestCases
+            --include-filter CtsStatsdAtomHostTestCases[instant]
+            --include-filter CtsStatsdAtomHostTestCases
+            --include-filter CtsSystemUiTestCases[instant]
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsWifiTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-part3-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-part3-v7a.yaml
new file mode 100644
index 0000000000..854b83fe2c
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-part3-v7a.yaml
@@ -0,0 +1,65 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part3-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi armeabi-v7a
+            --include-filter CtsMediaDrmTestCases[instant]
+            --include-filter CtsMediaDrmTestCases
+            --include-filter CtsMediaBitstreamsTestCases
+            --include-filter CtsInstallHostTestCases
+            --include-filter CtsContactsProviderTestCases
+            --include-filter CtsNetTestCases
+            --include-filter CtsSecurityHostTestCases
+            --include-filter CtsStagedInstallHostTestCases
+            --include-filter CtsPermission3TestCases
+            --include-filter CtsPdfTestCases
+            --include-filter CtsPdfTestCases[instant]
+            --include-filter CtsBlobStoreTestCases
+            --include-filter CtsSensorTestCases[instant]
+            --include-filter CtsSensorTestCases
+            --include-filter CtsExtractNativeLibsHostTestCases
+            --include-filter CtsMediaProviderTranscodeTests
+            --include-filter CtsWebkitTestCases
+            --include-filter CtsTextTestCases
+            --include-filter CtsPermissionTestCases
+            --include-filter CtsTextTestCases[instant]
+            --include-filter CtsBugreportTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsCameraTestCases[instant]
+            --include-filter CtsAppExitTestCases[instant]
+            --include-filter CtsLibcoreFileIOTestCases
+            --include-filter CtsSimpleperfTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-part3-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-part3-v8a.yaml
new file mode 100644
index 0000000000..a8b32445f7
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-part3-v8a.yaml
@@ -0,0 +1,65 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-part3-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi arm64-v8a
+            --include-filter CtsMediaDrmTestCases[instant]
+            --include-filter CtsMediaDrmTestCases
+            --include-filter CtsMediaBitstreamsTestCases
+            --include-filter CtsInstallHostTestCases
+            --include-filter CtsContactsProviderTestCases
+            --include-filter CtsNetTestCases
+            --include-filter CtsSecurityHostTestCases
+            --include-filter CtsStagedInstallHostTestCases
+            --include-filter CtsPermission3TestCases
+            --include-filter CtsPdfTestCases
+            --include-filter CtsPdfTestCases[instant]
+            --include-filter CtsBlobStoreTestCases
+            --include-filter CtsSensorTestCases[instant]
+            --include-filter CtsSensorTestCases
+            --include-filter CtsExtractNativeLibsHostTestCases
+            --include-filter CtsMediaProviderTranscodeTests
+            --include-filter CtsWebkitTestCases
+            --include-filter CtsTextTestCases
+            --include-filter CtsPermissionTestCases
+            --include-filter CtsTextTestCases[instant]
+            --include-filter CtsBugreportTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsCameraTestCases[instant]
+            --include-filter CtsAppExitTestCases[instant]
+            --include-filter CtsLibcoreFileIOTestCases
+            --include-filter CtsSimpleperfTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit-CtsDeqpTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsDeqpTestCases.yaml
new file mode 100644
index 0000000000..1a30b7cb1e
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsDeqpTestCases.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit-CtsDeqpTestCases{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsDeqpTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-presubmit -m CtsDeqpTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit-CtsKeystoreTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsKeystoreTestCases.yaml
new file mode 100644
index 0000000000..8e2d2e0a2d
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsKeystoreTestCases.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit-CtsKeystoreTestCases{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsKeystoreTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-presubmit -m CtsKeystoreTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit-CtsLibcoreOjTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsLibcoreOjTestCases.yaml
new file mode 100644
index 0000000000..3af212b00e
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsLibcoreOjTestCases.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit-CtsLibcoreOjTestCases{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsLibcoreOjTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-presubmit -m CtsLibcoreOjTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit-CtsWindowManagerDeviceTestCases.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsWindowManagerDeviceTestCases.yaml
new file mode 100644
index 0000000000..65471c7bc5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit-CtsWindowManagerDeviceTestCases.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit-CtsWindowManagerDeviceTestCases{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsWindowManagerDeviceTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-presubmit -m CtsWindowManagerDeviceTestCases --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit-arm64-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit-arm64-v8a.yaml
new file mode 100644
index 0000000000..f1836f1603
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit-arm64-v8a.yaml
@@ -0,0 +1,43 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit-arm64-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts-presubmit --abi arm64-v8a
+            --exclude-filter CtsDeqpTestCases
+            --exclude-filter CtsLibcoreOjTestCases
+            --exclude-filter CtsKeystoreTestCases
+            --exclude-filter CtsWindowManagerDeviceTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit-armeabi-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit-armeabi-v7a.yaml
new file mode 100644
index 0000000000..7971846fbd
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit-armeabi-v7a.yaml
@@ -0,0 +1,43 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit-armeabi-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts-presubmit --abi armeabi-v7a
+            --exclude-filter CtsDeqpTestCases
+            --exclude-filter CtsLibcoreOjTestCases
+            --exclude-filter CtsKeystoreTestCases
+            --exclude-filter CtsWindowManagerDeviceTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-presubmit.yaml b/lkft/lava-job-definitions/common/template-cts-presubmit.yaml
new file mode 100644
index 0000000000..97c770095f
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-presubmit.yaml
@@ -0,0 +1,43 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-presubmit{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts-presubmit
+            --exclude-filter CtsDeqpTestCases
+            --exclude-filter CtsLibcoreOjTestCases
+            --exclude-filter CtsKeystoreTestCases
+            --exclude-filter CtsWindowManagerDeviceTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-security.yaml b/lkft/lava-job-definitions/common/template-cts-security.yaml
new file mode 100644
index 0000000000..4b9d6e2a96
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-security.yaml
@@ -0,0 +1,42 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-security{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 630
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-presubmit CtsLibcoreOjTestCases"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 600
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            -m CtsSecurityTestCases
+            -m CtsSecurityTestCases[instant]
+            -m CtsAppSecurityHostTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-v7a.yaml b/lkft/lava-job-definitions/common/template-cts-v7a.yaml
new file mode 100644
index 0000000000..538525397d
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-v7a.yaml
@@ -0,0 +1,130 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 930
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 900
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi armeabi-v7a
+            --exclude-filter CtsMediaDrmTestCases[instant]
+            --exclude-filter CtsMediaDrmTestCases
+            --exclude-filter CtsMediaBitstreamsTestCases
+            --exclude-filter CtsInstallHostTestCases
+            --exclude-filter CtsContactsProviderTestCases
+            --exclude-filter CtsNetTestCases
+            --exclude-filter CtsSecurityHostTestCases
+            --exclude-filter CtsStagedInstallHostTestCases
+            --exclude-filter CtsPermission3TestCases
+            --exclude-filter CtsPdfTestCases
+            --exclude-filter CtsPdfTestCases[instant]
+            --exclude-filter CtsBlobStoreTestCases
+            --exclude-filter CtsSensorTestCases[instant]
+            --exclude-filter CtsSensorTestCases
+            --exclude-filter CtsScopedStorageDeviceOnlyTest
+            --exclude-filter CtsExtractNativeLibsHostTestCases
+            --exclude-filter CtsMediaProviderTranscodeTests
+            --exclude-filter CtsWebkitTestCases
+            --exclude-filter CtsTextTestCases
+            --exclude-filter CtsPermissionTestCases
+            --exclude-filter CtsTextTestCases[instant]
+            --exclude-filter CtsBugreportTestCases
+            --exclude-filter CtsCameraTestCases
+            --exclude-filter CtsCameraTestCases[instant]
+            --exclude-filter CtsAppExitTestCases[instant]
+            --exclude-filter CtsLibcoreFileIOTestCases
+            --exclude-filter CtsSimpleperfTestCases
+            --exclude-filter CtsVideoTestCases
+            --exclude-filter CtsWidgetTestCases[instant]
+            --exclude-filter CtsThemeHostTestCases
+            --exclude-filter CtsViewTestCases
+            --exclude-filter vm-tests-tf
+            --exclude-filter CtsWidgetTestCases
+            --exclude-filter CtsTelephonyTestCases
+            --exclude-filter CtsStatsdAtomHostTestCases[instant]
+            --exclude-filter CtsStatsdAtomHostTestCases
+            --exclude-filter CtsSystemUiTestCases[instant]
+            --exclude-filter CtsSystemUiTestCases
+            --exclude-filter CtsWifiTestCases
+            --exclude-filter CtsContentTestCases
+            --exclude-filter CtsAppTestCases
+            --exclude-filter CtsAppTestCases[instant]
+            --exclude-filter CtsKeystorePerformanceTestCases
+            --exclude-filter CtsOsTestCases
+            --exclude-filter CtsDynamicMimeHostTestCases
+            --exclude-filter CtsInputMethodTestCases
+            --exclude-filter CtsInputMethodTestCases[instant]
+            --exclude-filter CtsJdwpTestCases[instant]
+            --exclude-filter CtsJdwpTestCases
+            --exclude-filter CtsNNAPITestCases
+            --exclude-filter CtsHostsideNetworkTests
+            --exclude-filter CtsHostsideNetworkTests[instant]
+            --exclude-filter CtsIcu4cTestCases
+            --exclude-filter CtsOsTestCases[instant]
+            --exclude-filter CtsDeqpTestCases
+            --exclude-filter CtsMediaTestCases
+            --exclude-filter CtsMediaTestCases[instant]
+            --exclude-filter CtsMediaV2TestCases
+            --exclude-filter CtsMediaStressTestCases
+            --exclude-filter CtsSecurityTestCases
+            --exclude-filter CtsSecurityTestCases[instant]
+            --exclude-filter CtsAppSecurityHostTestCases
+            --exclude-filter CtsLibcoreTestCases
+            --exclude-filter CtsLibcoreOjTestCases
+            --exclude-filter CtsIcuTestCases
+            --exclude-filter CtsGraphicsTestCases
+            --exclude-filter CtsGraphicsTestCases[instant]
+            --exclude-filter CtsKeystoreTestCases
+            --exclude-filter CtsWindowManagerDeviceTestCases
+            --exclude-filter CtsDevicePolicyManagerTestCases
+            --exclude-filter CtsIdentityTestCases
+            --exclude-filter CtsJobSchedulerTestCases
+            --exclude-filter CtsIncidentHostTestCases
+            --exclude-filter CtsIncidentHostTestCases[instant]
+            --exclude-filter CtsStatsdHostTestCases[instant]
+            --exclude-filter CtsStatsdHostTestCases
+            --exclude-filter CtsPrintTestCases
+            --exclude-filter CtsPrintTestCases[instant]
+            --exclude-filter CtsFileSystemTestCases
+            --exclude-filter CtsFileSystemTestCases[instant]
+            --exclude-filter CtsUsageStatsTestCases
+            --exclude-filter CtsTrustedVoiceHostTestCases
+            --exclude-filter CtsPerfettoTestCases
+            --exclude-filter CtsShortcutHostTestCases
+            --exclude-filter CtsNativeHardwareTestCases
+            --exclude-filter CtsNativeMidiTestCases
+            --exclude-filter CtsAutoFillServiceTestCases[instant]
+            --exclude-filter CtsAutoFillServiceTestCases
+            --exclude-filter CtsBackupHostTestCases
+            --exclude-filter CtsBackupTestCases
+            --exclude-filter CtsSecurityBulletinHostTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-cts-v8a.yaml b/lkft/lava-job-definitions/common/template-cts-v8a.yaml
new file mode 100644
index 0000000000..a3287e14c1
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-cts-v8a.yaml
@@ -0,0 +1,130 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 930
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 900
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts --abi arm64-v8a
+            --exclude-filter CtsMediaDrmTestCases[instant]
+            --exclude-filter CtsMediaDrmTestCases
+            --exclude-filter CtsMediaBitstreamsTestCases
+            --exclude-filter CtsInstallHostTestCases
+            --exclude-filter CtsContactsProviderTestCases
+            --exclude-filter CtsNetTestCases
+            --exclude-filter CtsSecurityHostTestCases
+            --exclude-filter CtsStagedInstallHostTestCases
+            --exclude-filter CtsPermission3TestCases
+            --exclude-filter CtsPdfTestCases
+            --exclude-filter CtsPdfTestCases[instant]
+            --exclude-filter CtsBlobStoreTestCases
+            --exclude-filter CtsSensorTestCases[instant]
+            --exclude-filter CtsSensorTestCases
+            --exclude-filter CtsScopedStorageDeviceOnlyTest
+            --exclude-filter CtsExtractNativeLibsHostTestCases
+            --exclude-filter CtsMediaProviderTranscodeTests
+            --exclude-filter CtsWebkitTestCases
+            --exclude-filter CtsTextTestCases
+            --exclude-filter CtsPermissionTestCases
+            --exclude-filter CtsTextTestCases[instant]
+            --exclude-filter CtsBugreportTestCases
+            --exclude-filter CtsCameraTestCases
+            --exclude-filter CtsCameraTestCases[instant]
+            --exclude-filter CtsAppExitTestCases[instant]
+            --exclude-filter CtsLibcoreFileIOTestCases
+            --exclude-filter CtsSimpleperfTestCases
+            --exclude-filter CtsVideoTestCases
+            --exclude-filter CtsWidgetTestCases[instant]
+            --exclude-filter CtsThemeHostTestCases
+            --exclude-filter CtsViewTestCases
+            --exclude-filter vm-tests-tf
+            --exclude-filter CtsWidgetTestCases
+            --exclude-filter CtsTelephonyTestCases
+            --exclude-filter CtsStatsdAtomHostTestCases[instant]
+            --exclude-filter CtsStatsdAtomHostTestCases
+            --exclude-filter CtsSystemUiTestCases[instant]
+            --exclude-filter CtsSystemUiTestCases
+            --exclude-filter CtsWifiTestCases
+            --exclude-filter CtsContentTestCases
+            --exclude-filter CtsAppTestCases
+            --exclude-filter CtsAppTestCases[instant]
+            --exclude-filter CtsKeystorePerformanceTestCases
+            --exclude-filter CtsOsTestCases
+            --exclude-filter CtsDynamicMimeHostTestCases
+            --exclude-filter CtsInputMethodTestCases
+            --exclude-filter CtsInputMethodTestCases[instant]
+            --exclude-filter CtsJdwpTestCases[instant]
+            --exclude-filter CtsJdwpTestCases
+            --exclude-filter CtsNNAPITestCases
+            --exclude-filter CtsHostsideNetworkTests
+            --exclude-filter CtsHostsideNetworkTests[instant]
+            --exclude-filter CtsIcu4cTestCases
+            --exclude-filter CtsOsTestCases[instant]
+            --exclude-filter CtsDeqpTestCases
+            --exclude-filter CtsMediaTestCases
+            --exclude-filter CtsMediaTestCases[instant]
+            --exclude-filter CtsMediaV2TestCases
+            --exclude-filter CtsMediaStressTestCases
+            --exclude-filter CtsSecurityTestCases
+            --exclude-filter CtsSecurityTestCases[instant]
+            --exclude-filter CtsAppSecurityHostTestCases
+            --exclude-filter CtsLibcoreTestCases
+            --exclude-filter CtsLibcoreOjTestCases
+            --exclude-filter CtsIcuTestCases
+            --exclude-filter CtsGraphicsTestCases
+            --exclude-filter CtsGraphicsTestCases[instant]
+            --exclude-filter CtsKeystoreTestCases
+            --exclude-filter CtsWindowManagerDeviceTestCases
+            --exclude-filter CtsDevicePolicyManagerTestCases
+            --exclude-filter CtsIdentityTestCases
+            --exclude-filter CtsJobSchedulerTestCases
+            --exclude-filter CtsIncidentHostTestCases
+            --exclude-filter CtsIncidentHostTestCases[instant]
+            --exclude-filter CtsStatsdHostTestCases[instant]
+            --exclude-filter CtsStatsdHostTestCases
+            --exclude-filter CtsPrintTestCases
+            --exclude-filter CtsPrintTestCases[instant]
+            --exclude-filter CtsFileSystemTestCases
+            --exclude-filter CtsFileSystemTestCases[instant]
+            --exclude-filter CtsUsageStatsTestCases
+            --exclude-filter CtsTrustedVoiceHostTestCases
+            --exclude-filter CtsPerfettoTestCases
+            --exclude-filter CtsShortcutHostTestCases
+            --exclude-filter CtsNativeHardwareTestCases
+            --exclude-filter CtsNativeMidiTestCases
+            --exclude-filter CtsAutoFillServiceTestCases[instant]
+            --exclude-filter CtsAutoFillServiceTestCases
+            --exclude-filter CtsBackupHostTestCases
+            --exclude-filter CtsBackupTestCases
+            --exclude-filter CtsSecurityBulletinHostTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-lkft.yaml b/lkft/lava-job-definitions/common/template-lkft.yaml
new file mode 100644
index 0000000000..369e0931f5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-lkft.yaml
@@ -0,0 +1,130 @@
+{% block global_settings %}
+{% endblock global_settings %}
+
+device_type: {% block device_type %}{% endblock device_type %}
+{% block device_tags %}{% endblock device_tags %}
+job_name: {% block job_name %}{% endblock job_name %}
+
+{% block priority %}
+priority: {{TEST_LAVA_JOB_PRIORITY}}
+{% endblock priority%}
+
+{% block visibility %}
+visibility:
+  group:
+    - {{TEST_LAVA_JOB_GROUP}}
+{% endblock visibility %}
+
+{% block job_gobal_timeout %}
+{% endblock job_gobal_timeout %}
+
+metadata:
+  android.build: "{{BUILD_NUMBER}}"
+  android.name: "{{JOB_NAME}}"
+  android.url: "{{REFERENCE_BUILD_URL}}"
+  android.version: "{{ANDROID_VERSION}}"
+{% if ANDROID_VENDOR_FINGERPRINT is defined %}
+  android.build.vendor.fingerprint: "{{ANDROID_VENDOR_FINGERPRINT}}"
+{% endif %}
+{% if ANDROID_GSI_FINGERPRINT is defined %}
+  android.build.gsi.url: "{{ANDROID_GSI_URL}}"
+  android.build.gsi.fingerprint: "{{ANDROID_GSI_FINGERPRINT}}"
+{% endif %}
+  git branch: "{{KERNEL_BRANCH}}"
+  git repo: "{{KERNEL_REPO}}"
+  git commit: "{{KERNEL_COMMIT}}"
+  git describe: "{{KERNEL_DESCRIBE}}"
+  build-url: "{{BUILD_URL}}"
+  toolchain: "{{TEST_METADATA_TOOLCHAIN}}"
+  series: lkft
+{% block job_specific_metadata %}
+{% endblock job_specific_metadata %}
+
+{% block secrets %}
+secrets:
+  ARTIFACTORIAL_TOKEN: "{{ARTIFACTORIAL_TOKEN}}"
+{% endblock %}
+
+protocols:
+{% block protocols %}
+  lava-lxc:
+    name: lxc-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+{% endblock protocols %}
+
+actions:
+{% block actions %}
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - android-sdk-platform-tools-common
+    - curl
+    - git
+    - tar
+    - trace-cmd
+    - unzip
+    - usbutils
+    - wget
+    - xz-utils
+    - zip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+{% block deploy_target %}
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% endblock boot_target %}
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 20
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-sleep-30secs" --shell sleep 30
+            - lava-test-case "android-boot-lsusb-v" --shell lsusb -v
+            - lava-test-case "android-boot-boot-completed" --shell "while ! adb shell getprop sys.boot_completed|grep 1; do sleep 2; done"
+            - lava-test-case "android-boot-set-power-stayon" --shell adb shell su 0 svc power stayon true
+            - lava-test-case "android-boot-screencap" --shell adb shell screencap -p /data/local/tmp/screencap.png
+
+{% block test_target %}
+{% endblock test_target %}
+
+{% endblock actions %}
diff --git a/lkft/lava-job-definitions/common/template-pmwg-multimedia.yaml b/lkft/lava-job-definitions/common/template-pmwg-multimedia.yaml
new file mode 100644
index 0000000000..4635232eee
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-pmwg-multimedia.yaml
@@ -0,0 +1,72 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-pmwg-multimedia{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/people/vincent.guittot/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v1.1.tar.gz"
+         AGENDA: "agenda/android-multimedia-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-pmwg-vellamo.yaml b/lkft/lava-job-definitions/common/template-pmwg-vellamo.yaml
new file mode 100644
index 0000000000..1db1034f0c
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-pmwg-vellamo.yaml
@@ -0,0 +1,72 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-pmwg-vellamo{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 420
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+  connections:
+    lava-test-shell:
+      seconds: 10
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/aep-install.yaml
+      name: aep-install
+      parameters:
+        AEP_CONFIG_REF: wa3_support
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/people/vincent.guittot/test-definitions.git
+      from: git
+      path: automated/android/workload-automation3/workload-automation.yaml
+      parameters:
+         WA_TAG: master
+         WA_EXTENSION_PATHS: "/root/energy-probe-ext"
+         WA_TEMPLATES_REPO: "https://git.linaro.org/people/vincent.guittot/wa3-lava.git"
+         TEMPLATES_BRANCH: master
+         BUILD_TOOLS_URL: "http://testdata.linaro.org/apks/pmwg/build-tools.tar.gz"
+         WA_HOME_URL: "http://testdata.linaro.org/apks/pmwg/workload_automation_home_v1.1.tar.gz"
+         AGENDA: "agenda/android-vellamo-aep.yaml"
+         CONFIG: "config/generic-android.yaml"
+         OUTPUT: /root/output
+      name: wa-lxc-test
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/aep-pre-post/lisa-postprocessing.yaml
+      name: lisa-postprocessing
+      parameters:
+        LISA_REPOSITORY: https://github.com/vingu-linaro/lisa
+        LISA_REF: support_python_command_line_post_processing
+        LISA_SCRIPT: ipynb/wltests/sched-evaluation-full.py
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: private-pmwg@lists.linaro.org
+    criteria:
+        status: complete
+    verbosity: verbose
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-FastbootVerifyUserspaceTest.yaml b/lkft/lava-job-definitions/common/template-vts-FastbootVerifyUserspaceTest.yaml
new file mode 100644
index 0000000000..4f5db602c5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-FastbootVerifyUserspaceTest.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-FastbootVerifyUserspaceTest{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 360
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts -m FastbootVerifyUserspaceTest"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-VtsHalAudioV4_0TargetTest.yaml b/lkft/lava-job-definitions/common/template-vts-VtsHalAudioV4_0TargetTest.yaml
new file mode 100644
index 0000000000..8eb37d30fe
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-VtsHalAudioV4_0TargetTest.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-VtsHalAudioV4_0TargetTest{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 360
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts -m VtsHalAudioV4_0TargetTest"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-hal-auto.yaml b/lkft/lava-job-definitions/common/template-vts-hal-auto.yaml
new file mode 100644
index 0000000000..e3f74143d8
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-hal-auto.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-hal-auto{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 360
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-hal-auto"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-kernel-arm64-v8a.yaml b/lkft/lava-job-definitions/common/template-vts-kernel-arm64-v8a.yaml
new file mode 100644
index 0000000000..a8d73084a0
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-kernel-arm64-v8a.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-arm64-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel --abi arm64-v8a"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-kernel-armeabi-v7a.yaml b/lkft/lava-job-definitions/common/template-vts-kernel-armeabi-v7a.yaml
new file mode 100644
index 0000000000..86ec6c87a2
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-kernel-armeabi-v7a.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-armeabi-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel --abi armeabi-v7a"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-ltp.yaml b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-ltp.yaml
new file mode 100644
index 0000000000..5e8d4dadf0
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-ltp.yaml
@@ -0,0 +1,39 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-powersave-ltp{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                SET_GOVERNOR_POWERSAVE: "true"
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel -m vts_ltp_test_arm"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-no-ltp.yaml b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-no-ltp.yaml
new file mode 100644
index 0000000000..fc994c0af2
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-kernel-x15-powersave-no-ltp.yaml
@@ -0,0 +1,39 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-armeabi-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                SET_GOVERNOR_POWERSAVE: "true"
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel --exclude-filter vts_ltp_test_arm"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts-kernel.yaml b/lkft/lava-job-definitions/common/template-vts-kernel.yaml
new file mode 100644
index 0000000000..2369ec06a4
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts-kernel.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/common/template-vts.yaml b/lkft/lava-job-definitions/common/template-vts.yaml
new file mode 100644
index 0000000000..2db48797b5
--- /dev/null
+++ b/lkft/lava-job-definitions/common/template-vts.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 360
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts --exclude-filter FastbootVerifyUserspaceTest --exclude-filter VtsHalAudioV4_0TargetTest"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/devices/dragonboard-845c b/lkft/lava-job-definitions/docker/devices/dragonboard-845c
new file mode 100644
index 0000000000..bf29d5705f
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/devices/dragonboard-845c
@@ -0,0 +1,116 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}dragonboard-845c{% endblock %}
+{% block device_tags %}
+tags:
+- lcg
+{% endblock device_tags %}
+
+
+{% block deploy_target %}
+- deploy:
+    to: downloads
+    images:
+      "partition:0":
+        url: "https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/90/dragonboard-845c-bootloader-ufs-aosp-90/gpt_both0.bin"
+      boot:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+      super:
+        url: {{REFERENCE_BUILD_URL}}/super.img.xz
+        compression: xz
+{% if IMAGE_SUPPORTED_VENDOR_BOOT is defined %}
+      vendor_boot:
+        url: {{REFERENCE_BUILD_URL}}/vendor_boot.img.xz
+        compression: xz
+{% endif %}
+{% if IMAGE_SUPPORTED_CACHE is defined %}
+      cache:
+        url: {{REFERENCE_BUILD_URL}}/cache.img.xz
+        compression: xz
+{% endif %}
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    images:
+      "partition:0":
+        url: downloads://gpt_both0.bin
+      boot:
+        url: downloads://boot.img
+      userdata:
+        url: downloads://userdata.img
+      super:
+        url: downloads://super.img
+{% if IMAGE_SUPPORTED_VENDOR_BOOT is defined %}
+      vendor_boot:
+        url: downloads://vendor_boot.img
+{% endif %}
+{% if IMAGE_SUPPORTED_CACHE is defined %}
+      cache:
+        url: downloads://cache.img
+{% endif %}
+
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 20
+    definitions:
+    - from: inline
+      path: format-metatdata.yaml
+      name: format-metatdata
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: format-metatdata
+          description: format-metatdata
+        run:
+          steps:
+          - lava-test-case "format-metadata" --shell fastboot format:ext4 metadata
+
+- test:
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 20
+    definitions:
+    - from: inline
+      path: select-display-panel.yaml
+      name: select-display-panel
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: select-display-panel
+          description: select-display-panel
+        run:
+          steps:
+          - lava-test-case "select-display-panel-1" --shell fastboot oem select-display-panel hdmi
+          - lava-test-case "reboot-bootloader-1" --shell fastboot reboot bootloader
+          - lava-test-case "select-display-panel-2" --shell fastboot oem select-display-panel hdmi
+          - lava-test-case "reboot-bootloader-2" --shell fastboot reboot bootloader
+          - lava-test-case "select-display-panel-3" --shell fastboot oem select-display-panel hdmi
+          - lava-test-case "reboot" --shell fastboot reboot
+
+- boot:
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/devices/hikey b/lkft/lava-job-definitions/docker/devices/hikey
new file mode 100644
index 0000000000..1d5d927e05
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/devices/hikey
@@ -0,0 +1,79 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}hi6220-hikey-r2{% endblock %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    to: downloads
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
+{% if TUXSUITE_DOWNLOAD_URL is defined %}
+    postprocess:
+      docker:
+        image: tuxsuite/tuxsuite:0.25.0
+        steps:
+        - apt-get update && apt-get install -y wget selinux-utils cpio rsync sudo bc curl git xz-utils
+        - rm -fr /linaro-android/lkft && mkdir -p /linaro-android/lkft
+        - wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O /linaro-android/lkft/linaro-lkft.sh && chmod +x /linaro-android/lkft/linaro-lkft.sh
+        - cd /linaro-android/lkft && TUXSUITE_DOWNLOAD_URL={{TUXSUITE_DOWNLOAD_URL}} ./linaro-lkft.sh -c {{LKFT_BUILD_CONFIG}} && cd -
+        - for f in {{PUBLISH_FILES}}; do if echo $f|grep '\.xz$'; then [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f} ] &&  rm -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/$(echo ${f}|sed "s|.xz$||") && xz -d /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f}; fi;done
+        - for f in {{PUBLISH_FILES}}; do f_no_xz=$(echo ${f}|sed "s|.xz$||"); [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} ] && mv -v /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} /lava-downloads/${f_no_xz}; done
+{% else %}
+      boot:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+      system:
+        url: {{REFERENCE_BUILD_URL}}/system.img.xz
+        compression: xz
+      vendor:
+        url: {{REFERENCE_BUILD_URL}}/vendor.img.xz
+        compression: xz
+{% endif %}
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    images:
+      ptable:
+        url: downloads://ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        reboot: hard-reset
+        url: downloads://boot.img
+      userdata:
+        url: downloads://userdata.img
+      system:
+        url: downloads://system.img
+      vendor:
+        url: downloads://vendor.img
+
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/devices/hikey960 b/lkft/lava-job-definitions/docker/devices/hikey960
new file mode 100644
index 0000000000..ee3bbc3037
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/devices/hikey960
@@ -0,0 +1,111 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}hi960-hikey{% endblock %}
+{% block device_tags %}
+tags:
+- old-firmware
+{% endblock device_tags %}
+
+{% block secrets %}
+  {{ super() }}
+  AP_SSID: "{{AP_SSID}}"
+  AP_KEY: "{{AP_KEY}}"
+{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    to: downloads
+    images:
+      ptable:
+        url: https://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/85/hikey960/release/prm_ptable.img
+{% if TUXSUITE_DOWNLOAD_URL is defined %}
+    postprocess:
+      docker:
+        image: tuxsuite/tuxsuite:0.25.0
+        steps:
+        - apt-get update && apt-get install -y wget selinux-utils cpio rsync sudo bc curl git xz-utils
+        - rm -fr /linaro-android/lkft && mkdir -p /linaro-android/lkft
+        - wget https://android-git.linaro.org/android-build-configs.git/plain/lkft/linaro-lkft.sh?h=lkft -O /linaro-android/lkft/linaro-lkft.sh && chmod +x /linaro-android/lkft/linaro-lkft.sh
+        - cd /linaro-android/lkft && TUXSUITE_DOWNLOAD_URL={{TUXSUITE_DOWNLOAD_URL}} ./linaro-lkft.sh -c {{LKFT_BUILD_CONFIG}} && cd -
+        - for f in {{PUBLISH_FILES}}; do if echo $f|grep '\.xz$'; then [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f} ] &&  rm -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/$(echo ${f}|sed "s|.xz$||") && xz -d /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f}; fi;done
+        - for f in {{PUBLISH_FILES}}; do f_no_xz=$(echo ${f}|sed "s|.xz$||"); [ -f /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} ] && mv -v /linaro-android/lkft/out/{{LKFT_BUILD_CONFIG}}/${f_no_xz} /lava-downloads/${f_no_xz}; done
+{% else %}
+      boot:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      userdata:
+        url: {{REFERENCE_BUILD_URL}}/userdata.img.xz
+        compression: xz
+{% if HIKEY960_SUPPORT_SUPER is defined %}
+      super:
+        url: {{REFERENCE_BUILD_URL}}/super.img.xz
+        compression: xz
+{% else %}
+      system:
+        url: {{REFERENCE_BUILD_URL}}/system.img.xz
+        compression: xz
+      vendor:
+        url: {{REFERENCE_BUILD_URL}}/vendor.img.xz
+        compression: xz
+{% endif %}
+{% endif %}
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    images:
+      ptable:
+        url: downloads://prm_ptable.img
+      boot:
+        url: downloads://boot.img
+      userdata:
+        url: downloads://userdata.img
+{% if HIKEY960_SUPPORT_SUPER is defined %}
+      super:
+        url: downloads://super.img
+{% else %}
+      system:
+        url: downloads://system.img
+      vendor:
+        url: downloads://vendor.img
+{% endif %}
+
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 20
+    definitions:
+    - from: inline
+      path: format-metatdata.yaml
+      name: format-metatdata
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: format-metatdata
+          description: format-metatdata
+        run:
+          steps:
+          - lava-test-case "fastboot-format-metadata" --shell fastboot format cache
+          - lava-test-case "fastboot-reboot-bootloader" --shell fastboot reboot bootloader
+
+- boot:
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    - 'console:/'
+    timeout:
+      minutes: 15
+    method: fastboot
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/devices/x15 b/lkft/lava-job-definitions/docker/devices/x15
new file mode 100644
index 0000000000..9005f16f25
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/devices/x15
@@ -0,0 +1,71 @@
+{% extends "template-lkft.yaml" %}
+
+{% block device_type %}x15{% endblock %}
+{% block device_tags %}
+tags:
+- hdmi-dongle
+{% endblock device_tags %}
+
+{% block deploy_target %}
+- deploy:
+    to: downloads
+    images:
+      boot_a:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      boot_b:
+        url: {{DOWNLOAD_URL}}/boot.img.xz
+        compression: xz
+      vbmeta_a:
+        url: {{DOWNLOAD_URL}}/vbmeta.img.xz
+        compression: xz
+      vbmeta_b:
+        url: {{DOWNLOAD_URL}}/vbmeta.img.xz
+        compression: xz
+      userdata:
+        url: {{DOWNLOAD_URL}}/userdata.img.xz
+        compression: xz
+      super:
+        url: {{DOWNLOAD_URL}}/super.img.xz
+        compression: xz
+      recovery:
+        url: {{DOWNLOAD_URL}}/recovery.img.xz
+        compression: xz
+
+- deploy:
+    timeout:
+      minutes: 25
+    to: fastboot
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    images:
+      boot_a:
+        url: downloads://boot.img
+      boot_b:
+        url: downloads://boot.img
+      vbmeta_a:
+        url: downloads://vbmeta.img
+      vbmeta_b:
+        url: downloads://vbmeta.img
+      userdata:
+        url: downloads://userdata.img
+      super:
+        url: downloads://super.img
+      recovery:
+        url: downloads://recovery.img
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    docker:
+        image: yongqinliu/linaro-android-docker:0.1
+    method: fastboot
+    prompts:
+    - 'root@(.*):/#'
+    - 'console:/'
+    timeout:
+      minutes: 15
+{% endblock boot_target %}
+
+{% block test_target %}
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-boot.yaml b/lkft/lava-job-definitions/docker/template-boot.yaml
new file mode 100644
index 0000000000..0c1144315a
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-boot.yaml
@@ -0,0 +1,27 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boot{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-test
+
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-boottime-new.yaml b/lkft/lava-job-definitions/docker/template-boottime-new.yaml
new file mode 100644
index 0000000000..7b6357a392
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-boottime-new.yaml
@@ -0,0 +1,221 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boottime{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: fresh-install
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-fresh-install
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-1
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 1
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-2
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 2
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-3
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 3
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-4
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 4
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-5
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 5
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-6
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 6
+
+- boot:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-7
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 7
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-reboot
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: 7
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-boottime.yaml b/lkft/lava-job-definitions/docker/template-boottime.yaml
new file mode 100644
index 0000000000..24122ca2fe
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-boottime.yaml
@@ -0,0 +1,206 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boottime{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: first-boot
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: "0"
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-first-analyze
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: "0"
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-1
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 1
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-2
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 2
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-3
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 3
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-4
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 4
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-5
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 5
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-6
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 6
+
+- boot:
+    namespace: target
+    prompts:
+    - root@(.*):/#
+    - console:/
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-7
+          params:
+            ANDROID_VERSION: master
+            OPERATION: COLLECT
+            COLLECT_NO: 7
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-second-analyze
+          params:
+            ANDROID_VERSION: master
+            OPERATION: ANALYZE
+            COLLECT_NO: 7
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-cts-lkft-v2-no-bionic-libcore.yaml b/lkft/lava-job-definitions/docker/template-cts-lkft-v2-no-bionic-libcore.yaml
new file mode 100644
index 0000000000..18ddfc7033
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-cts-lkft-v2-no-bionic-libcore.yaml
@@ -0,0 +1,57 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft-no-bionic-libcore{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsMonkeyTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-cts-lkft-v2.yaml b/lkft/lava-job-definitions/docker/template-cts-lkft-v2.yaml
new file mode 100644
index 0000000000..a9c996e93d
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-cts-lkft-v2.yaml
@@ -0,0 +1,59 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBionicTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsLibcoreTestCases
+            --include-filter CtsMonkeyTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-cts-lkft-x15.yaml b/lkft/lava-job-definitions/docker/template-cts-lkft-x15.yaml
new file mode 100644
index 0000000000..5d0f45142a
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-cts-lkft-x15.yaml
@@ -0,0 +1,58 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 360
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: cts
+            --include-filter CtsAslrMallocTestCases
+            --include-filter CtsBionicTestCases
+            --include-filter CtsBluetoothTestCases
+            --include-filter CtsCameraTestCases
+            --include-filter CtsDisplayTestCases
+            --include-filter CtsDramTestCases
+            --include-filter CtsDrmTestCases
+            --include-filter CtsGraphicsTestCases
+            --include-filter CtsHardwareTestCases
+            --include-filter CtsJankDeviceTestCases
+            --include-filter CtsJniTestCases
+            --include-filter CtsLibcoreLegacy22TestCases
+            --include-filter CtsLibcoreTestCases
+            --include-filter CtsOsTestCases
+            --include-filter CtsSystemUiTestCases
+            --include-filter CtsSystemUiRenderingTestCases
+            --include-filter CtsUsbTests
+            --include-filter CtsWebkitTestCases
+            --disable-reboot
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-cts-lkft.yaml b/lkft/lava-job-definitions/docker/template-cts-lkft.yaml
new file mode 100644
index 0000000000..7db9a85729
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-cts-lkft.yaml
@@ -0,0 +1,39 @@
+{% extends device_type %}
+
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts-lkft{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  cts-url: "{{TEST_CTS_URL}}/android-cts.zip"
+  cts-manifest: "{{TEST_CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{TEST_CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 480
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-lkft --disable-reboot"
+        TEST_URL: "{{TEST_CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "aggregated"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-lkft.yaml b/lkft/lava-job-definitions/docker/template-lkft.yaml
new file mode 100644
index 0000000000..c434cfcad6
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-lkft.yaml
@@ -0,0 +1,86 @@
+{% block global_settings %}
+{% endblock global_settings %}
+
+device_type: {% block device_type %}{% endblock device_type %}
+{% block device_tags %}{% endblock device_tags %}
+job_name: {% block job_name %}{% endblock job_name %}
+
+{% block priority %}
+priority: {{TEST_LAVA_JOB_PRIORITY}}
+{% endblock priority%}
+
+{% block visibility %}
+visibility:
+  group:
+    - {{TEST_LAVA_JOB_GROUP}}
+{% endblock visibility %}
+
+{% block job_gobal_timeout %}
+{% endblock job_gobal_timeout %}
+
+metadata:
+  android.build: "{{BUILD_NUMBER}}"
+  android.name: "{{JOB_NAME}}"
+  android.url: "{{REFERENCE_BUILD_URL}}"
+  android.version: "{{ANDROID_VERSION}}"
+{% if ANDROID_VENDOR_FINGERPRINT is defined %}
+  android.build.vendor.fingerprint: "{{ANDROID_VENDOR_FINGERPRINT}}"
+{% endif %}
+{% if ANDROID_GSI_FINGERPRINT is defined %}
+  android.build.gsi.url: "{{ANDROID_GSI_URL}}"
+  android.build.gsi.fingerprint: "{{ANDROID_GSI_FINGERPRINT}}"
+{% endif %}
+{% if TUXSUITE_DOWNLOAD_URL is defined %}
+  tuxsuite.download.url: "{{TUXSUITE_DOWNLOAD_URL}}"
+{% endif %}
+  lkft.build.config: "{{LKFT_BUILD_CONFIG}}"
+  git branch: "{{KERNEL_BRANCH}}"
+  git repo: "{{KERNEL_REPO}}"
+  git commit: "{{KERNEL_COMMIT}}"
+  git describe: "{{KERNEL_DESCRIBE}}"
+  build-url: "{{BUILD_URL}}"
+  toolchain: "{{TEST_METADATA_TOOLCHAIN}}"
+  series: lkft
+{% block job_specific_metadata %}
+{% endblock job_specific_metadata %}
+
+{% block secrets %}
+secrets:
+  ARTIFACTORIAL_TOKEN: "{{ARTIFACTORIAL_TOKEN}}"
+{% endblock %}
+
+actions:
+{% block actions %}
+
+{% block deploy_target %}
+{% endblock deploy_target %}
+
+{% block boot_target %}
+{% endblock boot_target %}
+
+- test:
+    docker:
+      image: yongqinliu/linaro-android-docker:0.1
+    timeout:
+      minutes: 20
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-sleep-30secs" --shell sleep 30
+            - lava-test-case "android-boot-lsusb-v" --shell lsusb -v
+            - lava-test-case "android-boot-boot-completed" --shell "while ! adb shell getprop sys.boot_completed|grep 1; do sleep 2; done"
+            - lava-test-case "android-boot-set-power-stayon" --shell adb shell su 0 svc power stayon true
+            - lava-test-case "android-boot-screencap" --shell adb shell screencap -p /data/local/tmp/screencap.png
+
+{% block test_target %}
+{% endblock test_target %}
+
+{% endblock actions %}
diff --git a/lkft/lava-job-definitions/docker/template-vts-kernel-arm64-v8a.yaml b/lkft/lava-job-definitions/docker/template-vts-kernel-arm64-v8a.yaml
new file mode 100644
index 0000000000..a759a08be4
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-vts-kernel-arm64-v8a.yaml
@@ -0,0 +1,39 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-arm64-v8a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel --abi arm64-v8a"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-vts-kernel-armeabi-v7a.yaml b/lkft/lava-job-definitions/docker/template-vts-kernel-armeabi-v7a.yaml
new file mode 100644
index 0000000000..7bcbbc9c64
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-vts-kernel-armeabi-v7a.yaml
@@ -0,0 +1,39 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel-armeabi-v7a{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel --abi armeabi-v7a"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-vts-kernel.yaml b/lkft/lava-job-definitions/docker/template-vts-kernel.yaml
new file mode 100644
index 0000000000..69bffb9d41
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-vts-kernel.yaml
@@ -0,0 +1,39 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 500
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      docker:
+        image: yongqinliu/linaro-android-docker:0.1
+      timeout:
+        minutes: 480
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/docker/template-vts.yaml b/lkft/lava-job-definitions/docker/template-vts.yaml
new file mode 100644
index 0000000000..2db48797b5
--- /dev/null
+++ b/lkft/lava-job-definitions/docker/template-vts.yaml
@@ -0,0 +1,38 @@
+{% extends device_type %}
+{% block job_name %}lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts{% endblock job_name %}
+
+{% block job_gobal_timeout %}
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+{% endblock job_gobal_timeout %}
+
+{% block job_specific_metadata %}
+  vts-url: "{{TEST_VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{TEST_VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{TEST_VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+{% endblock job_specific_metadata %}
+
+{% block test_target %}
+- test:
+      namespace: tlxc
+      timeout:
+        minutes: 360
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{TEST_VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts --exclude-filter FastbootVerifyUserspaceTest --exclude-filter VtsHalAudioV4_0TargetTest"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "aggregated"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
+{% endblock test_target %}
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml
index fa5d2be8ea..876c3fdf30 100644
--- a/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml
+++ b/lkft/lava-job-definitions/hi6220-hikey/template-boot.yaml
@@ -1,5 +1,5 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-boot"
+device_type: hi6220-hikey-r2
+job_name: "lkft-android-${KERNEL_BRANCH}-${ANDROID_VERSION}-${BUILD_NUMBER}-boot"
 
 timeouts:
   job:
@@ -9,24 +9,29 @@ timeouts:
   connection:
     minutes: 2
 priority: medium
-visibility: personal
+visibility:
+  group:
+    - lkft
 
 metadata:
   android.build: "${BUILD_NUMBER}"
   android.name: "${JOB_NAME}"
-  android.url: "${BUILD_URL}"
+  android.url: "${REFERENCE_BUILD_URL}"
+  android.version: "${ANDROID_VERSION}"
   git branch: "${KERNEL_BRANCH}"
   git repo: "${KERNEL_REPO}"
   git commit: "${KERNEL_COMMIT}"
   git describe: "${KERNEL_DESCRIBE}"
   build-url: "${BUILD_URL}"
+  toolchain: "${TOOLCHAIN}"
   series: lkft
 
 protocols:
   lava-lxc:
     name: lxc-hikey-test
+    template: download
     distribution: ubuntu
-    release: xenial
+    release: bionic
     arch: amd64
     verbose: true
 
@@ -55,21 +60,12 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
 
 - deploy:
     timeout:
@@ -78,20 +74,28 @@ actions:
     namespace: droid
     images:
       ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
         reboot: hard-reset
       boot:
         url: "${DOWNLOAD_URL}/boot.img.xz"
+        sha256sum: "${BOOT_IMG_SHA256SUM}"
         compression: xz
         reboot: hard-reset
+      vendor:
+        url: "${REFERENCE_BUILD_URL}/vendor.img.xz"
+        sha256sum: "${VENDOR_IMG_SHA256SUM}"
+        compression: xz
       cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
+        url: "http://testdata.linaro.org/lkft/aosp/aosp-master-08102018/cache.img.xz"
         compression: xz
+        sha256sum: "fe864f2f132dab71673f843a6ad6287121b0fa2f64cd839fa8467ad958ee6c3f"
       userdata:
         url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
+        sha256sum: "${USERDATA_IMG_SHA256SUM}"
         compression: xz
       system:
         url: "${REFERENCE_BUILD_URL}/system.img.xz"
+        sha256sum: "${SYSTEM_IMG_SHA256SUM}"
         compression: xz
     os: debian
     protocols:
@@ -111,6 +115,26 @@ actions:
     method: fastboot
 
 - test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 100
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device
+            - lava-test-case "android-boot-sleep-2mins" --shell adb shell sleep 120
+            - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed
+
+- test:
       namespace: tlxc
       connection: lxc
       timeout:
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-cts-arm64-v8a.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-cts-arm64-v8a.yaml
deleted file mode 100644
index 916b7cee4c..0000000000
--- a/lkft/lava-job-definitions/hi6220-hikey/template-cts-arm64-v8a.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-cts-arm64-v8a"
-timeouts:
-  job:
-    minutes: 360
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility:
-  group:
-    - lkft
-
-secrets:
-  ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-  AP_SSID: "${AP_SSID}"
-  AP_KEY: "${AP_KEY}"
-
-metadata:
-  android.url: "${REFERENCE_BUILD_URL}"
-  android.version: "${ANDROID_VERSION}"
-  build-location: "${DOWNLOAD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  cts-manifest: "${CTS_URL}/pinned-manifest.xml"
-  cts-version: "${CTS_VERSION}"
-  cts-plan: "cts-lkft"
-  series: lkft
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 5
-    to: lxc
-    packages:
-    - systemd
-    - systemd-sysv
-    - ca-certificates
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 30
-    to: fastboot
-    namespace: droid
-    connection: lxc
-    images:
-      ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
-        reboot: hard-reset
-      boot:
-        url: "${DOWNLOAD_URL}/boot.img.xz"
-        compression: xz
-        reboot: hard-reset
-      cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
-        compression: xz
-      userdata:
-        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
-        compression: xz
-      system:
-        url: "${REFERENCE_BUILD_URL}/system.img.xz"
-        compression: xz
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    connection: serial
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 15
-    method: fastboot
-
-- test:
-    namespace: tlxc
-    connection: lxc
-    timeout:
-      minutes: 300
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/android/tradefed/tradefed.yaml
-      params:
-        TEST_PARAMS: "run cts-lkft -a arm64-v8a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "${CTS_URL}/android-cts.zip"
-        TEST_PATH: "android-cts"
-        RESULTS_FORMAT: "atomic"
-        ANDROID_VERSION: "${ANDROID_VERSION}"
-      name: "cts-lkft-arm64-v8a"
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-cts-armeabi-v7a.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-cts-armeabi-v7a.yaml
deleted file mode 100644
index 38170c2420..0000000000
--- a/lkft/lava-job-definitions/hi6220-hikey/template-cts-armeabi-v7a.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-cts-armeabi-v7a"
-timeouts:
-  job:
-    minutes: 360
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility:
-  group:
-    - lkft
-
-secrets:
-  ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-  AP_SSID: "${AP_SSID}"
-  AP_KEY: "${AP_KEY}"
-
-metadata:
-  android.url: "${REFERENCE_BUILD_URL}"
-  android.version: "${ANDROID_VERSION}"
-  build-location: "${DOWNLOAD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  cts-manifest: "${CTS_URL}/pinned-manifest.xml"
-  cts-version: "${CTS_VERSION}"
-  cts-plan: "cts-lkft"
-  series: lkft
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 5
-    to: lxc
-    packages:
-    - systemd
-    - systemd-sysv
-    - ca-certificates
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 30
-    to: fastboot
-    namespace: droid
-    connection: lxc
-    images:
-      ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
-        reboot: hard-reset
-      boot:
-        url: "${DOWNLOAD_URL}/boot.img.xz"
-        compression: xz
-        reboot: hard-reset
-      cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
-        compression: xz
-      userdata:
-        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
-        compression: xz
-      system:
-        url: "${REFERENCE_BUILD_URL}/system.img.xz"
-        compression: xz
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    connection: serial
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 15
-    method: fastboot
-
-- test:
-    namespace: tlxc
-    connection: lxc
-    timeout:
-      minutes: 300
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/android/tradefed/tradefed.yaml
-      params:
-        TEST_PARAMS: "run cts-lkft -a armeabi-v7a --disable-reboot --skip-preconditions --skip-device-info"
-        TEST_URL: "${CTS_URL}/android-cts.zip"
-        TEST_PATH: "android-cts"
-        RESULTS_FORMAT: "atomic"
-        ANDROID_VERSION: "${ANDROID_VERSION}"
-      name: "cts-lkft-armeabi-v7a"
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml
new file mode 100644
index 0000000000..06faa6c1fa
--- /dev/null
+++ b/lkft/lava-job-definitions/hi6220-hikey/template-cts.yaml
@@ -0,0 +1,164 @@
+device_type: hi6220-hikey-r2
+job_name: "lkft-android-${KERNEL_BRANCH}-${ANDROID_VERSION}-${BUILD_NUMBER}-cts"
+timeouts:
+  job:
+    minutes: 360
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+secrets:
+  ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
+  AP_SSID: "${AP_SSID}"
+  AP_KEY: "${AP_KEY}"
+
+metadata:
+  android.url: "${REFERENCE_BUILD_URL}"
+  android.version: "${ANDROID_VERSION}"
+  build-location: "${DOWNLOAD_URL}"
+  git branch: "${KERNEL_BRANCH}"
+  git repo: "${KERNEL_REPO}"
+  git commit: "${KERNEL_COMMIT}"
+  git describe: "${KERNEL_DESCRIBE}"
+  build-url: "${BUILD_URL}"
+  cts-url: "${CTS_URL}/android-cts.zip"
+  cts-manifest: "${CTS_URL}/pinned-manifest.xml"
+  cts-version: "${CTS_VERSION}"
+  cts-plan: "cts-lkft"
+  toolchain: "${TOOLCHAIN}"
+  series: lkft
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 5
+    to: lxc
+    packages:
+    - systemd
+    - systemd-sysv
+    - ca-certificates
+    - wget
+    - unzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 30
+    to: fastboot
+    namespace: droid
+    connection: lxc
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: "${DOWNLOAD_URL}/boot.img.xz"
+        sha256sum: "${BOOT_IMG_SHA256SUM}"
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: "${REFERENCE_BUILD_URL}/vendor.img.xz"
+        sha256sum: "${VENDOR_IMG_SHA256SUM}"
+        compression: xz
+      cache:
+        url: "http://testdata.linaro.org/lkft/aosp/aosp-master-08102018/cache.img.xz"
+        compression: xz
+        sha256sum: "fe864f2f132dab71673f843a6ad6287121b0fa2f64cd839fa8467ad958ee6c3f"
+      userdata:
+        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
+        sha256sum: "${USERDATA_IMG_SHA256SUM}"
+        compression: xz
+      system:
+        url: "${REFERENCE_BUILD_URL}/system.img.xz"
+        sha256sum: "${SYSTEM_IMG_SHA256SUM}"
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: droid
+    connection: serial
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device
+            - lava-test-case "android-boot-sleep-2mins" --shell adb shell sleep 120
+            - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 300
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-lkft --disable-reboot"
+        TEST_URL: "${CTS_URL}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "atomic"
+        ANDROID_VERSION: "${ANDROID_VERSION}"
+      name: "cts-lkft"
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part1.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part1.yaml
deleted file mode 100644
index 3b724a517d..0000000000
--- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part1.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-syscalls"
-
-timeouts:
-  job:
-    minutes: 350
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility:
-  group:
-    - lkft
-
-metadata:
-  android.url: "${REFERENCE_BUILD_URL}"
-  android.version: "${ANDROID_VERSION}"
-  build-location: "${DOWNLOAD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  vts-manifest: "${VTS_URL}/pinned-manifest.xml"
-  vts-version: "${VTS_VERSION}"
-  vts-plan: "vts-kernel"
-  series: lkft
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-secrets:
-   ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 15
-    to: fastboot
-    namespace: droid
-    images:
-      ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
-        reboot: hard-reset
-      boot:
-        url: "${DOWNLOAD_URL}/boot.img.xz"
-        compression: xz
-        reboot: hard-reset
-      cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
-        compression: xz
-      userdata:
-        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
-        compression: xz
-      system:
-        url: "${REFERENCE_BUILD_URL}/system.img.xz"
-        compression: xz
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 15
-    method: fastboot
-
-- test:
-      namespace: tlxc
-      connection: lxc
-      timeout:
-        minutes: 300
-      definitions:
-        - repository: https://git.linaro.org/qa/test-definitions.git
-          from: git
-          path: automated/android/tradefed/tradefed.yaml
-          params:
-                TEST_URL: "${VTS_URL}/android-vts.zip"
-                TEST_PARAMS: "run vts-kernel --exclude-filter VtsKernelLtp --exclude-filter VtsKernelLinuxKselftest --skip-device-info"
-                TEST_PATH: "android-vts"
-                RESULTS_FORMAT: "atomic"
-                ANDROID_VERSION: "${ANDROID_VERSION}"
-          name: vts-test
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part2.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part2.yaml
deleted file mode 100644
index 46c2f9d892..0000000000
--- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part2.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-ltp-arm64-v8a"
-
-timeouts:
-  job:
-    minutes: 540
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility:
-  group:
-    - lkft
-
-metadata:
-  android.url: "${REFERENCE_BUILD_URL}"
-  android.version: "${ANDROID_VERSION}"
-  build-location: "${DOWNLOAD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  vts-manifest: "${VTS_URL}/pinned-manifest.xml"
-  vts-plan: "vts-kernel"
-  vts-version: "${VTS_VERSION}"
-  series: lkft
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-secrets:
-   ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 15
-    to: fastboot
-    namespace: droid
-    images:
-      ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
-        reboot: hard-reset
-      boot:
-        url: "${DOWNLOAD_URL}/boot.img.xz"
-        compression: xz
-        reboot: hard-reset
-      cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
-        compression: xz
-      userdata:
-        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
-        compression: xz
-      system:
-        url: "${REFERENCE_BUILD_URL}/system.img.xz"
-        compression: xz
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 15
-    method: fastboot
-
-- test:
-      namespace: tlxc
-      connection: lxc
-      timeout:
-        minutes: 480
-      definitions:
-        - repository: https://git.linaro.org/qa/test-definitions.git
-          from: git
-          path: automated/android/tradefed/tradefed.yaml
-          params:
-                TEST_URL: "${VTS_URL}/android-vts.zip"
-                TEST_PARAMS: "run vts-kernel --module VtsKernelLtp -a arm64-v8a --skip-device-info"
-                TEST_PATH: "android-vts"
-                RESULTS_FORMAT: "atomic"
-                ANDROID_VERSION: "${ANDROID_VERSION}"
-          name: vts-test
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part3.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part3.yaml
deleted file mode 100644
index 345cc4ce8e..0000000000
--- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part3.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-kselftest"
-
-timeouts:
-  job:
-    minutes: 350
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility:
-  group:
-    - lkft
-
-metadata:
-  android.url: "${REFERENCE_BUILD_URL}"
-  android.version: "${ANDROID_VERSION}"
-  build-location: "${DOWNLOAD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  vts-manifest: "${VTS_URL}/pinned-manifest.xml"
-  vts-plan: "vts-kernel"
-  vts-version: "${VTS_VERSION}"
-  series: lkft
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-secrets:
-   ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 15
-    to: fastboot
-    namespace: droid
-    images:
-      ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
-        reboot: hard-reset
-      boot:
-        url: "${DOWNLOAD_URL}/boot.img.xz"
-        compression: xz
-        reboot: hard-reset
-      cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
-        compression: xz
-      userdata:
-        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
-        compression: xz
-      system:
-        url: "${REFERENCE_BUILD_URL}/system.img.xz"
-        compression: xz
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 15
-    method: fastboot
-
-- test:
-      namespace: tlxc
-      connection: lxc
-      timeout:
-        minutes: 300
-      definitions:
-        - repository: https://git.linaro.org/qa/test-definitions.git
-          from: git
-          path: automated/android/tradefed/tradefed.yaml
-          params:
-                TEST_URL: "${VTS_URL}/android-vts.zip"
-                TEST_PARAMS: "run vts-kernel --module VtsKernelLinuxKselftest --skip-device-info"
-                TEST_PATH: "android-vts"
-                RESULTS_FORMAT: "atomic"
-                ANDROID_VERSION: "${ANDROID_VERSION}"
-          name: vts-test
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part4.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part4.yaml
deleted file mode 100644
index 4f5e251972..0000000000
--- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel-part4.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-kernel-ltp-armeabi-v7a"
-
-timeouts:
-  job:
-    minutes: 540
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility:
-  group:
-    - lkft
-
-metadata:
-  android.url: "${REFERENCE_BUILD_URL}"
-  android.version: "${ANDROID_VERSION}"
-  build-location: "${DOWNLOAD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  vts-manifest: "${VTS_URL}/pinned-manifest.xml"
-  vts-plan: "vts-kernel"
-  vts-version: "${VTS_VERSION}"
-  series: lkft
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-secrets:
-   ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 15
-    to: fastboot
-    namespace: droid
-    images:
-      ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
-        reboot: hard-reset
-      boot:
-        url: "${DOWNLOAD_URL}/boot.img.xz"
-        compression: xz
-        reboot: hard-reset
-      cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
-        compression: xz
-      userdata:
-        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
-        compression: xz
-      system:
-        url: "${REFERENCE_BUILD_URL}/system.img.xz"
-        compression: xz
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    prompts:
-    - 'root@(.*):/#'
-    - ':/'
-    timeout:
-      minutes: 15
-    method: fastboot
-
-- test:
-      namespace: tlxc
-      connection: lxc
-      timeout:
-        minutes: 480
-      definitions:
-        - repository: https://git.linaro.org/qa/test-definitions.git
-          from: git
-          path: automated/android/tradefed/tradefed.yaml
-          params:
-                TEST_URL: "${VTS_URL}/android-vts.zip"
-                TEST_PARAMS: "run vts-kernel --module VtsKernelLtp -a armeabi-v7a --skip-device-info"
-                TEST_PATH: "android-vts"
-                RESULTS_FORMAT: "atomic"
-                ANDROID_VERSION: "${ANDROID_VERSION}"
-          name: vts-test
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml
new file mode 100644
index 0000000000..24e93fa30c
--- /dev/null
+++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-kernel.yaml
@@ -0,0 +1,139 @@
+device_type: hi6220-hikey-r2
+job_name: "lkft-android-${KERNEL_BRANCH}-${ANDROID_VERSION}-${BUILD_NUMBER}-vts-kernel"
+
+timeouts:
+  job:
+    minutes: 350
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+metadata:
+  android.url: "${REFERENCE_BUILD_URL}"
+  android.version: "${ANDROID_VERSION}"
+  build-location: "${DOWNLOAD_URL}"
+  git branch: "${KERNEL_BRANCH}"
+  git repo: "${KERNEL_REPO}"
+  git commit: "${KERNEL_COMMIT}"
+  git describe: "${KERNEL_DESCRIBE}"
+  build-url: "${BUILD_URL}"
+  vts-url: "${VTS_URL}/android-vts.zip"
+  vts-manifest: "${VTS_URL}/pinned-manifest.xml"
+  vts-version: "${VTS_VERSION}"
+  vts-plan: "vts-kernel"
+  toolchain: "${TOOLCHAIN}"
+  series: lkft
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+
+secrets:
+   ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: droid
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
+        reboot: hard-reset
+      boot:
+        url: "${DOWNLOAD_URL}/boot.img.xz"
+        sha256sum: "${BOOT_IMG_SHA256SUM}"
+        compression: xz
+        reboot: hard-reset
+      vendor:
+        url: "${REFERENCE_BUILD_URL}/vendor.img.xz"
+        sha256sum: "${VENDOR_IMG_SHA256SUM}"
+        compression: xz
+      cache:
+        url: "http://testdata.linaro.org/lkft/aosp/aosp-master-08102018/cache.img.xz"
+        compression: xz
+        sha256sum: "fe864f2f132dab71673f843a6ad6287121b0fa2f64cd839fa8467ad958ee6c3f"
+      userdata:
+        url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
+        sha256sum: "${USERDATA_IMG_SHA256SUM}"
+        compression: xz
+      system:
+        url: "${REFERENCE_BUILD_URL}/system.img.xz"
+        sha256sum: "${SYSTEM_IMG_SHA256SUM}"
+        compression: xz
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: droid
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+    method: fastboot
+
+- test:
+      namespace: tlxc
+      connection: lxc
+      timeout:
+        minutes: 300
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "${VTS_URL}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "atomic"
+                ANDROID_VERSION: "${ANDROID_VERSION}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
diff --git a/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml b/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml
index 1735f7e19b..83e9827638 100644
--- a/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml
+++ b/lkft/lava-job-definitions/hi6220-hikey/template-vts-staging-kernel.yaml
@@ -1,5 +1,5 @@
-device_type: hi6220-hikey
-job_name: "lkft-android-${KERNEL_BRANCH}-${BUILD_NUMBER}-vts-staging-kernel"
+device_type: hi6220-hikey-r2
+job_name: "lkft-android-${KERNEL_BRANCH}-${ANDROID_VERSION}-${BUILD_NUMBER}-vts-staging-kernel"
 
 timeouts:
   job:
@@ -25,13 +25,15 @@ metadata:
   vts-manifest: "${VTS_URL}/pinned-manifest.xml"
   vts-plan: "vts-staging-kernel"
   vts-version: "${VTS_VERSION}"
+  toolchain: "${TOOLCHAIN}"
   series: lkft
 
 protocols:
   lava-lxc:
     name: lxc-hikey-test
+    template: download
     distribution: ubuntu
-    release: xenial
+    release: bionic
     arch: amd64
     verbose: true
 
@@ -63,21 +65,12 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
 
 - deploy:
     timeout:
@@ -86,20 +79,28 @@ actions:
     namespace: droid
     images:
       ptable:
-        url: http://releases.linaro.org/96boards/archive/reference-platform/aosp/hikey/16.03/bootloader/ptable-aosp-8g.img
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-aosp-8g.img
         reboot: hard-reset
       boot:
         url: "${DOWNLOAD_URL}/boot.img.xz"
+        sha256sum: "${BOOT_IMG_SHA256SUM}"
         compression: xz
         reboot: hard-reset
+      vendor:
+        url: "${REFERENCE_BUILD_URL}/vendor.img.xz"
+        sha256sum: "${VENDOR_IMG_SHA256SUM}"
+        compression: xz
       cache:
-        url: "${REFERENCE_BUILD_URL}/cache.img.xz"
+        url: "http://testdata.linaro.org/lkft/aosp/aosp-master-08102018/cache.img.xz"
         compression: xz
+        sha256sum: "fe864f2f132dab71673f843a6ad6287121b0fa2f64cd839fa8467ad958ee6c3f"
       userdata:
         url: "${REFERENCE_BUILD_URL}/userdata.img.xz"
+        sha256sum: "${USERDATA_IMG_SHA256SUM}"
         compression: xz
       system:
         url: "${REFERENCE_BUILD_URL}/system.img.xz"
+        sha256sum: "${SYSTEM_IMG_SHA256SUM}"
         compression: xz
     os: debian
     protocols:
@@ -119,6 +120,26 @@ actions:
     method: fastboot
 
 - test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 300
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device
+            - lava-test-case "android-boot-sleep-2mins" --shell adb shell sleep 120
+            - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed
+
+- test:
       namespace: tlxc
       connection: lxc
       timeout:
@@ -126,10 +147,10 @@ actions:
       definitions:
         - repository: https://git.linaro.org/qa/test-definitions.git
           from: git
-          path: automated/android/tradefed/tradefed.yaml
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
           params:
                 TEST_URL: "${VTS_URL}/android-vts.zip"
-                TEST_PARAMS: "run vts-staging-kernel --skip-device-info"
+                TEST_PARAMS: "vts-staging-kernel"
                 TEST_PATH: "android-vts"
                 RESULTS_FORMAT: "atomic"
                 ANDROID_VERSION: "${ANDROID_VERSION}"
diff --git a/lkft/lava-job-definitions/submit_for_testing-v2.sh b/lkft/lava-job-definitions/submit_for_testing-v2.sh
new file mode 100755
index 0000000000..615f1f8db6
--- /dev/null
+++ b/lkft/lava-job-definitions/submit_for_testing-v2.sh
@@ -0,0 +1,544 @@
+#!/bin/bash -ex
+
+echo "For Test purpose check 1: LKFT_WORK_DIR=${LKFT_WORK_DIR}"
+export LKFT_WORK_DIR=${LKFT_WORK_DIR:-"/home/buildslave/srv/${BUILD_DIR}/workspace"}
+echo "For Test purpose check 2: LKFT_WORK_DIR=${LKFT_WORK_DIR}"
+cd ${LKFT_WORK_DIR}
+
+F_ABS_PATH=$(readlink -e $0)
+OPT_DRY_RUN=""
+if [ -n "${ENV_DRY_RUN}" ]; then
+    OPT_DRY_RUN="--dry-run"
+fi
+
+function exit_with_msg(){
+    echo "$@"
+    exit
+}
+
+function check_environments(){
+    # environments must be defined in build config
+    # following environments no need to be exported as they only used for here.
+    [ -z "${TEST_DEVICE_TYPE}" ] && exit_with_msg "TEST_DEVICE_TYPE is required to be defined."
+    [ -z "${TEST_LAVA_SERVER}" ] && exit_with_msg "TEST_LAVA_SERVER is required to be defined."
+    [ -z "${TEST_QA_SERVER}" ] && exit_with_msg "TEST_QA_SERVER is required to be defined."
+    [ -z "${TEST_QA_SERVER_PROJECT}" ] && exit_with_msg "TEST_QA_SERVER_PROJECT is required to be defined."
+
+    # following environments must be exported as they will be used in the job templates.
+    [ -z "${ANDROID_VERSION}" ] && exit_with_msg "ANDROID_VERSION is required to be defined."
+    [ -z "${KERNEL_BRANCH}" ] && exit_with_msg "KERNEL_BRANCH is required to be defined."
+    [ -z "${KERNEL_REPO}" ] && exit_with_msg "KERNEL_REPO is required to be defined."
+    [ -z "${TEST_METADATA_TOOLCHAIN}" ] && exit_with_msg "TEST_METADATA_TOOLCHAIN is required to be defined."
+    [ -z "${TEST_VTS_URL}" ] && exit_with_msg "TEST_VTS_URL is required to be defined."
+    [ -z "${TEST_CTS_URL}" ] && exit_with_msg "TEST_CTS_URL is required to be defined."
+    [ -z "${REFERENCE_BUILD_URL}" ] && exit_with_msg "REFERENCE_BUILD_URL is required to be defined."
+
+    [ -z "${PUBLISH_FILES}" ] && exit_with_msg "PUBLISH_FILES is required to be defined."
+
+    return 0
+}
+
+function get_value_from_config_file(){
+    local key=$1 && shift
+    local f_config=$1 && shift
+
+    local key_line=$(grep "^${key}=" "${LKFT_WORK_DIR}/android-build-configs/lkft/${f_config}"|tail -n1|tr -d '"')
+    if [ -z "${key_line}" ]; then
+        return
+    fi
+    local value=$(echo "${key_line}"|cut -d= -f2-)
+    if [ -z "${value}" ]; then
+        return
+    else
+        echo "${value}"
+    fi
+}
+
+function submit_build_result(){
+    local qareport_url="${1}"
+    if ! grep "#${qareport_url}#" ${f_qareport_urls}; then
+        curl --header "Auth-Token: ${QA_REPORTS_TOKEN}" --form tests='{"build_process/build": "pass"}' ${qareport_url}
+        echo "#${qareport_url}#" >> ${f_qareport_urls}
+    fi
+}
+
+function update_device_template(){
+    local f_device_template="${1}" && shift
+    local f_img_name="${1}" && shift
+    local build_config="${1}" && shift
+    local referece_build_url="${1}" && shift
+
+    if [ "X${f_img_name}X" = "Xprm_ptable.imgX" ]; then
+        ## special case for hikey960 prm_ptable.img,
+        ## as for the aosp master, we need to use new prm_ptable to support the super image
+        local default_hikey960_prm_table_url="https://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/85/hikey960/release/prm_ptable.img"
+        sed -i "s|${default_hikey960_prm_table_url}|{{DOWNLOAD_URL}}/${f_img_name}|" "${f_device_template}"
+    fi
+
+    if [ "X${f_img_name}X" = "Xgpt_both0.binX" ]; then
+        ## special case for db845c gpt_both0.bin
+        ## as for the aosp master, we need to use the proper gpt_both0.bin for the correct partitions
+        local default_db845c_aosp_gpu_url="https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/69/dragonboard-845c-bootloader-ufs-aosp-69/gpt_both0.bin"
+        sed -i "s|${default_db845c_aosp_gpu_url}|{{DOWNLOAD_URL}}/${f_img_name}|" "${f_device_template}"
+    fi
+
+    if [ -n "${TUXSUITE_DOWNLOAD_URL}" ]; then
+        # for case that TUXSUITE_DOWNLOAD_URL specified,
+        # the images will be genereated on the lava side,
+        # so no need to update the REFERENCE_BUILD_URL or DOWNLOAD_URL any more
+
+        # and for the hikey8.1 case, vendor.img will be generated with the cache.img by the linaro-lkft.sh
+
+        return
+
+    fi
+    # DOWNLOAD_URL is where the generated files stored
+    # replace REFERENCE_BUILD_URL with DOWNLOAD_URL
+    sed -i "s|{{REFERENCE_BUILD_URL}}/${f_img_name}|{{DOWNLOAD_URL}}/${f_img_name}|" "${f_device_template}"
+    # replace file name in job template with new file name generated
+    sed -i "s|{{DOWNLOAD_URL}}/${f_img_name}|{{DOWNLOAD_URL}}/${build_config}-${f_img_name}|" "${f_device_template}"
+    # replace the file name in the deploy action that use "downloads://" url
+    local f_no_xz=$(echo ${f_img_name}|sed "s|.xz$||")
+    sed -i "s|downloads://${f_no_xz}|downloads://${build_config}-${f_no_xz}|" "${f_device_template}"
+
+    # special case for android 8.1 version, which does not support vendor partition yet
+    if ! echo "${f_img_name}" | grep vendor; then
+        # only need to check for the case that when no vendor.img generated
+        # and not vendor.img with the REFERENCE_BUILD
+        if curl --output /dev/null --silent --head --fail "${referece_build_url}/vendor.img.xz"; then
+            echo "This reference build comes with a vendor partition"
+        else
+            echo "No vendor partition for the reference build, so flashing cache partition from the job instead"
+            sed -i "s|vendor.img.xz|cache.img.xz|g" "${f_device_template}"
+        fi
+    fi
+}
+
+function download_fingerprint(){
+    local fingerprint_url="${1}"
+    local fingerprint_name="${2}"
+
+    if [ -n "${TESTDATA_SITE_PROTECTED}" ] && [ "${TESTDATA_SITE_PROTECTED}" = "True" ] \
+            && echo ${fingerprint_url} | grep -q "http://testdata.linaro.org/lkft/aosp-stable/android/lkft/protected"; then
+        ## testdata fingerprint url: http://testdata.linaro.org/lkft/aosp-stable/android/lkft/protected/aosp/android-cts/175/build_fingerprint.txt
+        ## aws url: s3://validation-linaro-org/testdata/lkft/aosp-stable/android/lkft/protected/aosp/android-cts/175/build_fingerprint.txt
+        # shellcheck disable=SC2001
+        aws_download_url=$(echo "${fingerprint_url}" | sed "s|http://testdata.linaro.org/lkft/aosp-stable/android/lkft/protected/|s3://validation-linaro-org/testdata/lkft/aosp-stable/android/lkft/protected/|")
+        aws s3 cp "${aws_download_url}" "${fingerprint_name}" || true
+    else
+        wget "${fingerprint_url}" -O "${fingerprint_name}" || true
+    fi
+    if [ ! -e "${fingerprint_name}" ] || [ $(wc -l "${fingerprint_name}" |awk '{print $1}')  -ne 1 ]; then
+        rm -f "${fingerprint_name}"
+        touch "${fingerprint_name}"
+    fi
+}
+
+function create_or_update_project(){
+    # to avoid the leaking fo the REGISTER_CALLBACK_TOKEN
+    set +x
+    if [ -z "${QA_REPORTS_TOKEN}" ]; then
+        set -x
+        return
+    fi
+    path_squad_client=""
+    if which squad-client; then
+        path_squad_client=$(which squad-client)
+    elif [ -f "${HOME}/.local/bin/squad-client" ]; then
+        path_squad_client="${HOME}/.local/bin/squad-client"
+    else
+        echo "squad-client not found"
+        set -x
+        return
+    fi
+
+    local qa_server="${1}"
+    local qa_team_group="${2}"
+    local qa_project_private="${3}"
+    local qa_project_slug="${4}"
+    local qa_project_name="${5}"
+
+    if [ -z "${qa_project_name}" ]; then
+        qa_project_name="${qa_project_slug}"
+    fi
+
+    qa_project_plugins="tradefed"
+
+    qa_project_public_settings='PLUGINS_TRADEFED_EXTRACT_AGGREGATED: True
+CI_RESET_BUILD_EVENTS_ON_JOB_RESUBMISSION: True
+CI_LAVA_INFRA_ERROR_MESSAGES:
+- "adb device [a-zA-Z0-9]+ lost!"
+- "auto-login-action timed out after [0-9]+ seconds"
+- "bootloader-interrupt timed out after [0-9]+ seconds"
+- "Connection closed"
+- "Device NOT found!"
+- "Download finished ([0-9]+ bytes) but was not expected size ([0-9]+ bytes), check your networking."
+- "fastboot-flash-action timed out"
+- "fastboot-boot-commands timed out after [0-9]+ seconds"
+- "Failed to install android platform tools!"
+- "git-repo-action timed out after [0-9]+ seconds"
+- "Infrastructure error: Unable to run"
+- "lava_test_shell connection dropped."
+- "lava-test-shell timed out after [0-9]+ seconds"
+- "lava-docker-test-shell timed out after [0-9]+ seconds"
+- "login-action timed out after [0-9]+ seconds"
+- "lxc-apt-install timed out after [0-9]+ seconds"
+- "tradefed - adb device lost"
+- "tradefed - failed to collect results and log files"
+- "uboot-enter-fastboot timed out after [0-9]+ seconds"
+- "Unable to apt-get update in lxc container"
+- "Unable to create lxc container"
+- "Unable to fetch git repository"
+- "Unable to install using apt-get in lxc container"
+- "/usr/local/lab-scripts/cbrxd_hub_control"
+- "wait-device-boardid timed out after [0-9]+ seconds"
+- "wait for prompt timed out"
+'
+
+    if [ -n "${REGISTER_CALLBACK_TOKEN}" ]; then
+        callback_headers_for_echo="CALLBACK_HEADERS: {PRIVATE-TOKEN: ******}"
+        callback_headers="CALLBACK_HEADERS: {PRIVATE-TOKEN: ${REGISTER_CALLBACK_TOKEN}}"
+
+        qa_project_settings="${callback_headers}
+${qa_project_public_settings}"
+        qa_project_settings_for_echo="${callback_headers_for_echo}
+${qa_project_public_settings}"
+    else
+        qa_project_settings="${qa_project_public_settings}"
+        qa_project_settings_for_echo="${qa_project_public_settings}"
+    fi
+
+    qa_projcect_public_private="--is-public"
+    if [ -n "${qa_project_private}" ] && [ "${qa_project_private}" = "true" ] ; then
+        qa_projcect_public_private="--is-private"
+    fi
+
+    # enable --no-overwrite to avoid updating on the existing projects
+    # to avoid causing any problem for the existing projects
+    cmd_squad_client="${path_squad_client} --squad-host ${qa_server} --squad-token ****** create-or-update-project"
+    cmd_squad_client="${cmd_squad_client} --group ${qa_team_group} --slug ${qa_project_slug} --name ${qa_project_name} ${qa_projcect_public_private} --plugins ${qa_project_plugins}"
+    cmd_squad_client="${cmd_squad_client} --settings ${qa_project_settings_for_echo} --no-overwrite --data-retention 0"
+    echo "${cmd_squad_client}"
+
+    if [ -z "${ENV_DRY_RUN_FOR_PROJECT_CREATING}" ] || [ "${ENV_DRY_RUN_FOR_PROJECT_CREATING}" = "false" ] ; then
+        ${path_squad_client} \
+            --squad-host "${qa_server}" --squad-token "${QA_REPORTS_TOKEN}" \
+            create-or-update-project \
+            --group "${qa_team_group}" \
+            --slug "${qa_project_slug}" \
+            --name "${qa_project_name}" \
+            ${qa_projcect_public_private} \
+            --plugins ${qa_project_plugins} \
+            --settings "${qa_project_settings}" \
+            --no-overwrite \
+            --data-retention 0 || true
+    fi
+    set -x
+
+}
+
+function submit_jobs_for_config(){
+    local build_config=$1 && shift
+
+    export LKFT_BUILD_CONFIG="${build_config}"
+
+    local f_qareport_urls="qareport_url.txt"
+    [ -z "${DEFAULT_TEST_LAVA_JOB_PRIORITY}" ] && DEFAULT_TEST_LAVA_JOB_PRIORITY="medium"
+
+    # clean environments
+    unset TEST_DEVICE_TYPE TEST_LAVA_SERVER TEST_QA_SERVER TEST_QA_SERVER_TEAM TEST_QA_SERVER_PROJECT TEST_QA_SERVER_PROJECT_NAME TEST_QA_SERVER_PROJECT_PRIVATE TEST_QA_SERVER_ENVIRONMENT
+    unset ANDROID_VERSION KERNEL_BRANCH KERNEL_REPO TEST_METADATA_TOOLCHAIN TEST_VTS_URL TEST_CTS_URL REFERENCE_BUILD_URL ANDROID_VENDOR_FINGERPRINT
+    unset PUBLISH_FILES TEST_OTHER_PLANS TEST_TEMPLATES_TYPE TEST_LAVA_JOB_GROUP TEST_LAVA_JOB_PRIORITY
+    unset IMAGE_SUPPORTED_CACHE IMAGE_SUPPORTED_VENDOR_BOOT
+    unset HIKEY960_SUPPORT_SUPER
+
+    # the config file should be in the directory of android-build-configs/lkft
+    # or copied to there by the linaro-lkft.sh build
+    source ${LKFT_WORK_DIR}/android-build-configs/lkft/${build_config}
+
+    if [ -z "${TEST_METADATA_TOOLCHAIN}" ]; then
+        source ${LKFT_WORK_DIR}/out/${build_config}/misc_info.txt
+        if [ -n "${GKI_KERNEL_CLANG_VER}" ]; then
+            TEST_METADATA_TOOLCHAIN=${GKI_KERNEL_CLANG_VER}
+        elif [ -n "${VENDOR_KERNEL_CLANG_VER}" ]; then
+            TEST_METADATA_TOOLCHAIN=${VENDOR_KERNEL_CLANG_VER}
+        fi
+    fi
+    check_environments
+    export PUBLISH_FILES="${PUBLISH_FILES}"
+    [ -z "${TEST_LAVA_JOB_GROUP}" ] && TEST_LAVA_JOB_GROUP=lkft
+    [ -n "${TEST_LAVA_JOB_PRIORITY}" ] && DEFAULT_TEST_LAVA_JOB_PRIORITY="${TEST_LAVA_JOB_PRIORITY}"
+    [ -z "${TEST_LAVA_JOB_PRIORITY}" ] && TEST_LAVA_JOB_PRIORITY="${DEFAULT_TEST_LAVA_JOB_PRIORITY}"
+    [ -n "${HIKEY960_SUPPORT_SUPER}" ] && export HIKEY960_SUPPORT_SUPER
+    export TEST_LAVA_JOB_GROUP TEST_LAVA_JOB_PRIORITY
+    export ANDROID_VERSION KERNEL_BRANCH KERNEL_REPO TEST_METADATA_TOOLCHAIN TEST_VTS_URL TEST_CTS_URL REFERENCE_BUILD_URL
+    TEST_VTS_VERSION=$(echo "${TEST_VTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF)}')
+    TEST_CTS_VERSION=$(echo "${TEST_CTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF)}')
+
+    if echo "${TEST_VTS_URL}"|grep '/aosp-master/'; then
+        # for aosp master cts/vts packages
+        build_number_vts=$(echo "${TEST_VTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}')
+        TEST_VTS_VERSION="aosp-master#${build_number_vts}"
+    elif echo "${TEST_VTS_URL}"|grep '/aosp-master-throttled/'; then
+        # for aosp master cts/vts packages
+        build_number_vts=$(echo "${TEST_VTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}')
+        TEST_VTS_VERSION="aosp-master-throttled#${build_number_vts}"
+    elif echo "${TEST_VTS_URL}"|grep '/protected/'; then
+        # for EAP cts/vts packages
+        f_fingerprint_vts="build_fingerprint_vts.txt"
+        download_fingerprint "${TEST_VTS_URL}/build_fingerprint.txt" "${f_fingerprint_vts}"
+        fingerprint_vts=$(cut -d: -f2 "${f_fingerprint_vts}")
+        if [ -n "${f_fingerprint_vts}" ]; then
+            TEST_VTS_VERSION="EAP-Android12#${fingerprint_vts}"
+        fi
+    fi
+
+    if echo "${TEST_CTS_URL}"|grep '/aosp-master/'; then
+        build_number_cts=$(echo "${TEST_CTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}')
+        TEST_CTS_VERSION="aosp-master#${build_number_cts}"
+    elif echo "${TEST_CTS_URL}"|grep '/aosp-master-throttled/'; then
+        build_number_cts=$(echo "${TEST_CTS_URL}" | tr -s '/' | sed 's|/$||' | awk -F"/" '{print$(NF-1)}')
+        TEST_CTS_VERSION="aosp-master-throttled#${build_number_cts}"
+    elif echo "${TEST_CTS_URL}"|grep '/protected/'; then
+        f_fingerprint_cts="build_fingerprint_cts.txt"
+        download_fingerprint "${TEST_CTS_URL}/build_fingerprint.txt" "${f_fingerprint_cts}"
+        fingerprint_cts=$(cut -d: -f2 "${f_fingerprint_cts}")
+        if [ -n "${f_fingerprint_cts}" ]; then
+            TEST_CTS_VERSION="EAP-Android12#${fingerprint_cts}"
+        fi
+    fi
+
+    export TEST_VTS_VERSION TEST_CTS_VERSION
+
+    f_fingerprint_ref="build_fingerprint_ref.txt"
+    download_fingerprint "${REFERENCE_BUILD_URL}/build_fingerprint.txt" "${f_fingerprint_ref}"
+    fingerprint_ref=$(cut -d: -f2 "${f_fingerprint_ref}")
+    if [ -n "${f_fingerprint_ref}" ]; then
+        ANDROID_VENDOR_FINGERPRINT="${fingerprint_ref}"
+    else
+        ANDROID_VENDOR_FINGERPRINT=""
+    fi
+    export ANDROID_VENDOR_FINGERPRINT
+
+    if [ -n "${REFERENCE_BUILD_URL_SYSTEM_IMG_XZ}" ]; then
+        f_fingerprint_gsi="build_fingerprint_gsi.txt"
+        gsi_base_url=$(dirname "${REFERENCE_BUILD_URL_SYSTEM_IMG_XZ}")
+        download_fingerprint "${gsi_base_url}/build_fingerprint.txt" "${f_fingerprint_gsi}"
+        fingerprint_gsi=$(cut -d: -f2 "${f_fingerprint_gsi}")
+        if [ -n "${fingerprint_gsi}" ]; then
+            ANDROID_GSI_FINGERPRINT="${fingerprint_gsi}"
+        else
+            ANDROID_GSI_FINGERPRINT=""
+        fi
+        ANDROID_GSI_URL="${REFERENCE_BUILD_URL_SYSTEM_IMG_XZ}"
+    else
+        ANDROID_GSI_FINGERPRINT=""
+        ANDROID_GSI_URL=""
+    fi
+    export ANDROID_GSI_FINGERPRINT ANDROID_GSI_URL
+
+    # works when cache partition part is guarded with IMAGE_SUPPORTED_CACHE
+    # default is to support cache partition with cache.img
+    if [ -n "${IMAGE_SUPPORTED_CACHE}" ] && echo "X${IMAGE_SUPPORTED_CACHE}" | grep -i "Xfalse"; then
+        # unset IMAGE_SUPPORTED_CACHE only when IMAGE_SUPPORTED_CACHE is specified as false explicitly
+        unset IMAGE_SUPPORTED_CACHE
+    else
+        # cache paritition will be flashed with the cache.img
+        export IMAGE_SUPPORTED_CACHE=true
+    fi
+
+    if [ -n "${IMAGE_SUPPORTED_VENDOR_BOOT}" ] && echo "X${IMAGE_SUPPORTED_VENDOR_BOOT}" | grep -i "Xtrue"; then
+        # vendor_boot paritition will be flashed with the vendor_boot.img only when IMAGE_SUPPORTED_VENDOR_BOOT as true
+        export IMAGE_SUPPORTED_VENDOR_BOOT=true
+    else
+        # unset IMAGE_SUPPORTED_VENDOR_BOOT when IMAGE_SUPPORTED_VENDOR_BOOT is not specified or specified as false explicitly
+        unset IMAGE_SUPPORTED_VENDOR_BOOT
+    fi
+
+    if [ -n "${TUXSUITE_DOWNLOAD_URL}" ]; then
+        # for case from gitlab pipeline
+        # need to export BUILD_URL="${CI_PIPELINE_URL}",  BUILD_NUMBER="${CI_BUILD_ID}", JOB_NAME="${REPO_NAME}/${KERNEL_BRANCH}"
+        export TUXSUITE_DOWNLOAD_URL
+    else
+        unset TUXSUITE_DOWNLOAD_URL
+    fi
+
+    ## clean up the old changes for last build
+    ## so that the url could be updated as expected
+    cd  ${DIR_CONFIGS_ROOT}/ && \
+        git reset --hard && \
+        cd -
+
+    rm -f ${f_qareport_urls} && touch ${f_qareport_urls}
+
+    # set OPT_ENVIRONMENT to empty by default, to make openembedded-lkft/submit_for_testing.py
+    # use the device type as the qa-report server environment
+    # and use the value of TEST_QA_SERVER_ENVIRONMENT as the qa-report server environment
+    # if it is sepecified explicitly
+    OPT_ENVIRONMENT=""
+    if [ -n "${TEST_QA_SERVER_ENVIRONMENT}" ] && echo "X${TEST_QA_SERVER_ENVIRONMENT_ENABLED}" | grep -i "Xtrue"; then
+        OPT_ENVIRONMENT="--environment ${TEST_QA_SERVER_ENVIRONMENT}"
+    fi
+    if [ -z "${TEST_QA_SERVER_TEAM}" ]; then
+        TEST_QA_SERVER_TEAM="android-lkft"
+    fi
+
+    [ -z "${TEST_QA_SERVER_PROJECT_PRIVATE}" ] && TEST_QA_SERVER_PROJECT_PRIVATE="false"
+    [ -z "${TEST_QA_SERVER_PROJECT_NAME}" ] &&  TEST_QA_SERVER_PROJECT_NAME="${TEST_QA_SERVER_PROJECT}"
+
+    # Do not submit the default lkft test jobs when TEST_PLANS_NO_DEFAULT_LKFT is set true
+    if [ -z "${TEST_PLANS_NO_DEFAULT_LKFT}" ] || [ "X${TEST_PLANS_NO_DEFAULT_LKFT}" != "Xtrue" ]; then
+        local default_plans="template-boot.yaml template-vts-kernel-arm64-v8a.yaml template-vts-kernel-armeabi-v7a.yaml template-cts-lkft.yaml"
+        if [ "X${TEST_DEVICE_TYPE}" = "Xx15" ]; then
+            default_plans="template-boot.yaml template-vts-kernel-armeabi-v7a.yaml template-cts-lkft.yaml"
+        fi
+
+        local default_templates_type="${TEST_TEMPLATES_TYPE:-common}"
+        local f_device_template="${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/${default_templates_type}/devices/${TEST_DEVICE_TYPE}"
+        for f in ${PUBLISH_FILES}; do
+            update_device_template "${f_device_template}" "${f}" "${build_config}" "${REFERENCE_BUILD_URL}"
+        done
+
+        create_or_update_project "${TEST_QA_SERVER}" "${TEST_QA_SERVER_TEAM}"  "${TEST_QA_SERVER_PROJECT_PRIVATE}" "${TEST_QA_SERVER_PROJECT}" "${TEST_QA_SERVER_PROJECT_NAME}"
+
+        python ${DIR_CONFIGS_ROOT}/openembedded-lkft/submit_for_testing.py \
+            --device-type ${TEST_DEVICE_TYPE} \
+            --build-number ${BUILD_NUMBER} \
+            --lava-server ${TEST_LAVA_SERVER} \
+            --qa-server ${TEST_QA_SERVER} \
+            --qa-server-team ${TEST_QA_SERVER_TEAM} \
+            ${OPT_ENVIRONMENT} \
+            --qa-server-project ${TEST_QA_SERVER_PROJECT} \
+            --git-commit ${QA_BUILD_VERSION} \
+            --testplan-path "${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/${default_templates_type}" \
+            --test-plan ${default_plans} \
+            ${OPT_DRY_RUN} \
+            --quiet
+
+        if [ -z "${ENV_DRY_RUN}" ]; then
+            qareport_url="${TEST_QA_SERVER}/api/submit/${TEST_QA_SERVER_TEAM}/${TEST_QA_SERVER_PROJECT}/${QA_BUILD_VERSION}/${TEST_DEVICE_TYPE}"
+            submit_build_result "${qareport_url}"
+        fi
+    fi
+
+    # so that we could override the test plans in config by settings from ci build dynamically
+    if [ -n "${TEST_OTHER_PLANS_OVERRIDE}" ]; then
+        TEST_OTHER_PLANS="${TEST_OTHER_PLANS_OVERRIDE}"
+    fi
+
+    if [ -n "${TEST_OTHER_PLANS}" ]; then
+        for plan in ${TEST_OTHER_PLANS}; do
+            templates=$(get_value_from_config_file "TEST_TEMPLATES_${plan}" "${build_config}")
+            if [ -z "${templates}" ]; then
+                echo "No templates specified for plan ${plan} with variable of TEST_TEMPLATES_${plan}"
+                continue
+            fi
+            templates_type=$(get_value_from_config_file "TEST_TEMPLATES_TYPE_${plan}" "${build_config}")
+            if [ -z "${templates_type}" ]; then
+                templates_type="common"
+            fi
+            lava_server=$(get_value_from_config_file "TEST_LAVA_SERVER_${plan}" "${build_config}")
+            if [ -z "${lava_server}" ]; then
+                lava_server="${TEST_LAVA_SERVER}"
+            fi
+            qa_server=$(get_value_from_config_file "TEST_QA_SERVER_${plan}" "${build_config}")
+            if [ -z "${qa_server}" ]; then
+                qa_server="${TEST_QA_SERVER}"
+            fi
+            qa_server_team=$(get_value_from_config_file "TEST_QA_SERVER_TEAM_${plan}" "${build_config}")
+            if [ -z "${qa_server_team}" ]; then
+                qa_server_team="${TEST_QA_SERVER_TEAM}"
+            fi
+            qa_server_project=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_${plan}" "${build_config}")
+            [ -z "${qa_server_project}" ] && qa_server_project="${TEST_QA_SERVER_PROJECT}"
+            qa_server_project_name=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_NAME_${plan}" "${build_config}")
+            [ -z "${qa_server_project_name}" ] && qa_server_project_name="${qa_server_project}"
+
+            qa_server_project_private=$(get_value_from_config_file "TEST_QA_SERVER_PROJECT_PRIVATE_${plan}" "${build_config}")
+            [ -z "${qa_server_project_private}" ] && qa_server_project_private="${TEST_QA_SERVER_PROJECT_PRIVATE}"
+
+            lava_job_priority=$(get_value_from_config_file "TEST_LAVA_JOB_PRIORITY_${plan}" "${build_config}")
+            if [ -n "${lava_job_priority}" ]; then
+                TEST_LAVA_JOB_PRIORITY="${lava_job_priority}"
+            else
+                TEST_LAVA_JOB_PRIORITY="${DEFAULT_TEST_LAVA_JOB_PRIORITY}"
+            fi
+            export TEST_LAVA_JOB_PRIORITY
+
+            f_device_template="${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/${templates_type}/devices/${TEST_DEVICE_TYPE}"
+            for f in ${PUBLISH_FILES}; do
+                update_device_template "${f_device_template}" "${f}" "${build_config}" "${REFERENCE_BUILD_URL}"
+            done
+
+            create_or_update_project "${qa_server}" "${qa_server_team}" "${qa_server_project_private}" "${qa_server_project}" "${qa_server_project_name}"
+
+            python ${DIR_CONFIGS_ROOT}/openembedded-lkft/submit_for_testing.py \
+                --device-type ${TEST_DEVICE_TYPE} \
+                --build-number ${BUILD_NUMBER} \
+                --lava-server ${lava_server} \
+                --qa-server ${qa_server} \
+                --qa-server-team ${qa_server_team} \
+                ${OPT_ENVIRONMENT} \
+                --qa-server-project ${qa_server_project} \
+                --git-commit ${QA_BUILD_VERSION} \
+                --testplan-path ${DIR_CONFIGS_ROOT}/lkft/lava-job-definitions/${templates_type} \
+                --test-plan ${templates} \
+                ${OPT_DRY_RUN} \
+                --quiet
+
+            if [ -z "${ENV_DRY_RUN}" ]; then
+                qareport_url="${qa_server}/api/submit/${qa_server_team}/${qa_server_project}/${QA_BUILD_VERSION}/${TEST_DEVICE_TYPE}"
+                submit_build_result ${qareport_url}
+            fi
+        done
+    fi
+
+    rm -f "${f_qareport_urls}"
+}
+
+function submit_jobs(){
+    local f_temp_path=${F_ABS_PATH}
+    local NEED_CLONE_CONFIGS=true
+    DIR_CONFIGS_ROOT=""
+    while true; do
+        parent=$(dirname ${f_temp_path})
+        if [ -d ${parent}/.git ]; then
+            NEED_CLONE_CONFIGS=false
+            DIR_CONFIGS_ROOT=${parent}
+            break
+        elif [ "X${parent}" = "X/" ]; then
+            break
+        fi
+        f_temp_path=${parent}
+    done
+
+    if ${NEED_CLONE_CONFIGS}; then
+        rm -rf configs && git clone --depth 1 http://git.linaro.org/ci/job/configs.git && DIR_CONFIGS_ROOT=configs
+    fi
+
+    #environments exported by jenkins
+    #export BUILD_NUMBER JOB_NAME BUILD_URL
+    PUB_DEST="android/lkft/${JOB_NAME}/${BUILD_NUMBER}"
+    if [ -n "${SNAPAHOT_SITE_ROOT}" ]; then
+        PUB_DEST="${SNAPAHOT_SITE_ROOT}/${JOB_NAME}/${BUILD_NUMBER}"
+    fi
+    export DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
+
+    # environments set by the upstream trigger job
+    KERNEL_COMMIT=${SRCREV_kernel}
+    if [ -n "${MAKE_KERNELVERSION}" ] && echo "X${USE_KERNELVERSION_FOR_QA_BUILD_VERSION}" | grep -i "Xtrue"; then
+        QA_BUILD_VERSION=${MAKE_KERNELVERSION}-${KERNEL_COMMIT:0:12}
+    elif [ -n "${KERNEL_DESCRIBE}" ]; then
+        QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+    else
+        QA_BUILD_VERSION=${KERNEL_COMMIT:0:12}
+    fi
+    export KERNEL_DESCRIBE KERNEL_COMMIT
+    export QA_BUILD_VERSION DIR_CONFIGS_ROOT
+
+    for build_config in ${ANDROID_BUILD_CONFIG}; do
+        submit_jobs_for_config ${build_config}
+    done
+}
+
+submit_jobs "$@"
diff --git a/lkft/lava-job-definitions/test-submit-x15-jobs.sh b/lkft/lava-job-definitions/test-submit-x15-jobs.sh
new file mode 100755
index 0000000000..8802c4ecab
--- /dev/null
+++ b/lkft/lava-job-definitions/test-submit-x15-jobs.sh
@@ -0,0 +1,54 @@
+#!/bin/bash -ex
+
+parent_dir=$(cd $(dirname $0); pwd)
+
+
+export PUB_DEST=96boards/hikey/linaro/aosp-master/1107
+export VTS_URL=http://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/1107
+export CTS_URL=http://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/1107
+export DOWNLOAD_URL=http://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/1107
+export REFERENCE_BUILD_URL=http://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/1107
+export KERNEL_COMMIT=1107
+export ANDROID_VERSION=aosp-master-2019-02-01
+export VTS_VERSION=aosp-master
+export CTS_VERSION=aosp-master
+export QA_BUILD_VERSION=1107
+
+export DEVICE_TYPE=x15
+export TOOLCHAIN=gcc-linaro-7.2.1-2017.11-x86_64_arm-eabi
+export KERNEL_REPO=omap
+export KERNEL_DESCRIBE=787751264d17
+export SRCREV_kernel=787751264d17
+export KERNEL_BRANCH=android-beagle-x15-4.14-787751264d17
+export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
+
+export BUILD_NUMBER=1107
+export JOB_NAME=96boards-hikey-aosp-master
+export BUILD_URL=https://ci.linaro.org/job/96boards-hikey-aosp-master/1107/
+export ARTIFACTORIAL_TOKEN=ARTIFACTORIAL_TOKEN
+export AP_KEY=AP_KEY
+export AP_SSID=AP_SSID
+
+export BOOTARGS='androidboot.serialno=${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=am57xevmboard'
+
+
+python ${parent_dir}/../..//openembedded-lkft/submit_for_testing.py \
+    --device-type x15 \
+    --build-number 1107 \
+    --lava-server https://lkft.validation.linaro.org/RPC2/ \
+    --qa-server https://qa-reports.linaro.org \
+    --qa-server-team android-lkft \
+    --env-suffix _4.14 \
+    --qa-server-project aosp-master-tracking \
+    --git-commit 1107 \
+    --testplan-path lkft/lava-job-definitions/x15 \
+    --test-plan template-boot.yaml \
+                template-vts-kernel-syscalls.yaml \
+                template-cts-displaytestcases.yaml \
+                template-vts-kselftest.yaml \
+                template-cts.yaml \
+                template-vts-kernel-ltp.yaml \
+    --dry-run \
+    --quiet
+
+exit $?
diff --git a/lkft/lava-job-definitions/test-submitting-jobs.sh b/lkft/lava-job-definitions/test-submitting-jobs.sh
new file mode 100755
index 0000000000..33c1925d99
--- /dev/null
+++ b/lkft/lava-job-definitions/test-submitting-jobs.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+F_ABS_PATH=$(readlink -e $0)
+DIR_PARENT=$(dirname ${F_ABS_PATH})
+
+export LKFT_WORK_DIR=$(pwd)
+
+export BUILD_NUMBER=2442
+export JOB_NAME=lkft-generic-build
+export BUILD_URL=https://ci.linaro.org/job/${JOB_NAME}/${BUILD_NUMBER}
+export SRCREV_kernel=4a559bce32b9ad5d5ec264d4a517f4bf34d87b32
+export KERNEL_DESCRIBE=5.10.0-4a559bce32b9
+export AP_SSID=ap_ssid #needed for test hikey
+export AP_KEY=ap_key # needed for test hikey
+
+export ENV_DRY_RUN=true
+export ARTIFACTORIAL_TOKEN=xxxx
+export ANDROID_BUILD_CONFIG="lkft-hikey960-aosp-master-mainline-gki"
+
+for f in ${ANDROID_BUILD_CONFIG}; do
+    mkdir -p out/${f}
+    rm -f out/${f}/misc_info.txt
+    cat >> out/${f}/misc_info.txt <<__EOF__
+VENDOR_KERNEL_CLANG_VER=clang-r399163b
+KERNEL_BRANCH=android-mainline
+KERNEL_REPO=https://android.googlesource.com/kernel/common
+VENDOR_KERNEL_MAKEVERSION=5.10.0
+VENDOR_KERNEL_COMMIT=4162f006bd11db3af3a16c1048e204d0e55e593a
+GKI_KERNEL_MAKEVERSION=5.10.0
+GKI_KERNEL_COMMIT=4162f006bd11db3af3a16c1048e204d0e55e593a
+__EOF__
+
+done
+
+virtualenv .venv
+source .venv/bin/activate
+pip install Jinja2 requests urllib3 ruamel.yaml==0.16.13
+
+${DIR_PARENT}/submit_for_testing-v2.sh
diff --git a/lkft/lava-job-definitions/x15/template-boot.yaml b/lkft/lava-job-definitions/x15/template-boot.yaml
new file mode 100644
index 0000000000..89a7615482
--- /dev/null
+++ b/lkft/lava-job-definitions/x15/template-boot.yaml
@@ -0,0 +1,136 @@
+device_type: x15
+job_name: "lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-boot"
+
+timeouts:
+  job:
+    minutes: 100
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+metadata:
+  android.build: "{{BUILD_NUMBER}}"
+  android.name: "{{JOB_NAME}}"
+  android.url: "{{REFERENCE_BUILD_URL}}"
+  android.version: "{{ANDROID_VERSION}}"
+  git branch: "{{KERNEL_BRANCH}}"
+  git repo: "{{KERNEL_REPO}}"
+  git commit: "{{KERNEL_COMMIT}}"
+  git describe: "{{KERNEL_DESCRIBE}}"
+  build-url: "{{BUILD_URL}}"
+  toolchain: "{{TOOLCHAIN}}"
+  series: lkft
+
+protocols:
+  lava-lxc:
+    name: lxc-x15-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: droid
+    images:
+      boot:
+        url: "{{DOWNLOAD_URL}}/boot_fit.img"
+        sha256sum: "${X15_BOOT_FIT_IMG_SHA256SUM}"
+      vendor:
+        url: "{{DOWNLOAD_URL}}/vendor.img"
+        sha256sum: "${X15_VENDOR_IMG_SHA256SUM}"
+      userdata:
+        url: "{{DOWNLOAD_URL}}/userdata.img"
+        sha256sum: "${X15_USERDATA_IMG_SHA256SUM}"
+      system:
+        url: "{{DOWNLOAD_URL}}/system.img"
+        sha256sum: "${X15_SYSTEM_IMG_SHA256SUM}"
+
+- boot:
+    namespace: droid
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+{% if BOOTARGS is defined %}
+    commands:
+    - setenv bootargs "{{BOOTARGS}}"
+    - run findfdt
+    - run emmc_android_boot
+    method: u-boot
+{% else %}
+    method: fastboot
+{% endif %}
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 100
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device
+            - lava-test-case "android-boot-sleep-2mins" --shell adb shell sleep 120
+            - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed
+
+- test:
+      namespace: tlxc
+      connection: lxc
+      timeout:
+        minutes: 30
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/boottime/boottime.yaml
+          name: boottime-test
+
diff --git a/lkft/lava-job-definitions/x15/template-cts.yaml b/lkft/lava-job-definitions/x15/template-cts.yaml
new file mode 100644
index 0000000000..6b0787cc41
--- /dev/null
+++ b/lkft/lava-job-definitions/x15/template-cts.yaml
@@ -0,0 +1,147 @@
+device_type: x15
+job_name: "lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-cts"
+timeouts:
+  job:
+    minutes: 240
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+metadata:
+  android.build: "{{BUILD_NUMBER}}"
+  android.name: "{{JOB_NAME}}"
+  android.url: "{{REFERENCE_BUILD_URL}}"
+  android.version: "{{ANDROID_VERSION}}"
+  git branch: "{{KERNEL_BRANCH}}"
+  git repo: "{{KERNEL_REPO}}"
+  git commit: "{{KERNEL_COMMIT}}"
+  git describe: "{{KERNEL_DESCRIBE}}"
+  cts-url: "${CTS_URL}/android-cts.zip"
+  cts-manifest: "{{CTS_URL}}/pinned-manifest.xml"
+  cts-version: "{{CTS_VERSION}}"
+  cts-plan: "cts-lkft"
+  build-url: "{{BUILD_URL}}"
+  toolchain: "{{TOOLCHAIN}}"
+  series: lkft
+
+secrets:
+    ARTIFACTORIAL_TOKEN: "{{ARTIFACTORIAL_TOKEN}}"
+
+protocols:
+  lava-lxc:
+    name: lxc-x15-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: droid
+    images:
+      boot:
+        url: "{{DOWNLOAD_URL}}/boot_fit.img"
+        sha256sum: "${X15_BOOT_FIT_IMG_SHA256SUM}"
+      vendor:
+        url: "{{DOWNLOAD_URL}}/vendor.img"
+        sha256sum: "${X15_VENDOR_IMG_SHA256SUM}"
+      userdata:
+        url: "{{DOWNLOAD_URL}}/userdata.img"
+        sha256sum: "${X15_USERDATA_IMG_SHA256SUM}"
+      system:
+        url: "{{DOWNLOAD_URL}}/system.img"
+        sha256sum: "${X15_SYSTEM_IMG_SHA256SUM}"
+
+- boot:
+    namespace: droid
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+{% if BOOTARGS is defined %}
+    commands:
+    - setenv bootargs "{{BOOTARGS}}"
+    - run findfdt
+    - run emmc_android_boot
+    method: u-boot
+{% else %}
+    method: fastboot
+{% endif %}
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 10
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device
+            - lava-test-case "android-boot-sleep-2mins" --shell adb shell sleep 120
+            - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 240
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/android/noninteractive-tradefed/tradefed.yaml
+      params:
+        TEST_PARAMS: "cts-lkft -a armeabi-v7a --disable-reboot"
+        TEST_URL: "{{CTS_URL}}/android-cts.zip"
+        TEST_PATH: "android-cts"
+        RESULTS_FORMAT: "atomic"
+        ANDROID_VERSION: "{{ANDROID_VERSION}}"
+      name: "cts-lkft"
diff --git a/lkft/lava-job-definitions/x15/template-vts-kernel.yaml b/lkft/lava-job-definitions/x15/template-vts-kernel.yaml
new file mode 100644
index 0000000000..6a3f9bd62b
--- /dev/null
+++ b/lkft/lava-job-definitions/x15/template-vts-kernel.yaml
@@ -0,0 +1,129 @@
+device_type: x15
+job_name: "lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-kernel"
+
+timeouts:
+  job:
+    minutes: 180
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+metadata:
+  android.build: "{{BUILD_NUMBER}}"
+  android.name: "{{JOB_NAME}}"
+  android.url: "{{REFERENCE_BUILD_URL}}"
+  android.version: "{{ANDROID_VERSION}}"
+  git branch: "{{KERNEL_BRANCH}}"
+  git repo: "{{KERNEL_REPO}}"
+  git commit: "{{KERNEL_COMMIT}}"
+  git describe: "{{KERNEL_DESCRIBE}}"
+  vts-url: "{{VTS_URL}}/android-vts.zip"
+  vts-manifest: "{{VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+  build-url: "{{BUILD_URL}}"
+  toolchain: "{{TOOLCHAIN}}"
+  series: lkft
+
+secrets:
+    ARTIFACTORIAL_TOKEN: "{{ARTIFACTORIAL_TOKEN}}"
+
+protocols:
+  lava-lxc:
+    name: lxc-x15-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: droid
+    images:
+      boot:
+        url: "{{DOWNLOAD_URL}}/boot_fit.img"
+        sha256sum: "{{X15_BOOT_FIT_IMG_SHA256SUM}}"
+      vendor:
+        url: "{{DOWNLOAD_URL}}/vendor.img"
+        sha256sum: "{{X15_VENDOR_IMG_SHA256SUM}}"
+      userdata:
+        url: "{{DOWNLOAD_URL}}/userdata.img"
+        sha256sum: "{{X15_USERDATA_IMG_SHA256SUM}}"
+      system:
+        url: "{{DOWNLOAD_URL}}/system.img"
+        sha256sum: "{{X15_SYSTEM_IMG_SHA256SUM}}"
+
+- boot:
+    namespace: droid
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+{% if BOOTARGS is defined %}
+    commands:
+    - setenv bootargs "{{BOOTARGS}}"
+    - run findfdt
+    - run emmc_android_boot
+    method: u-boot
+{% else %}
+    method: fastboot
+{% endif %}
+
+- test:
+      namespace: tlxc
+      connection: lxc
+      timeout:
+        minutes: 180
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-kernel"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "atomic"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+                TEST_REBOOT_EXPECTED: "true"
+          name: vts-test
diff --git a/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml b/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml
new file mode 100644
index 0000000000..1e0885da06
--- /dev/null
+++ b/lkft/lava-job-definitions/x15/template-vts-staging-kernel.yaml
@@ -0,0 +1,147 @@
+device_type: x15
+job_name: "lkft-android-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}-vts-staging-kernel"
+
+timeouts:
+  job:
+    minutes: 100
+  action:
+    minutes: 15
+  connection:
+    minutes: 2
+priority: medium
+visibility:
+  group:
+    - lkft
+
+metadata:
+  android.build: "{{BUILD_NUMBER}}"
+  android.name: "{{JOB_NAME}}"
+  android.url: "{{REFERENCE_BUILD_URL}}"
+  android.version: "{{ANDROID_VERSION}}"
+  git branch: "{{KERNEL_BRANCH}}"
+  git repo: "{{KERNEL_REPO}}"
+  git commit: "{{KERNEL_COMMIT}}"
+  git describe: "{{KERNEL_DESCRIBE}}"
+  vts-manifest: "{{VTS_URL}}/pinned-manifest.xml"
+  vts-version: "{{VTS_VERSION}}"
+  vts-plan: "vts-kernel"
+  build-url: "{{BUILD_URL}}"
+  toolchain: "{{TOOLCHAIN}}"
+  series: lkft
+
+protocols:
+  lava-lxc:
+    name: lxc-x15-test
+    template: download
+    distribution: ubuntu
+    release: bionic
+    arch: amd64
+    verbose: true
+
+secrets:
+    ARTIFACTORIAL_TOKEN: "{{ARTIFACTORIAL_TOKEN}}"
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    os: ubuntu
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2800
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r28.0.0-linux.zip'
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: droid
+    images:
+      boot:
+        url: "{{DOWNLOAD_URL}}/boot_fit.img"
+        sha256sum: "${X15_BOOT_FIT_IMG_SHA256SUM}"
+      vendor:
+        url: "{{DOWNLOAD_URL}}/vendor.img"
+        sha256sum: "${X15_VENDOR_IMG_SHA256SUM}"
+      userdata:
+        url: "{{DOWNLOAD_URL}}/userdata.img"
+        sha256sum: "${X15_USERDATA_IMG_SHA256SUM}"
+      system:
+        url: "{{DOWNLOAD_URL}}/system.img"
+        sha256sum: "${X15_SYSTEM_IMG_SHA256SUM}"
+
+- boot:
+    namespace: droid
+    prompts:
+    - 'root@(.*):/#'
+    - ':/'
+    timeout:
+      minutes: 15
+{% if BOOTARGS is defined %}
+    commands:
+    - setenv bootargs "{{BOOTARGS}}"
+    - run findfdt
+    - run emmc_android_boot
+    method: u-boot
+{% else %}
+    method: fastboot
+{% endif %}
+
+- test:
+    namespace: tlxc
+    connection: lxc
+    timeout:
+      minutes: 100
+    definitions:
+    - from: inline
+      path: android-boot.yaml
+      name: android-boot
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: android-boot
+          description: "android-boot"
+        run:
+          steps:
+            - lava-test-case "android-boot-wait-for-device" --shell adb wait-for-device
+            - lava-test-case "android-boot-sleep-2mins" --shell adb shell sleep 120
+            - lava-test-case "android-boot" --shell adb shell getprop sys.boot_completed
+
+- test:
+      namespace: tlxc
+      connection: lxc
+      timeout:
+        minutes: 100
+      definitions:
+        - repository: https://git.linaro.org/qa/test-definitions.git
+          from: git
+          path: automated/android/noninteractive-tradefed/tradefed.yaml
+          params:
+                TEST_URL: "{{VTS_URL}}/android-vts.zip"
+                TEST_PARAMS: "vts-staging-kernel"
+                TEST_PATH: "android-vts"
+                RESULTS_FORMAT: "atomic"
+                ANDROID_VERSION: "{{ANDROID_VERSION}}"
+          name: vts-staging-test
diff --git a/lkft/x15-aosp/builders.sh b/lkft/x15-aosp/builders.sh
new file mode 100644
index 0000000000..7fd2e2361d
--- /dev/null
+++ b/lkft/x15-aosp/builders.sh
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+export JENKINS_WORKSPACE=${WORKSPACE}
+
+java -version
+
+git config --global user.email "ci_notify@linaro.org"
+git config --global user.name "Linaro CI"
+
+sudo apt-get -q=2 update
+sudo apt-get -q=2 install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools python-pip pxz zlib1g-dev coreutils
+
+wget -q http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre-headless_8u45-b14-1_amd64.deb \
+  http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jre_8u45-b14-1_amd64.deb \
+  http://mirrors.kernel.org/ubuntu/pool/universe/o/openjdk-8/openjdk-8-jdk_8u45-b14-1_amd64.deb
+sudo dpkg -i --force-all *.deb
+
+# Install ruamel.yaml==0.16.13
+pip install --user --force-reinstall ruamel.yaml==0.16.13
+pip install --user --force-reinstall Jinja2
+
+mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/*
+export PATH=${HOME}/bin:${PATH}
+
+cd ~/srv/aosp-master/build/
+rm -rf .repo/manifests* .repo/local_manifests* out
+repo init -u http://android.googlesource.com/platform/manifest -b main
+if [ ! -z ${REFERENCE_BUILD_URL} ]; then
+  cd .repo/manifests/
+  wget ${REFERENCE_BUILD_URL}/pinned-manifest.xml -O default.xml
+  cd ../../
+fi
+cd .repo/
+rm -rf local_manifests
+git clone git://android-git.linaro.org/platform/manifest.git -b x15-master local_manifests
+cd ../
+
+set -e
+
+# delete any stale folder
+rm -rf clang-src hikey-linaro
+
+repo sync -j16 -c
+
+# build kernel
+export PATH=~/srv/toolchain/gcc-linaro-7.2.1-2017.11-x86_64_arm-eabi/bin:$PATH
+export CROSS_COMPILE=arm-eabi-
+export ARCH=arm
+cd kernel/ti/x15/
+export KERNEL_DESCRIBE=$(git rev-parse --short HEAD)
+export KERNELDIR=${PWD}
+make ARCH=arm ti_sdk_am57x_android_release_defconfig
+make -j$(nproc) zImage dtbs modules
+cd ../../../
+cp -vf kernel/ti/x15/arch/arm/boot/dts/ti/am57xx-beagle-x15-revc.dtb device/ti/beagle_x15-kernel/4.14/am57xx-beagle-x15-revc.dtb
+cp -vf kernel/ti/x15/arch/arm/boot/zImage device/ti/beagle_x15-kernel/4.14/zImage
+cp -vf kernel/ti/x15/arch/arm/boot/dts/ti/am57xx-evm-common.dtbo device/ti/beagle_x15-kernel/4.14/am57xx-evm-common.dtbo
+cp -vf kernel/ti/x15/arch/arm/boot/dts/ti/am57xx-evm-reva3.dtbo device/ti/beagle_x15-kernel/4.14/am57xx-evm-reva3.dtbo
+
+source build/envsetup.sh
+lunch beagle_x15-userdebug
+make -j$(nproc)
+wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O ${PWD}/out/target/product/beagle_x15/BUILD-INFO.txt
+
+X15_KERNEL_FILES="
+arch/arm/boot/zImage
+arch/arm/boot/dts/ti/am57xx-beagle-x15-revc.dtb
+arch/arm/boot/dts/ti/am57xx-evm-common.dtbo
+arch/arm/boot/dts/ti/am57xx-evm-reva3.dtbo
+vmlinux
+System.map
+"
+for f in ${X15_KERNEL_FILES}; do
+    if [ -f kernel/ti/x15/${f} ]; then
+        cp -vf kernel/ti/x15/${f} out/target/product/beagle_x15/
+    fi
+done
+# Publish parameters
+cat << EOF > ${WORKSPACE}/publish_parameters
+PUB_DEST=android/lkft/${JOB_NAME}/${BUILD_NUMBER}
+PUB_SRC=${PWD}/out/target/product/beagle_x15
+PUB_EXTRA_INC=^[^/]+\.(dtb|dtbo)$|MLO|vmlinux|System.map
+EOF
+
+rm -rf .repo/manifests .repo/local_manifests
+rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro* clang-src/ kernel/
+rm -fr device/ti/beagle_x15-kernel/
+
+( cd out && rm -f SHA256SUMS.txt && sha256sum * > SHA256SUMS.txt )
diff --git a/lkft/x15-aosp/lkft-aosp-master-x15.sh b/lkft/x15-aosp/lkft-aosp-master-x15.sh
new file mode 100755
index 0000000000..19029a4a1a
--- /dev/null
+++ b/lkft/x15-aosp/lkft-aosp-master-x15.sh
@@ -0,0 +1,204 @@
+#!/bin/bash -ex
+
+export PATH=${HOME}/bin:${PATH}
+export JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
+
+#BUILD_CONFIG_FILENAME=aosp-master-x15
+#KERNEL_REPO_URL=/data/android/aosp-mirror/kernel/omap.git
+#OPT_MIRROR="-m /data/android/aosp-mirror/platform/manifest.git"
+#DIR_SRV_AOSP_MASTER="/data/android/aosp/pure-master/test-x15-lkft"
+#CLEAN_UP=false
+#IN_JENKINS=false
+
+DIR_SRV_AOSP_MASTER="${DIR_SRV_AOSP_MASTER:-/home/buildslave/srv/aosp-master}"
+BUILD_CONFIG_FILENAME=${BUILD_CONFIG_FILENAME:-${JOB_NAME#android-*}}
+KERNEL_REPO_URL=${KERNEL_REPO_URL:-https://android.googlesource.com/kernel/omap}
+OPT_MIRROR="${OPT_MIRROR:-}"
+# https://developer.arm.com/tools-and-software/open-source-software/developer-tools/gnu-toolchain/gnu-a/downloads/8-3-2019-03
+TOOLCHAIN_NAME="${TOOLCHAIN_NAME:-gcc-arm-8.3-2019.03-x86_64-arm-linux-gnueabihf}"
+TOOLCHAIN_URL="${TOOLCHAIN_URL:-https://developer.arm.com/-/media/Files/downloads/gnu-a/8.3-2019.03/binrel/${TOOLCHAIN_NAME}.tar.xz}"
+CROSS_COMPILE=${CROSS_COMPILE:-${TOOLCHAIN_NAME}/bin/arm-linux-gnueabihf-}
+CLEAN_UP=${CLEAN_UP:-true}
+
+ANDROID_ROOT="${DIR_SRV_AOSP_MASTER}/build"
+DIR_PUB_SRC="${ANDROID_ROOT}/out/dist"
+DIR_PUB_SRC_PRODUCT="${ANDROID_ROOT}/out/target/product/beagle_x15"
+ANDROID_IMAGE_FILES="boot.img dtb.img dtbo.img super.img vbmeta.img userdata.img ramdisk.img ramdisk-debug.img recovery.img"
+
+# functions for clean the environemnt before repo sync and build
+function prepare_environment(){
+    if [ ! -d "${DIR_SRV_AOSP_MASTER}" ]; then
+      sudo mkdir -p "${DIR_SRV_AOSP_MASTER}"
+      sudo chmod 777 "${DIR_SRV_AOSP_MASTER}"
+    fi
+    cd "${DIR_SRV_AOSP_MASTER}"
+
+    # clean files under ${DIR_SRV_AOSP_MASTER}
+    rm -rf .repo/manifests* .repo/local_manifests build-tools jenkins-tools
+
+    # clean the build directory as it is used accross multiple builds
+    # by removing all files except the .repo directory
+    if ${CLEAN_UP}; then
+        rm -fr ${DIR_SRV_AOSP_MASTER}/.repo-backup
+        if [ -d "${ANDROID_ROOT}/.repo" ]; then
+            mv -f ${ANDROID_ROOT}/.repo ${DIR_SRV_AOSP_MASTER}/.repo-backup
+        fi
+        rm -fr ${ANDROID_ROOT}/ && mkdir -p ${ANDROID_ROOT}
+        if [ -d "${DIR_SRV_AOSP_MASTER}/.repo-backup" ]; then
+            mv -f ${DIR_SRV_AOSP_MASTER}/.repo-backup ${ANDROID_ROOT}/.repo
+        fi
+    fi
+}
+
+###############################################################
+# Build Android for X15
+# All operations following should be done under ${ANDROID_ROOT}
+###############################################################
+function build_android(){
+    cd ${ANDROID_ROOT}
+    rm -fr ${DIR_PUB_SRC} && mkdir -p ${DIR_PUB_SRC}
+    rm -fr ${ANDROID_ROOT}/out/pinned-manifest
+
+    rm -fr android-build-configs
+    git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git android-build-configs
+    ./android-build-configs/linaro-build.sh -c ${BUILD_CONFIG_FILENAME} ${OPT_MIRROR}
+
+    mkdir -p ${DIR_PUB_SRC}
+    cp -a ${ANDROID_ROOT}/out/pinned-manifest/*-pinned-manifest.xml ${DIR_PUB_SRC}
+    wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/aosp-master-template.txt -O ${DIR_PUB_SRC}/BUILD-INFO.txt
+
+    for f in ${ANDROID_IMAGE_FILES}; do
+        mv -vf ${DIR_PUB_SRC_PRODUCT}/${f} ${DIR_PUB_SRC}/aosp-${f}
+        xz -T 0 ${DIR_PUB_SRC}/aosp-${f}
+    done
+}
+
+#######################################
+###### compile x15 4.19 kernel
+#######################################
+function build_kernel(){
+    cd ${ANDROID_ROOT}
+
+    local kernel_ver="${1}"
+    if [ -z "${kernel_ver}" ]; then
+        return
+    fi
+
+    # git clone omap kernel
+    X15_KERNEL_DIR=${ANDROID_ROOT}/kernel/omap/x15
+    if ${CLEAN_UP}; then
+        rm -fr ${X15_KERNEL_DIR} && mkdir -p ${X15_KERNEL_DIR}
+        git clone ${KERNEL_REPO_URL} ${X15_KERNEL_DIR}
+    fi
+
+    cd ${X15_KERNEL_DIR}
+    git checkout android-beagle-x15-${kernel_ver} && git clean -fdx && git pull
+    local ver_name=$(echo ${kernel_ver}|tr '.' '_')
+    local kernel_describe=$(git rev-parse --short HEAD)
+    local kernel_makeversion=$(make kernelversion)
+    export KERNEL_DESCRIBE_X15_${ver_name}=${kernel_describe}
+    export KERNEL_VERSION_X15_${ver_name}=${kernel_makeversion}
+
+    # change to ${ANDROID_ROOT} to make sure in the right directory
+    cd ${ANDROID_ROOT}
+    KERNEL_BUILD_OUT=${DIR_PUB_SRC_PRODUCT}/obj/kernel-${kernel_ver}
+
+    if ${CLEAN_UP}; then
+        make \
+            CROSS_COMPILE=${ANDROID_ROOT}/${CROSS_COMPILE} \
+            -C ${X15_KERNEL_DIR} \
+            O=${KERNEL_BUILD_OUT} \
+            mrproper
+    fi
+    make -j1 \
+        ARCH=arm \
+        CROSS_COMPILE=${ANDROID_ROOT}/${CROSS_COMPILE} \
+        -C ${X15_KERNEL_DIR} \
+        O=${KERNEL_BUILD_OUT} \
+        ti_sdk_am57x_android_release_defconfig
+    make -j$(nproc) \
+        ARCH=arm \
+        CROSS_COMPILE=${ANDROID_ROOT}/${CROSS_COMPILE} \
+        -C ${X15_KERNEL_DIR} \
+        O=${KERNEL_BUILD_OUT} \
+        zImage dtbs modules
+
+    # regenerate the android images files
+    KERNELDIR=${KERNEL_BUILD_OUT} ./android-build-configs/linaro-build.sh -tp beagle_x15 -ss
+
+    for f in ${ANDROID_IMAGE_FILES}; do
+        mv -vf ${DIR_PUB_SRC_PRODUCT}/${f} ${DIR_PUB_SRC}/${kernel_ver}-${f}
+        xz -T 0 ${DIR_PUB_SRC}/${kernel_ver}-${f}
+    done
+}
+
+#######################################
+##### compile u-boot files
+#######################################
+function build_uboot(){
+    cd ${ANDROID_ROOT}
+
+    local UBOOT_DIR=${ANDROID_ROOT}/external/u-boot
+    local UBOOT_OUT_DIR=${DIR_PUB_SRC_PRODUCT}/obj/u-boot
+
+    if ${CLEAN_UP}; then
+        rm -fr ${UBOOT_OUT_DIR} && mkdir -p ${UBOOT_OUT_DIR}
+    fi
+
+    make -j1 \
+        -C ${UBOOT_DIR} \
+        O=${UBOOT_OUT_DIR} \
+        ARCH=arm \
+        CROSS_COMPILE=${ANDROID_ROOT}/${CROSS_COMPILE} \
+        am57xx_evm_defconfig
+    make -j$(nproc) \
+        -C ${UBOOT_DIR} \
+        O=${UBOOT_OUT_DIR} \
+        ARCH=arm \
+        CROSS_COMPILE=${ANDROID_ROOT}/${CROSS_COMPILE}
+
+    cp -vf ${UBOOT_OUT_DIR}/u-boot.img ${DIR_PUB_SRC}/u-boot.img
+    cp -vf ${UBOOT_OUT_DIR}/MLO ${DIR_PUB_SRC}/MLO
+}
+
+# clean workspace to save space
+function clean_workspace(){
+    cd ${ANDROID_ROOT}
+    # Delete sources after build to save space
+    rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/
+    rm -fr libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/
+    rm -fr toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/
+    rm -fr platform_testing/ vendor/ cts/ hardware/ prebuilts/
+    rm -fr ${X15_KERNEL_DIR}
+}
+
+# export parameters for publish/job submission steps
+function export_parameters(){
+    # Publish parameters
+    cp -a ${DIR_PUB_SRC}/*-pinned-manifest.xml ${WORKSPACE}/ || true
+    echo "PUB_DEST=android/lkft/lkft-aosp-master-x15/${BUILD_NUMBER}" > ${WORKSPACE}/publish_parameters
+    echo "PUB_SRC=${DIR_PUB_SRC}" >> ${WORKSPACE}/publish_parameters
+    echo "PUB_EXTRA_INC=^[^/]+\.(xz|dtb|dtbo|zip)$|MLO|vmlinux|System.map" >> ${WORKSPACE}/publish_parameters
+
+    echo "KERNEL_DESCRIBE_X15_4_19=${KERNEL_DESCRIBE_X15_4_19}" >> ${WORKSPACE}/publish_parameters
+    echo "KERNEL_VERSION_X15_4_19=${KERNEL_VERSION_X15_4_19}" >> ${WORKSPACE}/publish_parameters
+}
+
+function main(){
+    prepare_environment
+    build_android
+
+    # download and decompress toolchain files
+    wget -c ${TOOLCHAIN_URL} -O ${TOOLCHAIN_NAME}.tar.xz
+    tar -xvf ${TOOLCHAIN_NAME}.tar.xz
+
+    build_kernel 4.19
+    build_uboot
+
+    if ${IN_JENKINS} && [ -n "${WORKSPACE}" ]; then
+        clean_workspace
+        export_parameters
+    fi
+}
+
+main "$@"
diff --git a/lkft/x15-aosp/submit_for_testing.sh b/lkft/x15-aosp/submit_for_testing.sh
new file mode 100644
index 0000000000..dff0ddc566
--- /dev/null
+++ b/lkft/x15-aosp/submit_for_testing.sh
@@ -0,0 +1,74 @@
+#!/bin/bash
+
+export DEVICE_TYPE=x15
+export LAVA_SERVER=https://lkft.validation.linaro.org/RPC2/
+export DOWNLOAD_URL=http://snapshots.linaro.org/${PUB_DEST}
+[ -z "${REFERENCE_BUILD_URL}" ] && export REFERENCE_BUILD_URL=${DOWNLOAD_URL}
+export KERNEL_COMMIT=${SRCREV_kernel}
+export VTS_VERSION=$(echo $VTS_URL | awk -F"/" '{print$(NF-1)}')
+export CTS_VERSION=$(echo $CTS_URL | awk -F"/" '{print$(NF-1)}')
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${BOOTARGS}" ] && export BOOTARGS="androidboot.serialno=\${serial#} console=ttyS2,115200 androidboot.console=ttyS2 androidboot.hardware=beagle_x15board"
+
+if [ ! -z "${KERNEL_DESCRIBE}" ]; then
+    export QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+else
+    export QA_BUILD_VERSION=${KERNEL_COMMIT:0:12}
+fi
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+if curl --output /dev/null --silent --head --fail "${REFERENCE_BUILD_URL}/vendor.img.xz"; then
+    echo "This reference build comes with a vendor partition"
+else
+    echo "No vendor partition, so flashing cache partition from the job instead"
+    sed -i "s|vendor.img.xz|cache.img.xz|g" configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+if ! test -z  "${X15_BOOT_FIT_IMG_SHA256SUM}"; then
+        export X15_BOOT_FIT_IMG_SHA256SUM
+else
+    sed -i '/X15_BOOT_FIT_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+if ! test -z  "${X15_SYSTEM_IMG_SHA256SUM}"; then
+        export X15_SYSTEM_IMG_SHA256SUM
+else
+    sed -i '/X15_SYSTEM_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+if ! test -z "${X15_VENDOR_IMG_SHA256SUM}"; then
+    export X15_VENDOR_IMG_SHA256SUM
+else
+    sed -i '/X15_VENDOR_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+if ! test -z "${USERDATA_IMG_SHA256SUM}"; then
+    export USERDATA_IMG_SHA256SUM
+else
+    sed -i '/USERDATA_IMG_SHA256SUM/d' configs/lkft/lava-job-definitions/${DEVICE_TYPE}/*.yaml
+fi
+
+python configs/openembedded-lkft/submit_for_testing.py \
+    --device-type ${DEVICE_TYPE} \
+    --build-number ${BUILD_NUMBER} \
+    --lava-server ${LAVA_SERVER} \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team android-lkft \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --git-commit ${QA_BUILD_VERSION} \
+    --testplan-path configs/lkft/lava-job-definitions/x15 \
+    --test-plan template-boot.yaml template-vts-kernel.yaml template-cts.yaml \
+    --quiet
+
+python configs/openembedded-lkft/submit_for_testing.py \
+    --device-type ${DEVICE_TYPE} \
+    --build-number ${BUILD_NUMBER} \
+    --lava-server ${LAVA_SERVER} \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team staging-lkft \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --git-commit ${QA_BUILD_VERSION} \
+    --testplan-path configs/lkft/lava-job-definitions/x15 \
+    --test-plan template-vts-staging-kernel.yaml \
+    --quiet
diff --git a/llp/publisher.sh b/llp/publisher.sh
new file mode 100755
index 0000000000..1c7801f626
--- /dev/null
+++ b/llp/publisher.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+if [ -f ${WORKSPACE}/BUILD-INFO.txt ];then
+    BUILD_INFO="--build-info ${WORKSPACE}/BUILD-INFO.txt"
+else
+    BUILD_INFO=""
+fi
+
+if [ -z "${DEPLOY_DIR_IMAGE}" ] || [ -z "${PUB_DEST}" ] || [ -z "${PUBLISH_SERVER}" ]
+then
+    echo "== missing publishing variables =="
+    echo "DEPLOY_DIR_IMAGE = ${DEPLOY_DIR_IMAGE}"
+    echo "PUB_DEST         = ${PUB_DEST}"
+    echo "PUBLISH_SERVER   = ${PUBLISH_SERVER}"
+    exit 1
+fi
+
+# Publish
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+time python3 ${HOME}/bin/linaro-cp.py \
+  --api_version 3 \
+  --link-latest \
+  --server ${PUBLISH_SERVER} \
+  ${BUILD_INFO} \
+  ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
diff --git a/lt-fujitsu-fjslt-lsk/lava-job-definitions/aa9/template.json b/lt-fujitsu-fjslt-lsk/lava-job-definitions/aa9/template.json
deleted file mode 100644
index 1bf2a1563a..0000000000
--- a/lt-fujitsu-fjslt-lsk/lava-job-definitions/aa9/template.json
+++ /dev/null
@@ -1,142 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_image",
-      "parameters": {
-        "image": "${IMAGE_URL}"
-      },
-      "metadata": {
-        "defconfig": "sni_phoenix_defconfig",
-        "distribution": "ubuntu",
-        "git branch": "fjslt-lsk-3.10",
-        "hwpack.build": "${BUILD_NUMBER}",
-        "hwpack.type": "lt-aa9",
-        "rootfs.type": "alip",
-        "ubuntu.build": "701",
-        "ubuntu.distribution": "ubuntu",
-        "ubuntu.name": "aa9"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart-install.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/bootchart.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/device-tree.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/gatortests.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/ltp.yaml"
-          }
-        ],
-        "timeout": 18000
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/network-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/perf.yaml"
-          }
-        ],
-        "timeout": 800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-              "PWR_TESTARG": "cpuidle cpuhotplug cputopology"
-            },
-            "testdef": "ubuntu/pwrmgmt.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "http://git.linaro.org/qa/test-definitions.git",
-            "testdef": "ubuntu/smoke-tests-basic.yaml"
-          }
-        ],
-        "timeout": 1200
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "server": "http://${LAVA_SERVER}",
-        "stream": "${BUNDLE_STREAM_NAME}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 18000
-}
diff --git a/lt-fujitsu-fjslt-lsk/lava-job-definitions/aa9/template.yaml b/lt-fujitsu-fjslt-lsk/lava-job-definitions/aa9/template.yaml
deleted file mode 100644
index b340bbd91b..0000000000
--- a/lt-fujitsu-fjslt-lsk/lava-job-definitions/aa9/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-actions:
-- command: deploy_linaro_image
-  parameters:
-    image: '${IMAGE_URL}'
-  metadata:
-    defconfig: 'sni_phoenix_defconfig'
-    distribution: 'ubuntu'
-    git branch: 'fjslt-lsk-3.10'
-    hwpack.build: '${BUILD_NUMBER}'
-    hwpack.type: 'lt-aa9'
-    rootfs.type: 'alip'
-    ubuntu.build: '701'
-    ubuntu.distribution: 'ubuntu'
-    ubuntu.name: 'aa9'
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/bootchart-install.yaml'
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/bootchart.yaml'
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/device-tree.yaml'
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/gatortests.yaml'
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/ltp.yaml'
-    timeout: 18000
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/network-tests-basic.yaml'
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/perf.yaml'
-    timeout: 800
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/pwrmgmt.yaml'
-      parameters:
-        PWR_TESTARG: 'cpuidle cpuhotplug cputopology'
-    timeout: 1200
-- command: lava_test_shell
-  parameters:
-    testdef_repos:
-    - git-repo: 'http://git.linaro.org/qa/test-definitions.git'
-      testdef: 'ubuntu/smoke-tests-basic.yaml'
-    timeout: 1200
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/lt-hisilicon-hix5hd2.yaml b/lt-hisilicon-hix5hd2.yaml
deleted file mode 100644
index b132aad8ba..0000000000
--- a/lt-hisilicon-hix5hd2.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-- job:
-    name: LT-HiSilicon-hix5hd2
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-    disabled: false
-    node: true
-    display-name: 'HiSilicon LT - hix5hd2'
-    scm:
-        - git:
-            url: http://git.linaro.org/git/landing-teams/working/hisilicon/kernel.git
-            refspec: +refs/heads/hix5hd2:refs/remotes/origin/hix5hd2
-            name: origin
-            branches:
-                - refs/heads/hix5hd2
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf lci-build-tools
-              rm -rf builddir*
-              rm -rf out
-              rm -rf configs
-            }
-
-            export LANG=C
-            CCACHE_DIR="$HOME/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-
-            export make_deb=false
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=hix5hd2
-            export kernel_config=hix5hd2_defconfig
-            export MAKE_DTBS=true
-            export toolchain_url="http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz"
-
-            test -d lci-build-tools || git clone https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash lci-build-tools/jenkins_kernel_build_inst
-
-            # XXX Append DTB
-            #cat out/zImage out/dtbs/hix5hd2-dkb.dtb > out/zImage-dtb
-
-            # Publish to snapshots
-            ${HOME}/bin/linaro-cp --api_version 3 out kernel-hwpack/${JOB_NAME}/${BUILD_NUMBER}
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 20G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Start LAVA dance
-            test -d configs || git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            export BUNDLE_STREAM_NAME=/public/team/hisilicon/hix5hd2/
-            export LAVA_SERVER=validation.linaro.org/RPC2/
-            export KERNEL_URL=http://snapshots.linaro.org/kernel-hwpack/${JOB_NAME}/${BUILD_NUMBER}
-            export DTB_URL=${KERNEL_URL}/dtbs
-            export ROOTFS_BUILD_URL=http://releases.linaro.org/14.11/openembedded/images/minimal-initramfs-armv7a/linaro-image-minimal-initramfs-genericarmv7a-20141121-301.rootfs.cpio.gz.u-boot
-
-            # Hack to use submit LAVA jobs directly
-            python lci-build-tools/dtb-to-device.py
-    publishers:
-        - email:
-            recipients: 'guodong.xu@linaro.org fathi.boudra@linaro.org'
diff --git a/lt-qcom-bootloader-dragonboard410c.yaml b/lt-qcom-bootloader-dragonboard410c.yaml
deleted file mode 100644
index a533ef4952..0000000000
--- a/lt-qcom-bootloader-dragonboard410c.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-- job:
-    name: lt-qcom-bootloader-dragonboard410c
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BRANCH
-            default: 'master'
-        - string:
-            name: LK_GIT_LINARO
-            default: 'https://git.linaro.org/landing-teams/working/qualcomm/lk.git'
-        - string:
-            name: LK_GCC_GIT
-            default: 'git://codeaurora.org/platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8.git'
-        - string:
-            name: LK_GCC_REL
-            default: 'LA.BR.1.1.3.c4-01000-8x16.0'
-        - string:
-            name: LK_GIT_REL_SD_RESCUE
-            default: 'release/LA.BR.1.2.7-03810-8x16.0+rescue'
-        - string:
-            name: LK_GIT_REL_SD_BOOT
-            default: 'release/LA.BR.1.2.7-03810-8x16.0+sdboot'
-        - string:
-            name: LK_GIT_REL_EMMC_BOOT
-            default: 'release/LA.BR.1.2.7-03810-8x16.0'
-        - string:
-            name: QCOM_LINUX_FIRMWARE
-            default: 'http://releases.linaro.org/96boards/dragonboard410c/qualcomm/firmware/linux-board-support-package-r1032.1.zip'
-        - string:
-            name: QCOM_LINUX_FIRMWARE_MD5
-            default: 'e1c7e8957b8f37a91cadc18c1aef5c04'
-        - string:
-            name: QCOM_LINUX_FIRMWARE_LICENSE_MD5
-            default: '4d087ee0965cb059f1b2f9429e166f64'
-        - string:
-            name: PUB_DEST
-            default: '96boards/dragonboard410c/linaro/rescue/${BUILD_NUMBER}'
-    disabled: false
-    node: docker-stretch-amd64
-    display-name: 'Qualcomm bootloader for DragonBoard 410c'
-    scm:
-        - git:
-            url: https://git.linaro.org/landing-teams/working/qualcomm/db-boot-tools.git
-            refspec: +refs/heads/${BRANCH}:refs/remotes/origin/${BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-bootloader/dragonboard410c/builders.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
-        - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org anibal.limon@linaro.org'
-            always: true
-        - ircbot:
-            channels:
-                - name: '#linaro-lt-qcomm'
-                  password: ${LT_QCOM_KEY}
diff --git a/lt-qcom-bootloader-dragonboard820c.yaml b/lt-qcom-bootloader-dragonboard820c.yaml
deleted file mode 100644
index b376809cce..0000000000
--- a/lt-qcom-bootloader-dragonboard820c.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-- job:
-    name: lt-qcom-bootloader-dragonboard820c
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BRANCH
-            default: 'master'
-        - string:
-            name: LK_GIT_LINARO
-            default: 'https://git.linaro.org/landing-teams/working/qualcomm/lk.git'
-        - string:
-            name: LK_GCC_GIT
-            default: 'git://codeaurora.org/platform/prebuilts/gcc/linux-x86/arm/arm-eabi-4.8.git'
-        - string:
-            name: LK_GCC_REL
-            default: 'LA.BR.1.1.3.c4-01000-8x16.0'
-        - string:
-            name: LK_GIT_REL_SD_RESCUE
-            default: 'release/LA.HB.1.3.2-19600-8x96.0+rescue'
-        - string:
-            name: LK_GIT_REL_UFS_BOOT
-            default: 'release/LA.HB.1.3.2-19600-8x96.0'
-        - string:
-            name: QCOM_LINUX_FIRMWARE
-            default: 'http://releases.linaro.org/96boards/dragonboard820c/qualcomm/firmware/linux-board-support-package-r01700.1.zip'
-        - string:
-            name: QCOM_LINUX_FIRMWARE_MD5
-            default: '587138c5e677342db9a88d5c8747ec6c'
-        - string:
-            name: QCOM_LINUX_FIRMWARE_LICENSE_MD5
-            default: '4d087ee0965cb059f1b2f9429e166f64'
-        - string:
-            name: PUB_DEST
-            default: '96boards/dragonboard820c/linaro/rescue/${BUILD_NUMBER}'
-    disabled: false
-    node: docker-stretch-amd64
-    display-name: 'Qualcomm bootloader for DragonBoard 820c'
-    scm:
-        - git:
-            url: https://git.linaro.org/landing-teams/working/qualcomm/db-boot-tools.git
-            refspec: +refs/heads/${BRANCH}:refs/remotes/origin/${BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-bootloader/dragonboard820c/builders.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
-        - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org anibal.limon@linaro.org'
-            always: true
-        - ircbot:
-            channels:
-                - name: '#linaro-lt-qcomm'
-                  password: ${LT_QCOM_KEY}
diff --git a/lt-qcom-bootloader/dragonboard410c/builders.sh b/lt-qcom-bootloader/dragonboard410c/builders.sh
deleted file mode 100644
index 2a327987d1..0000000000
--- a/lt-qcom-bootloader/dragonboard410c/builders.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-set -ex
-
-sudo apt-get update
-sudo apt-get install -y zip gdisk
-
-# download the firmware packages
-wget -q ${QCOM_LINUX_FIRMWARE}
-echo "${QCOM_LINUX_FIRMWARE_MD5}  $(basename ${QCOM_LINUX_FIRMWARE})" > MD5
-md5sum -c MD5
-
-unzip -j -d bootloaders-linux $(basename ${QCOM_LINUX_FIRMWARE}) "*/bootloaders-linux/*" "*/cdt-linux/*"
-
-# Get the Android compiler
-git clone ${LK_GCC_GIT} --depth 1 -b ${LK_GCC_REL} android-gcc
-
-# get the signing tools
-git clone --depth 1 https://git.linaro.org/landing-teams/working/qualcomm/signlk.git
-
-# Build all needed flavors of LK
-git clone --depth 1 ${LK_GIT_LINARO} -b ${LK_GIT_REL_SD_RESCUE} lk_sdrescue
-git clone --depth 1 ${LK_GIT_LINARO} -b ${LK_GIT_REL_SD_BOOT} lk_sd_boot
-git clone --depth 1 ${LK_GIT_LINARO} -b ${LK_GIT_REL_EMMC_BOOT} lk_emmc_boot
-
-for lk in lk_sdrescue lk_sd_boot lk_emmc_boot; do
-    echo "Building LK in : $lk"
-    cd $lk
-    git log -1
-    make -j4 msm8916 EMMC_BOOT=1 TOOLCHAIN_PREFIX=${WORKSPACE}/android-gcc/bin/arm-eabi-
-    mv build-msm8916/emmc_appsboot.mbn build-msm8916/emmc_appsboot_unsigned.mbn
-    ../signlk/signlk.sh -i=./build-msm8916/emmc_appsboot_unsigned.mbn -o=./build-msm8916/emmc_appsboot.mbn -d
-    cd -
-done
-
-SDCARD_RESCUE=dragonboard-410c-sdcard-rescue-${BUILD_NUMBER}
-BOOTLOADER_SD_LINUX=dragonboard-410c-bootloader-sd-linux-${BUILD_NUMBER}
-BOOTLOADER_EMMC_LINUX=dragonboard-410c-bootloader-emmc-linux-${BUILD_NUMBER}
-BOOTLOADER_EMMC_AOSP=dragonboard-410c-bootloader-emmc-aosp-${BUILD_NUMBER}
-
-mkdir -p out/${SDCARD_RESCUE} \
-      out/${BOOTLOADER_SD_LINUX} \
-      out/${BOOTLOADER_EMMC_LINUX} \
-      out/${BOOTLOADER_EMMC_AOSP}
-
-# get LICENSE file (for Linux BSP)
-unzip -j $(basename ${QCOM_LINUX_FIRMWARE}) "*/LICENSE"
-echo "${QCOM_LINUX_FIRMWARE_LICENSE_MD5}  LICENSE" > MD5
-md5sum -c MD5
-
-# bootloader_emmc_linux
-cp -a LICENSE \
-   dragonboard410c/linux/flashall \
-   lk_emmc_boot/build-msm8916/emmc_appsboot.mbn \
-   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,hyp.mbn,sbc_1.0_8016.bin} \
-   out/${BOOTLOADER_EMMC_LINUX}
-
-# no need to set the eMMC size here. Fastboot will patch the last partition and grow it until last sector
-sudo ./mksdcard -x -g -o gpt.img -p dragonboard410c/linux/partitions.txt
-sudo sgdisk -bgpt.bin gpt.img
-./mkgpt -d -i gpt.bin -o out/${BOOTLOADER_EMMC_LINUX}/gpt_both0.bin
-
-# bootloader_emmc_aosp
-cp -a LICENSE \
-   dragonboard410c/aosp/flashall \
-   lk_emmc_boot/build-msm8916/emmc_appsboot.mbn \
-   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,sbl1.mbn,tz.mbn,hyp.mbn,sbc_1.0_8016.bin} \
-   out/${BOOTLOADER_EMMC_AOSP}
-
-# no need to set the eMMC size here. Fastboot will patch the last partition and grow it until last sector
-sudo ./mksdcard -x -g -o gpt.img -p dragonboard410c/aosp/partitions.txt
-sudo sgdisk -bgpt.bin gpt.img
-./mkgpt -d -i gpt.bin -o out/${BOOTLOADER_EMMC_AOSP}/gpt_both0.bin
-
-# bootloader_sd_linux
-cp -a LICENSE \
-   lk_sd_boot/build-msm8916/emmc_appsboot.mbn \
-   bootloaders-linux/{NON-HLOS.bin,rpm.mbn,tz.mbn,hyp.mbn} \
-   out/${BOOTLOADER_SD_LINUX}
-
-cp -a bootloaders-linux/sbl1.sd.mbn out/${BOOTLOADER_SD_LINUX}/sbl1.mbn
-
-# sdcard_rescue
-cp -a LICENSE out/${SDCARD_RESCUE}
-sudo ./mksdcard -x -p dragonboard410c/linux/sdrescue.txt \
-     -o out/${SDCARD_RESCUE}/${SDCARD_RESCUE}.img \
-     -i lk_sdrescue/build-msm8916/ \
-     -i out/${BOOTLOADER_SD_LINUX}
-
-# Final preparation of archives for publishing
-mkdir ${WORKSPACE}/out2
-for i in ${SDCARD_RESCUE} \
-         ${BOOTLOADER_SD_LINUX} \
-         ${BOOTLOADER_EMMC_LINUX} \
-         ${BOOTLOADER_EMMC_AOSP} ; do
-    (cd out/$i && md5sum * > MD5SUMS.txt)
-    (cd out && zip -r ${WORKSPACE}/out2/$i.zip $i)
-done
-
-# Create MD5SUMS file
-(cd ${WORKSPACE}/out2 && md5sum * > MD5SUMS.txt)
-
-# Build information
-cat > ${WORKSPACE}/out2/HEADER.textile << EOF
-
-h4. Bootloaders for Dragonboard 410c
-
-This page provides the bootloaders packages for the Dragonboard 410c. There are several packages:
-* *sdcard_rescue* : an SD card image that can be used to boot from SD card, and rescue a board when the onboard eMMC is empty or corrupted
-* *bootloader-emmc-linux* : includes the bootloaders and partition table (GPT) used when booting Linux images from onboard eMMC
-* *bootloader-emmc-aosp* : includes the bootloaders and partition table (GPT) used when booting AOSP based images from onboard eMMC
-* *bootloader-sd-linux* : includes the bootloaders and partition table (GPT) used when booting Linux images from SD card
-
-Build description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* Proprietary bootloaders can be found on "Qualcomm Developer Network":https://developer.qualcomm.com/hardware/dragonboard-410c/tools
-* Linux proprietary bootloaders package: $(basename ${QCOM_LINUX_FIRMWARE})
-* Little Kernel (LK) source code:
-** "SD rescue boot":$LK_GIT_LINARO/log/?h=$(echo $LK_GIT_REL_SD_RESCUE  | sed -e 's/+/\%2b/g')
-** "SD Linux boot":$LK_GIT_LINARO/log/?h=$(echo $LK_GIT_REL_SD_BOOT | sed -e 's/+/\%2b/g')
-** "eMMC Linux boot":$LK_GIT_LINARO/log/?h=$(echo $LK_GIT_REL_EMMC_BOOT | sed -e 's/+/\%2b/g')
-* Tools version: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-EOF
-
-# Publish
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-     --server ${PUBLISH_SERVER} \
-     --link-latest \
-     ${WORKSPACE}/out2 ${PUB_DEST}
diff --git a/lt-qcom-bootloader/dragonboard820c/builders.sh b/lt-qcom-bootloader/dragonboard820c/builders.sh
deleted file mode 100644
index 5825f06e4e..0000000000
--- a/lt-qcom-bootloader/dragonboard820c/builders.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-
-sudo apt-get update
-sudo apt-get install -y zip gdisk
-
-set -ex
-
-# download the firmware packages
-wget -q ${QCOM_LINUX_FIRMWARE}
-echo "${QCOM_LINUX_FIRMWARE_MD5}  $(basename ${QCOM_LINUX_FIRMWARE})" > MD5
-md5sum -c MD5
-
-unzip -j -d bootloaders-linux $(basename ${QCOM_LINUX_FIRMWARE}) "*/bootloaders-linux/*" "*/cdt-linux/*" "*/loaders/*"
-
-# Get the Android compiler
-git clone ${LK_GCC_GIT} --depth 1 -b ${LK_GCC_REL} android-gcc
-
-# get the signing tools
-git clone --depth 1 https://git.linaro.org/landing-teams/working/qualcomm/signlk.git
-
-# Build all needed flavors of LK
-git clone --depth 1 ${LK_GIT_LINARO} -b ${LK_GIT_REL_SD_RESCUE} lk_sdrescue
-git clone --depth 1 ${LK_GIT_LINARO} -b ${LK_GIT_REL_UFS_BOOT} lk_ufs_boot
-
-for lk in lk_sdrescue lk_ufs_boot; do
-    echo "Building LK in : $lk"
-    cd $lk
-    git log -1
-    make -j4 msm8996 EMMC_BOOT=1 VERIFIED_BOOT=1 TOOLCHAIN_PREFIX=${WORKSPACE}/android-gcc/bin/arm-eabi-
-    mv build-msm8996/emmc_appsboot.mbn build-msm8996/emmc_appsboot_unsigned.mbn
-    ../signlk/signlk.sh -i=./build-msm8996/emmc_appsboot_unsigned.mbn -o=./build-msm8996/emmc_appsboot.mbn -d
-    cd -
-done
-
-SDCARD_RESCUE=dragonboard-820c-sdcard-rescue-${BUILD_NUMBER}
-BOOTLOADER_UFS_LINUX=dragonboard-820c-bootloader-ufs-linux-${BUILD_NUMBER}
-
-mkdir -p out/${SDCARD_RESCUE} out/${BOOTLOADER_UFS_LINUX}
-
-# get LICENSE file (for Linux BSP)
-unzip -j $(basename ${QCOM_LINUX_FIRMWARE}) "*/LICENSE"
-echo "${QCOM_LINUX_FIRMWARE_LICENSE_MD5}  LICENSE" > MD5
-md5sum -c MD5
-
-# bootloader_ufs_linux
-cp -a LICENSE \
-   dragonboard820c/linux/flashall \
-   lk_ufs_boot/build-msm8996/emmc_appsboot.mbn \
-   bootloaders-linux/{cmnlib64.mbn,cmnlib.mbn,devcfg.mbn,hyp.mbn,keymaster.mbn,pmic.elf,rpm.mbn,sbc_1.0_8096.bin,tz.mbn,xbl.elf} \
-   bootloaders-linux/prog_ufs_firehose_8996_ddr.elf \
-   dragonboard820c/linux/{rawprogram,patch}.xml \
-   dragonboard820c/linux/gpt_*.bin \
-   dragonboard820c/linux/zeros_*.bin \
-   dragonboard820c/ufs-provision_toshiba.xml \
-   out/${BOOTLOADER_UFS_LINUX}
-
-# sdcard_rescue
-cp -a LICENSE out/${SDCARD_RESCUE}
-sudo ./mksdcard -x -p dragonboard820c/sdrescue.txt \
-     -o out/${SDCARD_RESCUE}/${SDCARD_RESCUE}.img \
-     -i lk_sdrescue/build-msm8996/ \
-     -i bootloaders-sdboot/ \
-     -i bootloaders-linux/
-
-# Final preparation of archives for publishing
-mkdir ${WORKSPACE}/out2
-for i in ${SDCARD_RESCUE} \
-         ${BOOTLOADER_UFS_LINUX} ; do
-    (cd out/$i && md5sum * > MD5SUMS.txt)
-    (cd out && zip -r ${WORKSPACE}/out2/$i.zip $i)
-done
-
-# Create MD5SUMS file
-(cd ${WORKSPACE}/out2 && md5sum * > MD5SUMS.txt)
-
-# Build information
-cat > ${WORKSPACE}/out2/HEADER.textile << EOF
-
-h4. Bootloaders for Dragonboard 820c
-
-This page provides the bootloaders packages for the Dragonboard 820c. There are several packages:
-* *sdcard_rescue* : an SD card image that can be used to boot from SD card, and rescue a board when the onboard eMMC is empty or corrupted
-* *bootloader_ufs_linux* : includes the bootloaders and partition table (GPT) used when booting Linux images from onboard eMMC
-
-Build description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* Proprietary bootloaders are not published yet, and not available widely
-* Linux proprietary bootloaders package: $(basename ${QCOM_LINUX_FIRMWARE})
-* Little Kernel (LK) source code:
-** "SD rescue boot":$LK_GIT_LINARO/log/?h=$(echo $LK_GIT_REL_SD_RESCUE | sed -e 's/+/\%2b/g')
-** "UFS Linux boot":$LK_GIT_LINARO/log/?h=$(echo $LK_GIT_REL_UFS_BOOT | sed -e 's/+/\%2b/g')
-* Tools version: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-EOF
-
-# Publish
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-     --server ${PUBLISH_SERVER} \
-     --link-latest \
-     ${WORKSPACE}/out2 ${PUB_DEST}
diff --git a/lt-qcom-debian-images-dragonboard410c.yaml b/lt-qcom-debian-images-dragonboard410c.yaml
deleted file mode 100644
index 9d06c7f12c..0000000000
--- a/lt-qcom-debian-images-dragonboard410c.yaml
+++ /dev/null
@@ -1,129 +0,0 @@
-- job:
-    name: lt-qcom-debian-images-dragonboard410c
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: DEVICE_TYPE
-            default: 'dragonboard-410c'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://validation.linaro.org/RPC2/'
-        - string:
-            name: PMWG_LAVA_SERVER
-            default: 'https://pmwg.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: VENDOR
-            default: 'linaro'
-        - string:
-            name: OS_FLAVOUR
-            default: 'buster'
-        - string:
-            name: PLATFORM_NAME
-            default: 'dragonboard-410c'
-        - string:
-            name: FAI_BOARD_CLASS
-            default: 'DB410C'
-        - string:
-            name: ROOTFS
-            default: 'developer,1800M alip,3G installer,1500M'
-        - string:
-            name: SDCARD
-            default: 'developer,4G'
-        - string:
-            name: ROOTFS_PARTLABEL
-            default: 'rootfs'
-        - string:
-            name: DTBS
-            default: 'qcom/apq8016-sbc.dtb'
-        - string:
-            name: SERIAL_CONSOLE
-            default: 'ttyMSM0'
-        - string:
-            name: BOOTIMG_PAGESIZE
-            default: '2048'
-        - string:
-            name: PUB_DEST
-            default: "96boards/dragonboard410c/${VENDOR}/debian/${BUILD_NUMBER}"
-        - string:
-            name: BOOTIMG_BASE
-            default: '0x80000000'
-        - string:
-            name: BOOTIMG_KERNEL_OFFSET
-            default: '0x8000'
-        - string:
-            name: BOOTIMG_RAMDISK_OFFSET
-            default: '0x1000000'
-        - string:
-            name: BOOTIMG_TAGS_OFFSET
-            default: '0x100'
-        - string:
-            name: REPO_URL
-            default: 'https://git.linaro.org/ci/fai.git'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Qualcomm Debian based images for Snapdragon 410'
-    scm:
-        - git:
-            url: ${REPO_URL}
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-            - text:
-                credential-id: ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-debian-images/builders-fai.sh
-        - shell:
-            !include-raw: lt-qcom-debian-images/installer-dragonboard-410c.sh
-        - shell:
-            !include-raw: lt-qcom-debian-images/sdcard-dragonboard-410c.sh
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-debian-images/publishers.sh
-        - shell:
-            !include-raw: lt-qcom-debian-images/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-                  - openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
-        - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org qa-team@linaro.org anibal.limon@linaro.org'
-            always: true
-        - ircbot:
-            channels:
-                - name: '#linaro-lt-qcomm'
-                  password: ${LT_QCOM_KEY}
diff --git a/lt-qcom-debian-images-dragonboard600c.yaml b/lt-qcom-debian-images-dragonboard600c.yaml
deleted file mode 100644
index 9e531f31df..0000000000
--- a/lt-qcom-debian-images-dragonboard600c.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-- job:
-    name: lt-qcom-debian-images-dragonboard600c
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: VENDOR
-            default: 'linaro'
-        - string:
-            name: OS_FLAVOUR
-            default: 'buster'
-        - string:
-            name: PLATFORM_NAME
-            default: 'dragonboard-600c'
-        - string:
-            name: FAI_BOARD_CLASS
-            default: 'DB600C'
-        - string:
-            name: ROOTFS
-            default: 'developer,1800M alip,3G'
-        - string:
-            name: ROOTFS_PARTLABEL
-            default: 'userdata'
-        - string:
-            name: DTBS
-            default: 'qcom-apq8064-arrow-sd-600eval.dtb'
-        - string:
-            name: SERIAL_CONSOLE
-            default: 'ttyMSM0'
-        - string:
-            name: BOOTIMG_PAGESIZE
-            default: '2048'
-        - string:
-            name: PUB_DEST
-            default: "96boards/dragonboard600c/${VENDOR}/debian/${BUILD_NUMBER}"
-        - string:
-            name: BOOTIMG_BASE
-            default: '0x80000000'
-        - string:
-            name: BOOTIMG_KERNEL_OFFSET
-            default: '0x208000'
-        - string:
-            name: BOOTIMG_RAMDISK_OFFSET
-            default: '0x3000000'
-        - string:
-            name: BOOTIMG_TAGS_OFFSET
-            default: '0x200100'
-        - string:
-            name: REPO_URL
-            default: 'https://git.linaro.org/ci/fai.git'
-    disabled: false
-    node: docker-stretch-armhf
-    display-name: 'Qualcomm Debian based images for Snapdragon 600'
-    scm:
-        - git:
-            url: ${REPO_URL}
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-debian-images/builders-fai.sh
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-debian-images/publishers.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
-        - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org anibal.limon@linaro.org'
-            always: true
-        - ircbot:
-            channels:
-                - name: '#linaro-lt-qcomm'
-                  password: ${LT_QCOM_KEY}
diff --git a/lt-qcom-debian-images-dragonboard820c.yaml b/lt-qcom-debian-images-dragonboard820c.yaml
deleted file mode 100644
index 1913adfbc0..0000000000
--- a/lt-qcom-debian-images-dragonboard820c.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-- job:
-    name: lt-qcom-debian-images-dragonboard820c
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: VENDOR
-            default: 'linaro'
-        - string:
-            name: OS_FLAVOUR
-            default: 'buster'
-        - string:
-            name: PLATFORM_NAME
-            default: 'dragonboard-820c'
-        - string:
-            name: FAI_BOARD_CLASS
-            default: 'DB820C'
-        - string:
-            name: ROOTFS
-            default: 'developer,1800M alip,3G'
-        - string:
-            name: ROOTFS_PARTLABEL
-            default: 'rootfs'
-        - string:
-            name: DTBS
-            default: 'qcom/apq8096-db820c.dtb'
-        - string:
-            name: SERIAL_CONSOLE
-            default: 'ttyMSM0'
-        - string:
-            name: BOOTIMG_PAGESIZE
-            default: '4096'
-        - string:
-            name: PUB_DEST
-            default: "96boards/dragonboard820c/${VENDOR}/debian/${BUILD_NUMBER}"
-        - string:
-            name: BOOTIMG_BASE
-            default: '0x80000000'
-        - string:
-            name: BOOTIMG_KERNEL_OFFSET
-            default: '0x8000'
-        - string:
-            name: BOOTIMG_RAMDISK_OFFSET
-            default: '0x1000000'
-        - string:
-            name: BOOTIMG_TAGS_OFFSET
-            default: '0x100'
-        - string:
-            name: REPO_URL
-            default: 'https://git.linaro.org/ci/fai.git'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Qualcomm Debian based images for Snapdragon 820'
-    scm:
-        - git:
-            url: ${REPO_URL}
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-debian-images/builders-fai.sh
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-debian-images/publishers.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
-        - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org qa-team@linaro.org anibal.limon@linaro.org'
-            always: true
-        - ircbot:
-            channels:
-                - name: '#linaro-lt-qcomm'
-                  password: ${LT_QCOM_KEY}
diff --git a/lt-qcom-debian-images/builders-fai.sh b/lt-qcom-debian-images/builders-fai.sh
deleted file mode 100644
index cf2c6e25ca..0000000000
--- a/lt-qcom-debian-images/builders-fai.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
-  echo "INFO: apt update error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
-fi
-pkg_list="python-pip fai-server fai-setup-storage qemu-utils procps mtools pigz zip android-tools-fsutils android-tools-mkbootimg"
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
-  echo "INFO: apt install error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
-fi
-
-set -ex
-
-# Build information
-mkdir -p out
-cat > out/HEADER.textile << EOF
-
-h4. QCOM Landing Team - $BUILD_DISPLAY_NAME
-
-Build description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* OS flavour: $OS_FLAVOUR
-* FAI: "$GIT_URL":$GIT_URL
-* FAI commit: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-EOF
-
-sudo mount -t tmpfs tmpfs /tmp
-
-# dumb utility to parse dpkg -l output
-wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/lt-qcom-debian-images/debpkgdiff.py
-
-for rootfs in ${ROOTFS}; do
-
-    rootfs_sz=$(echo $rootfs | cut -f2 -d,)
-    rootfs=$(echo $rootfs | cut -f1 -d,)
-
-    sudo fai-diskimage -v --cspace $(pwd) \
-         --hostname linaro-${rootfs} \
-         -S ${rootfs_sz} \
-         --class $(echo SAVECACHE,${OS_FLAVOUR},DEBIAN,LINARO,QCOM,${rootfs},${FAI_BOARD_CLASS},RAW | tr '[:lower:]' '[:upper:]') \
-         /tmp/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.raw
-
-    sudo cp /var/log/fai/linaro-${rootfs}/last/fai.log fai-${rootfs}.log
-    if grep -E '^(ERROR:|WARNING: These unknown packages are removed from the installation list|Exit code task_)' fai-${rootfs}.log
-    then
-        echo "Errors during build"
-        rm -rf out/
-        exit 1
-    fi
-
-    rootfs_sz_real=$(du -h /tmp/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.raw | cut -f1)
-
-    # make sure that there are the same for all images, in case we build more than 1 image
-    if [ -f MD5SUM ]; then
-        md5sum -c MD5SUM
-    else
-        md5sum out/{vmlinuz-*,config-*,$(basename ${DTBS})} > MD5SUM
-    fi
-
-    img2simg /tmp/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.raw out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img
-    sudo rm -f /tmp/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.raw
-
-    # Compress image(s)
-    pigz -9 out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img
-
-    # dpkg -l output
-    mv out/packages.txt out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.packages
-
-    # record changes since last build, if available
-    if wget -q ${PUBLISH_SERVER}$(dirname ${PUB_DEST})/latest/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-*.packages -O last-build.packages; then
-        echo -e "=== Packages changes for ${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}\n" >> out/build-changes.txt
-        python debpkgdiff.py last-build.packages out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.packages >> out/build-changes.txt
-        echo >> out/build-changes.txt
-    else
-        echo "latest build published does not have packages list, skipping diff report"
-    fi
-
-    cat >> out/HEADER.textile << EOF
-* Linaro Debian ${rootfs}: size: ${rootfs_sz_real}
-EOF
-done
-
-# Record info about kernel, there can be multiple .packages files, but we have already checked that kernel version is the same. so pick one.
-kernel_binpkg=$(grep -h linux-image out/${VENDOR}-${OS_FLAVOUR}-*-${PLATFORM_NAME}-${BUILD_NUMBER}.packages | sed 's/\s\s*/ /g' | cut -d ' ' -f2 | uniq)
-kernel_pkgver=$(grep -h linux-image out/${VENDOR}-${OS_FLAVOUR}-*-${PLATFORM_NAME}-${BUILD_NUMBER}.packages | sed 's/\s\s*/ /g' | cut -d ' ' -f3 | uniq)
-
-# record kernel config changes since last build, if available
-if wget -q ${PUBLISH_SERVER}$(dirname ${PUB_DEST})/latest/config-* -O last-build.config; then
-    echo -e "=== Changes for kernel config\n" >> out/build-changes.txt
-    diff -su last-build.config out/config-* >> out/build-changes.txt || true
-    echo >> out/build-changes.txt
-else
-    echo "latest build published does not have kernel config, skipping diff report"
-fi
-
-# the space after pre.. tag is on purpose
-if [ -f out/build-changes.txt ]; then
-    cat > out/README.textile << EOF
-
-h4. Build changes
-
-pre.. 
-EOF
-    cat out/build-changes.txt >> out/README.textile
-else
-    cat > out/README.textile << EOF
-
-h4. No build changes
-EOF
-fi
-
-cat >> out/HEADER.textile << EOF
-* Kernel package name: ${kernel_binpkg}
-* Kernel package version: ${kernel_pkgver}
-EOF
-
-# Create boot image
-cat out/vmlinuz-* out/$(basename ${DTBS}) > Image.gz+dtb
-mkbootimg \
-    --kernel Image.gz+dtb \
-    --ramdisk out/initrd.img-* \
-    --output out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img \
-    --pagesize "${BOOTIMG_PAGESIZE}" \
-    --base "${BOOTIMG_BASE}" \
-    --kernel_offset "${BOOTIMG_KERNEL_OFFSET}" \
-    --ramdisk_offset "${BOOTIMG_RAMDISK_OFFSET}" \
-    --tags_offset "${BOOTIMG_TAGS_OFFSET}" \
-    --cmdline "root=/dev/disk/by-partlabel/${ROOTFS_PARTLABEL} rw rootwait console=tty0 console=${SERIAL_CONSOLE},115200n8"
-pigz -9 out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img
diff --git a/lt-qcom-debian-images/debpkgdiff.py b/lt-qcom-debian-images/debpkgdiff.py
deleted file mode 100644
index 7ca236332a..0000000000
--- a/lt-qcom-debian-images/debpkgdiff.py
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/python
-
-import re
-import sys
-
-def read_dpkgfile(file):
-    d = {}
-    with open(file) as f:
-        for line in f:
-            line = " ".join(line.split())
-            m = re.search('^ii (\S+) (\S+).*', line)
-            if m:
-                d[m.group(1)] = m.group(2)
-    return d
-
-def main():
-
-    c = []
-    r = []
-    a = []
-
-    d1 = read_dpkgfile(sys.argv[1])
-    d2 = read_dpkgfile(sys.argv[2])
-
-    for pkg in d1.keys():
-        if pkg in d2:
-            if d1[pkg] != d2[pkg]:
-                c.append("%s from %s to %s" % (pkg, d1[pkg], d2[pkg]))
-
-            del d2[pkg]
-        else:
-            r.append("%s (%s)" % (pkg, d1[pkg]))
-
-    for pkg in d2.keys():
-        a.append("%s (%s)" % (pkg, d2[pkg]))
-
-    if len(a)+len(r)+len(c) == 0:
-        print("Files %s and %s are identical" % (sys.argv[1], sys.argv[2]))
-    else:
-        if len(a):
-            print("Added packages:")
-            for line in sorted(a):
-                print('\t'+line)
-            print("")
-        if len (c):
-            print("Changed packages:")
-            for line in sorted(c):
-                print('\t'+line)
-            print("")
-        if len(r):
-            print("Removed packages:")
-            for line in sorted(r):
-                print('\t'+line)
-
-if __name__ == "__main__":
-    main()
diff --git a/lt-qcom-debian-images/installer-dragonboard-410c.sh b/lt-qcom-debian-images/installer-dragonboard-410c.sh
deleted file mode 100644
index 69a74522c4..0000000000
--- a/lt-qcom-debian-images/installer-dragonboard-410c.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    # cleanup here, only in case of error in this script
-    # normal cleanup deferred to later
-    [ $? = 0 ] && exit;
-    cd ${WORKSPACE}
-    sudo git clean -fdxq
-}
-
-# Create boot image for SD installer
-mkbootimg \
-    --kernel Image.gz+dtb \
-    --ramdisk out/initrd.img-* \
-    --output out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img \
-    --pagesize "${BOOTIMG_PAGESIZE}" \
-    --base "0x80000000" \
-    --cmdline "root=/dev/mmcblk1p8 rw rootwait console=${SERIAL_CONSOLE},115200n8"
-gzip -9 out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img
-
-rm -rf db-boot-tools
-git clone --depth 1 -b master https://git.linaro.org/landing-teams/working/qualcomm/db-boot-tools.git
-# record commit info in build log
-cd db-boot-tools
-git log -1
-
-# Get SD and EMMC bootloader package
-BL_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/lt-qcom-bootloader-dragonboard410c/lastSuccessfulBuild/buildNumber`
-wget --progress=dot -e dotbytes=2M \
-     http://snapshots.linaro.org/96boards/dragonboard410c/linaro/rescue/${BL_BUILD_NUMBER}/dragonboard-410c-bootloader-sd-linux-${BL_BUILD_NUMBER}.zip
-wget --progress=dot -e dotbytes=2M \
-     http://snapshots.linaro.org/96boards/dragonboard410c/linaro/rescue/${BL_BUILD_NUMBER}/dragonboard-410c-bootloader-emmc-linux-${BL_BUILD_NUMBER}.zip
-
-unzip -jd out dragonboard-410c-bootloader-sd-linux-${BL_BUILD_NUMBER}.zip
-cp ${WORKSPACE}/out/boot-installer-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz out/boot.img.gz
-cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-installer-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz out/rootfs.img.gz
-gunzip out/{boot,rootfs}.img.gz
-
-mkdir -p os/debian
-cp ${WORKSPACE}/out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz os/debian/boot.img.gz
-cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz os/debian/rootfs.img.gz
-gunzip os/debian/{boot,rootfs}.img.gz
-
-cat << EOF >> os/debian/os.json
-{
-"name": "Linaro Linux Desktop for DragonBoard 410c - Build #${BUILD_NUMBER}",
-"url": "http://releases.linaro.org/96boards/dragonboard410c",
-"version": "${BUILD_NUMBER}",
-"release_date": "`date +%Y-%m-%d`",
-"description": "Linaro Linux with LXQt desktop based on Debian (${OS_FLAVOUR}) for DragonBoard 410c"
-}
-EOF
-
-cp mksdcard flash os/
-cp dragonboard410c/linux/partitions.txt os/debian
-unzip -jd os/debian dragonboard-410c-bootloader-emmc-linux-${BL_BUILD_NUMBER}.zip
-
-# get size of OS partition
-size_os=$(du -sk os | cut -f1)
-size_os=$(((($size_os + 1024 - 1) / 1024) * 1024))
-size_os=$(($size_os + 200*1024))
-# pad for SD image size (including rootfs and bootloaders, as per partition table)
-size_pad=$(sudo ./mksdcard -p dragonboard410c/linux/installer.txt -n -g | grep "Create file with size" | cut -f7 -d' ')
-size_pad=$(((($size_pad + 1024 - 1) / 1024) * 1024))
-size_img=$(($size_os + $size_pad))
-
-# create OS image
-SDCARD=${PLATFORM_NAME}-sdcard-installer-${OS_FLAVOUR}-${BUILD_NUMBER}
-mkdir -p ${SDCARD}
-
-sudo rm -f out/os.img
-sudo mkfs.fat -a -F32 -n "OS" -C out/os.img $size_os
-mkdir -p mnt
-sudo mount -o loop out/os.img mnt
-sudo cp -r os/* mnt/
-sudo umount mnt
-sudo ./mksdcard -p dragonboard410c/linux/installer.txt -s $size_img -i out -o ${SDCARD}/${SDCARD}.img
-
-# create archive for publishing
-cp out/LICENSE ${SDCARD}/
-zip -r ${WORKSPACE}/out/${SDCARD}.zip ${SDCARD}
-cd ..
diff --git a/lt-qcom-debian-images/postbuild.groovy b/lt-qcom-debian-images/postbuild.groovy
deleted file mode 100644
index eae9007ca7..0000000000
--- a/lt-qcom-debian-images/postbuild.groovy
+++ /dev/null
@@ -1,8 +0,0 @@
-if (manager.build.result == hudson.model.Result.SUCCESS) {
-  def publish_server = manager.envVars["PUBLISH_SERVER"]
-  def pub_dest = manager.envVars["PUB_DEST"]
-
-  def desc = "&nbsp;<a href='${publish_server}${pub_dest}'>Build location<t/a><br />"
-
-  manager.build.setDescription(desc)
-}
diff --git a/lt-qcom-debian-images/publishers.sh b/lt-qcom-debian-images/publishers.sh
deleted file mode 100644
index f13ce26adb..0000000000
--- a/lt-qcom-debian-images/publishers.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-set -ex
-trap cleanup_exit INT TERM EXIT
-cleanup_exit()
-{
-    # cleanup here, only in case of error in this script
-    # normal cleanup deferred to later
-    [ $? = 0 ] && exit;
-    sudo git clean -fdxq
-}
-
-# Create MD5SUMS file
-(cd out && md5sum * > MD5SUMS.txt)
-
-wget -q ${BUILD_URL}consoleText -O out/build-log-$(echo ${JOB_NAME}|sed -e 's/[^A-Za-z0-9._-]/_/g')-${BUILD_NUMBER}.txt
-
-# Publish to snapshots
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-     --server ${PUBLISH_SERVER} \
-     --link-latest \
-     out ${PUB_DEST}
diff --git a/lt-qcom-debian-images/sdcard-dragonboard-410c.sh b/lt-qcom-debian-images/sdcard-dragonboard-410c.sh
deleted file mode 100644
index 51aa4273a1..0000000000
--- a/lt-qcom-debian-images/sdcard-dragonboard-410c.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    # cleanup here, only in case of error in this script
-    # normal cleanup deferred to later
-    [ $? = 0 ] && exit;
-    cd ${WORKSPACE}
-    sudo git clean -fdxq
-}
-
-# Create boot image for SD boot
-mkbootimg \
-    --kernel Image.gz+dtb \
-    --ramdisk out/initrd.img-* \
-    --output out/boot-sdcard-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img \
-    --pagesize "${BOOTIMG_PAGESIZE}" \
-    --base "0x80000000" \
-    --cmdline "root=/dev/mmcblk1p9 rw rootwait console=${SERIAL_CONSOLE},115200n8"
-gzip -9 out/boot-sdcard-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img
-
-rm -rf db-boot-tools
-git clone --depth 1 -b master https://git.linaro.org/landing-teams/working/qualcomm/db-boot-tools.git
-# record commit info in build log
-cd db-boot-tools
-git log -1
-
-# Get SD bootloader package
-BL_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/lt-qcom-bootloader-dragonboard410c/lastSuccessfulBuild/buildNumber`
-wget --progress=dot -e dotbytes=2M \
-     http://snapshots.linaro.org/96boards/dragonboard410c/linaro/rescue/${BL_BUILD_NUMBER}/dragonboard-410c-bootloader-sd-linux-${BL_BUILD_NUMBER}.zip
-
-unzip -jd out dragonboard-410c-bootloader-sd-linux-${BL_BUILD_NUMBER}.zip
-cp ${WORKSPACE}/out/boot-sdcard-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz out/boot.img.gz
-gunzip out/boot.img.gz
-
-for rootfs in ${SDCARD}; do
-    sz=$(echo $rootfs | cut -f2 -d,)
-    rootfs=$(echo $rootfs | cut -f1 -d,)
-
-    rm -f out/rootfs.img out/rootfs.img.gz
-    cp ${WORKSPACE}/out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz out/rootfs.img.gz
-    gunzip out/rootfs.img.gz
-
-    SDCARD=${PLATFORM_NAME}-sdcard-${rootfs}-${OS_FLAVOUR}-${BUILD_NUMBER}
-    mkdir -p ${SDCARD}
-    sudo ./mksdcard -p dragonboard410c/linux/sdcard.txt -s $sz -i out -o ${SDCARD}/${SDCARD}.img
-
-    # create archive for publishing
-    cp out/LICENSE ${SDCARD}/
-    zip -r ${WORKSPACE}/out/${SDCARD}.zip ${SDCARD}
-done
-
-cd ..
diff --git a/lt-qcom-debian-images/submit_for_testing.sh b/lt-qcom-debian-images/submit_for_testing.sh
deleted file mode 100755
index 7a29e8c266..0000000000
--- a/lt-qcom-debian-images/submit_for_testing.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-rm -rf configs
-git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-# main parameters
-export DEPLOY_OS=debian
-export OS_INFO=debian-${OS_FLAVOUR}
-export BOOT_OS_PROMPT=\'root@linaro-alip:~#\'
-
-# boot and rootfs parameters
-export BOOT_URL=${PUBLISH_SERVER}${PUB_DEST}/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz
-export BOOT_URL_COMP="gz"
-export LXC_BOOT_FILE=$(basename ${BOOT_URL} .gz)
-export ROOTFS_URL=${PUBLISH_SERVER}${PUB_DEST}/${VENDOR}-${OS_FLAVOUR}-alip-${PLATFORM_NAME}-${BUILD_NUMBER}.img.gz
-export ROOTFS_URL_COMP="gz"
-export LXC_ROOTFS_FILE=$(basename ${ROOTFS_URL} .gz)
-
-# XXX: the debian rootfs images are build small as possible, resize
-# to be able install LAVA test overlay
-export RESIZE_ROOTFS=True
-
-# Install jinja2-cli and ruamel.yaml, required by submit_for_testing.py
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
-
-python configs/openembedded-lkft/submit_for_testing.py \
-    --device-type ${DEVICE_TYPE} \
-    --build-number ${BUILD_NUMBER} \
-    --lava-server ${LAVA_SERVER} \
-    --qa-server ${QA_SERVER} \
-    --qa-server-team qcomlt \
-    --qa-server-project ${OS_INFO} \
-    --git-commit ${BUILD_NUMBER} \
-    --template-path configs/lt-qcom/lava-job-definitions \
-    --template-base-pre base_template.yaml \
-    --template-names template.yaml template-wifi.yaml template-bt.yaml
-
-# Submit to PMWG Lava server because it has special hw to do energy probes
-python configs/openembedded-lkft/submit_for_testing.py \
-    --device-type ${DEVICE_TYPE} \
-    --build-number ${BUILD_NUMBER} \
-    --lava-server ${PMWG_LAVA_SERVER} \
-    --qa-server ${QA_SERVER} \
-    --qa-server-team qcomlt \
-    --qa-server-project ${OS_INFO} \
-    --git-commit ${BUILD_NUMBER} \
-    --template-path configs/lt-qcom/lava-job-definitions \
-    --template-base-pre base_template.yaml \
-    --template-names template-pmwg.yaml
diff --git a/lt-qcom-linux-aosp.yaml b/lt-qcom-linux-aosp.yaml
deleted file mode 100644
index cf36d729c6..0000000000
--- a/lt-qcom-linux-aosp.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-- job:
-    name: lt-qcom-linux-aosp
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_REPO_URL
-            default: 'https://git.linaro.org/landing-teams/working/qualcomm/kernel.git'
-        - string:
-            name: KERNEL_CONFIGS_arm64
-            default: 'qcom_defconfig android-base.config android-recommended.config'
-        - string:
-            name: KERNEL_BUILD_TARGET
-            default: 'all'
-        - string:
-            name: PUB_DEST
-            default: "96boards/dragonboard410c/linaro/aosp/kernel/${BUILD_NUMBER}"
-        - string:
-            name: KERNEL_DTBS
-            default: 'qcom/apq8016-sbc.dtb'
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://snapshots.linaro.org/android/robher-aosp-gendev/413/db410c-userdebug/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linaro-qcomlt-4.14-aosp'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: KERNEL_VERSION
-        - string:
-            name: KERNEL_BRANCH
-            default: 'release/android/qcomlt-4.14'
-    disabled: false
-    node: master
-    display-name: 'Qualcomm LT Linux kernel build for AOSP'
-    axes:
-        - axis:
-            type: user-defined
-            name: ARCH
-            values:
-                - arm64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    scm:
-        - git:
-            url: ${KERNEL_REPO_URL}
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_BRANCH}
-            basedir: linux
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-            sudo apt-get update
-            sudo apt-get install -y ccache bc kmod cpio python-pip
-            pip install --user --force-reinstall ruamel.yaml
-            pip install --user --force-reinstall Jinja2
-        - shell:
-            !include-raw: lt-qcom-linux/builders.sh
-        - shell:
-            !include-raw: lt-qcom-linux-aosp/package-aosp-bootimage.sh
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-linux/publishers.sh
-        - shell:
-            !include-raw: lt-qcom-linux-aosp/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-        - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org todor.tomov@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/lt-qcom-linux-aosp/lava-job-definitions/dragonboard410c/template-boot.yaml b/lt-qcom-linux-aosp/lava-job-definitions/dragonboard410c/template-boot.yaml
deleted file mode 100644
index 9eec37f2bb..0000000000
--- a/lt-qcom-linux-aosp/lava-job-definitions/dragonboard410c/template-boot.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-device_type: db410c-android
-job_name: db410c-android
-
-timeouts:
-  job:
-    minutes: 540
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  android.build: "${BUILD_NUMBER}"
-  android.name: "${JOB_NAME}"
-  android.url: "${BUILD_URL}"
-  git branch: "${KERNEL_BRANCH}"
-  git repo: "${KERNEL_REPO}"
-  git commit: "${KERNEL_COMMIT}"
-  git describe: "${KERNEL_DESCRIBE}"
-  build-url: "${BUILD_URL}"
-  series: qcomlt
-
-protocols:
-  lava-lxc:
-    name: lxc-db410c-test
-    distribution: ubuntu
-    release: xenial
-    arch: amd64
-    verbose: true
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - root@(.*):/#
-    - :/
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: Install fastboot provided by google
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 15
-    to: fastboot
-    namespace: droid
-    images:
-      boot:
-        url: ${DOWNLOAD_URL}/boot-db410c.img
-      system:
-        url: ${REFERENCE_BUILD_URL}/system.img
-      userdata:
-        url: ${REFERENCE_BUILD_URL}/userdata.img
-      cache:
-        url: ${REFERENCE_BUILD_URL}/cache.img
-    os: debian
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: droid
-    prompts:
-    - root@(.*):/#
-    - :/
-    timeout:
-      minutes: 15
-    method: fastboot
diff --git a/lt-qcom-linux-aosp/package-aosp-bootimage.sh b/lt-qcom-linux-aosp/package-aosp-bootimage.sh
deleted file mode 100644
index 12c044f30d..0000000000
--- a/lt-qcom-linux-aosp/package-aosp-bootimage.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash -xe
-
-cat ${WORKSPACE}/linux/arch/${ARCH}/boot/Image.gz ${WORKSPACE}/linux/arch/${ARCH}/boot/dts/qcom/apq8016-sbc.dtb > Image.gz-dtb
-wget -q https://android-git.linaro.org/platform/system/core.git/plain/mkbootimg/mkbootimg -O mkbootimg
-wget -q ${REFERENCE_BUILD_URL}/ramdisk.img -O ramdisk.img
-python mkbootimg --kernel Image.gz-dtb --ramdisk ramdisk.img --output boot-db410c.img --pagesize 2048 --base 0x80000000 --cmdline 'androidboot.selinux=permissive firmware_class.path=/system/vendor/firmware/'
diff --git a/lt-qcom-linux-aosp/submit_for_testing.sh b/lt-qcom-linux-aosp/submit_for_testing.sh
deleted file mode 100644
index 94a8c2bb88..0000000000
--- a/lt-qcom-linux-aosp/submit_for_testing.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# export VTS_URL=https://snapshots.linaro.org/${PUB_DEST}
-# export CTS_URL=https://snapshots.linaro.org/${PUB_DEST}
-export DEVICE_TYPE=dragonboard410c
-export LAVA_SERVER=https://validation.linaro.org/RPC2/
-export DOWNLOAD_URL=https://snapshots.linaro.org/96boards/dragonboard410c/linaro/aosp/kernel/${BUILD_NUMBER}
-export REFERENCE_BUILD_URL=${REFERENCE_BUILD_URL}
-export KERNEL_COMMIT=${KERNEL_VERSION}
-export KERNEL_BRANCH=${KERNEL_BRANCH}
-export KERNEL_REPO=${KERNEL_REPO_URL}
-export ANDROID_VERSION=aosp-master
-# export VTS_VERSION=$(echo $VTS_URL | awk -F"/" '{print$(NF-1)}')
-# export CTS_VERSION=$(echo $CTS_URL | awk -F"/" '{print$(NF-1)}')
-export QA_BUILD_VERSION=${BUILD_NUMBER}
-
-rm -rf configs
-git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-python configs/openembedded-lkft/submit_for_testing.py \
-    --device-type ${DEVICE_TYPE} \
-    --build-number ${BUILD_NUMBER} \
-    --lava-server ${LAVA_SERVER} \
-    --qa-server ${QA_SERVER} \
-    --qa-server-team qcomlt \
-    --qa-server-project ${QA_SERVER_PROJECT} \
-    --git-commit ${QA_BUILD_VERSION} \
-    --template-path configs/lt-qcom-linux-aosp/lava-job-definitions/ \
-    --template-names template-boot.yaml \
-    --quiet
diff --git a/lt-qcom-linux-integration.yaml b/lt-qcom-linux-integration.yaml
deleted file mode 100644
index f86bb9beaf..0000000000
--- a/lt-qcom-linux-integration.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-- job:
-    name: lt-qcom-linux-integration
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: KERNEL_IMAGE_URL
-            default: ''
-        - string:
-            name: KERNEL_DT_URL
-            default: ''
-        - string:
-            name: KERNEL_MODULES_URL
-            default: ''
-        - string:
-            name: ROOTFS_URL
-            default: ''
-        - string:
-            name: PUB_DEST
-            default: "96boards/${MACHINE}/linaro/linux-integration/${BUILD_NUMBER}"
-        - string:
-            name: LAVA_SERVER
-            default: 'https://validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-    disabled: false
-    node: master
-    display-name: 'Qualcomm LT Linux Integration kernel build'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard410c'
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell:
-            !include-raw: lt-qcom-linux-integration/builders-deps.sh
-        - shell: |
-            #!/bin/bash
-
-            # Set builder.sh configuration per MACHINE
-            case "${MACHINE}" in
-              dragonboard410c)
-                echo 'BOOTIMG_PAGESIZE=2048' >> builders_in_parameters
-                echo 'BOOTIMG_BASE=0x80000000' >> builders_in_parameters
-                echo 'RAMDISK_BASE=0x84000000' >> builders_in_parameters
-                echo 'ROOTFS_PARTITION=/dev/mmcblk0p10' >> builders_in_parameters
-                echo 'SERIAL_CONSOLE=ttyMSM0' >> builders_in_parameters
-                ;;
-              *)
-                echo "Currently MACHINE: ${MACHINE} isn't supported"
-                exit 1
-                ;;
-            esac
-        - inject:
-            properties-file: builders_in_parameters
-        - shell:
-            !include-raw: lt-qcom-linux-integration/builders.sh
-        - inject:
-            properties-file: builders_out_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: lt-qcom-linux-integration/publishers.sh
-        - shell:
-            !include-raw: lt-qcom-linux-integration/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email:
-            recipients: 'anibal.limon@linaro.org'
-        - email-ext:
-            recipients: 'anibal.limon@linaro.org nicolas.dechesne@linaro.org'
-            always: true
-            matrix-trigger: only-parent
-        - ircbot:
-            channels:
-                - name: '#linaro-lt-qcomm'
-                  password: ${LT_QCOM_KEY}
diff --git a/lt-qcom-linux-integration/builders-deps.sh b/lt-qcom-linux-integration/builders-deps.sh
deleted file mode 100644
index b6ca89f81a..0000000000
--- a/lt-qcom-linux-integration/builders-deps.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
-	echo "INFO: apt update error - try again in a moment"
-	sleep 15
-	sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
-fi
-
-pkg_list="tar gzip pigz cpio xz-utils wget skales e2fsprogs simg2img img2simg python-pip"
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
-	echo "INFO: apt install error - try again in a moment"
-	sleep 15
-	sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
-fi
-
-sudo mount -t tmpfs tmpfs /tmp
-
-export GZ=pigz
diff --git a/lt-qcom-linux-integration/builders.sh b/lt-qcom-linux-integration/builders.sh
deleted file mode 100755
index 71b8346579..0000000000
--- a/lt-qcom-linux-integration/builders.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/bash
-
-set -x
-
-wget_error() {
-	wget $1 -P out/
-	retcode=$?
-	if [ $retcode -ne 0 ]; then
-		exit $retcode
-	fi
-}
-
-# Set default tools to use
-if [ -z "${GZ}" ]; then
-	export GZ=gzip
-fi
-
-# Validate required parameters
-if [ -z "${KERNEL_IMAGE_URL}" ]; then
-	echo "ERROR: KERNEL_IMAGE_URL is empty"
-	exit 1
-fi
-if [ -z "${ROOTFS_URL}" ]; then
-	echo "ERROR: ROOTFS_URL is empty"
-	exit 1
-fi
-
-# Build information
-mkdir -p out
-cat > out/HEADER.textile << EOF
-
-h4. QCOM Landing Team - $BUILD_DISPLAY_NAME
-
-Build description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* Kernel image URL: $KERNEL_IMAGE_URL
-* Kernel dt URL: $KERNEL_DT_URL
-* kernel modules URL: $KERNEL_MODULES_URL
-* Rootfs URL: $ROOTFS_URL
-EOF
-
-# Rootfs image, modules populate
-wget_error ${ROOTFS_URL}
-if [[ ! -z "${KERNEL_MODULES_URL}" ]]; then
-	wget_error ${KERNEL_MODULES_URL}
-fi
-rootfs_file=out/$(basename ${ROOTFS_URL})
-rootfs_file_type=$(file $rootfs_file)
-
-rootfs_comp=''
-if [[ $rootfs_file_type = *"gzip compressed data"* ]]; then
-	${GZ} -d $rootfs_file
-	rootfs_file=out/$(basename ${ROOTFS_URL} .gz)
-	rootfs_file_type=$(file $rootfs_file)
-	rootfs_comp='gz'
-fi
-
-if [[ $rootfs_file_type = *"Android sparse image"* ]]; then
-	rootfs_file_ext4=out/$(basename ${rootfs_file} .img).ext4
-	simg2img $rootfs_file $rootfs_file_ext4
-	rootfs_file=$rootfs_file_ext4
-elif [[ $rootfs_file_type = *"ext4 filesystem data"* ]]; then
-	rootfs_file=$rootfs_file
-elif [[ $rootfs_file_type = *"cpio archive"* ]]; then
-	rootfs_file=$rootfs_file
-else
-	echo "ERROR: ROOTFS_IMAGE type isn't supported: $rootfs_file_type"
-	exit 1
-fi
-
-if [[ ! -z "${KERNEL_MODULES_URL}" ]]; then
-	if [[ $rootfs_file_type = *"cpio archive"* ]]; then
-		modules_file=out/$(basename ${KERNEL_MODULES_URL})
-
-		mkdir -p out/modules
-		tar -xvf out/$(basename ${KERNEL_MODULES_URL}) -C out/modules
-		cd out/modules
-		find . | cpio -oA -H newc -F ../../$rootfs_file
-		cd ../../
-		rm -r out/modules
-	else
-		modules_file=out/$(basename ${KERNEL_MODULES_URL})
-		required_size=$(${GZ} -l $modules_file | tail -1 | awk '{print $2}')
-		required_size=$(( $required_size / 1024 ))
-
-		sudo e2fsck -y $rootfs_file
-		block_count=$(sudo dumpe2fs -h $rootfs_file | grep "Block count" | awk '{print $3}')
-		block_size=$(sudo dumpe2fs -h $rootfs_file | grep "Block size" | awk '{print $3}')
-		current_size=$(( $block_size * $block_count / 1024 ))
-
-		final_size=$(( $current_size + $required_size + 32768 ))
-		sudo resize2fs -p $rootfs_file "$final_size"K
-
-		mkdir -p out/rootfs_mount
-		sudo mount -o loop $rootfs_file out/rootfs_mount
-		sudo tar -xvf out/$(basename ${KERNEL_MODULES_URL}) -C out/rootfs_mount
-		sudo umount out/rootfs_mount
-	fi
-fi
-
-if [[ $rootfs_file_type = *"Android sparse image"* ]]; then
-	rootfs_file_img=out/$(basename $rootfs_file .ext4).img
-	img2simg $rootfs_file $rootfs_file_img
-	rm $rootfs_file
-	rootfs_file=$rootfs_file_img
-fi
-if [[ $rootfs_comp = "gz" ]]; then
-	${GZ} $rootfs_file
-	rootfs_file="$rootfs_file".gz
-fi
-
-# Compress kernel image if isn't
-wget_error ${KERNEL_IMAGE_URL}
-kernel_file=out/$(basename ${KERNEL_IMAGE_URL})
-kernel_file_type=$(file $kernel_file)
-if [[ ! $kernel_file_type = *"gzip compressed data"* ]]; then
-	${GZ} $kernel_file
-	kernel_file=$kernel_file.gz
-fi
-
-# Making android boot img
-dt_mkbootimg_arg=""
-if [[ ! -z "${KERNEL_DT_URL}" ]]; then
-	wget_error ${KERNEL_DT_URL}
-	dt_mkbootimg_arg="--dt out/$(basename ${KERNEL_DT_URL})"
-fi
-
-# Create boot image
-if [ -z ${BOOTIMG_PAGESIZE} ]; then
-	export BOOTIMG_PAGESIZE="2048"
-	echo "INFO: No BOOTIMG_PAGESIZE specified set to default: ${BOOTIMG_PAGESIZE}"
-fi
-if [ -z ${BOOTIMG_BASE} ]; then
-	export BOOTIMG_BASE="0x80000000"
-	echo "INFO: No BOOTIMG_BASE specified set to default: ${BOOTIMG_BASE}"
-fi
-if [ -z ${RAMDISK_BASE} ]; then
-	export RAMDISK_BASE="0x84000000"
-	echo "INFO: No RAMDISK_BASE specified set to default: ${RAMDISK_BASE}"
-fi
-if [ -z ${ROOTFS_PARTITION} ]; then
-	export ROOTFS_PARTITION="/dev/mmcblk0p10"
-	echo "INFO: No ROOTFS_PARTITION specified set to default: ${ROOTFS_PARTITION}"
-fi
-if [ -z ${SERIAL_CONSOLE} ]; then
-	export SERIAL_CONSOLE="ttyMSM0"
-	echo "INFO: No SERIAL_CONSOLE specified set to default: ${SERIAL_CONSOLE}"
-fi
-
-boot_file=boot_linux_integration.img
-if [[ $rootfs_file_type = *"cpio archive"* ]]; then
-	ramdisk_file=$rootfs_file
-	skales-mkbootimg \
-		--kernel $kernel_file \
-		--ramdisk $ramdisk_file \
-		--output out/$boot_file \
-		$dt_mkbootimg_arg \
-		--pagesize "${BOOTIMG_PAGESIZE}" \
-		--base "${BOOTIMG_BASE}" \
-		--ramdisk_base "${RAMDISK_BASE}" \
-		--cmdline "root=/dev/ram0 init=/init rw console=tty0 console=${SERIAL_CONSOLE},115200n8"
-else
-	ramdisk_file=out/initrd.img
-	echo "This is not an initrd" > $ramdisk_file
-	skales-mkbootimg \
-		--kernel $kernel_file \
-		--ramdisk $ramdisk_file \
-		--output out/$boot_file \
-		$dt_mkbootimg_arg \
-		--pagesize "${BOOTIMG_PAGESIZE}" \
-		--base "${BOOTIMG_BASE}" \
-		--ramdisk_base "${RAMDISK_BASE}" \
-		--cmdline "root=${ROOTFS_PARTITION} rw rootwait console=tty0 console=${SERIAL_CONSOLE},115200n8"
-fi
-
-echo BOOT_FILE=$boot_file >> builders_out_parameters
-
-ls -l out/
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml
deleted file mode 100644
index fa6dde074e..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/base_template.yaml
+++ /dev/null
@@ -1,119 +0,0 @@
-protocols:
-  lava-lxc:
-    name: lxc-${MACHINE}-test
-    template: debian
-    distribution: debian
-    release: stretch
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 5
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    - abootimg
-    - cpio
-    - gzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - 'root@linaro-developer:~#'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: download
-    namespace: ${MACHINE}
-    images:
-      boot:
-        url: ${BOOT_URL}
-        compression: ${BOOT_URL_COMP}
-        apply-overlay: true
-    os: oe
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 30
-    definitions:
-    - from: inline
-      name: ${MACHINE}-apply-test-overlay
-      path: inline/${MACHINE}-apply-test-overlay.yaml
-      repository:
-        metadata:
-          description: ${MACHINE} apply test overlay
-          format: Lava-Test Test Definition 1.0
-          name: ${MACHINE}-apply-test-overlay
-        run:
-          steps:
-          - overlay_file=/lava-lxc/overlays/${MACHINE}/overlay.tar.gz
-          - if [ -f $$overlay_file ]
-          - then
-          -     cd /lava-lxc
-          -     abootimg -x ${LXC_BOOT_FILE}
-          -     abootimg-unpack-initrd
-          -     tar -xvzf $$overlay_file -C ramdisk
-          -     rm initrd.img
-          -     abootimg-pack-initrd
-          -     image_size=`du -b ${LXC_BOOT_FILE} | cut -f 1`
-          -     overlay_size=`gzip -l $$overlay_file | tail -1 | awk '{print $$2}'`
-          -     final_size=$$(( $$overlay_size + $$image_size ))
-          -     abootimg -u ${LXC_BOOT_FILE} -r initrd.img -c "bootsize=$$final_size"
-          -     echo "apply_test_overlay:" "pass"
-          - else
-          -     echo "apply_test_overlay:" "skip"
-          - fi
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.2-linux.zip
-          - unzip platform-tools_r26.0.2-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: fastboot
-    namespace: ${MACHINE}
-    images:
-      boot:
-        url: lxc:///${LXC_BOOT_FILE}
-    os: oe
-    protocols:
-        lava-lxc:
-        - action: fastboot-deploy
-          request: pre-power-command
-          timeout:
-              minutes: 2
-
-- boot:
-    namespace: ${MACHINE}
-    prompts:
-    - 'linaro-test .*#'
-    timeout:
-      minutes: 15
-    method: fastboot
diff --git a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml b/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml
deleted file mode 100644
index 9ab8c40c7d..0000000000
--- a/lt-qcom-linux-integration/lava-job-definitions/dragonboard-410c/template.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-- test:
-    namespace: ${MACHINE}
-    name: qcomlt-linux-integration-smoke
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      name: qcomlt-linux-integration-smoke
-      path: inline/qcomlt-linux-integration-smoke.yaml
-      repository:
-        metadata:
-          description: QCOM LT linux integration smoke
-          format: Lava-Test Test Definition 1.0
-          name: qcomlt-linux-integration-smoke 
-        run:
-          steps:
-          - uname -a
-          - df
-          - free
-          - ls -l /dev
-          - ls -l /sys
-          - ls -l /proc
-          - echo "linux_integration_smoke:" "pass"
-
-device_type: ${LAVA_DEVICE_TYPE}
-job_name: lt-qcom-linux-integration-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 90
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: high
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom-linux-integration/lava-job-definitions/template.yaml
diff --git a/lt-qcom-linux-integration/publishers.sh b/lt-qcom-linux-integration/publishers.sh
deleted file mode 100644
index 87a11a51bc..0000000000
--- a/lt-qcom-linux-integration/publishers.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# Create MD5SUMS file
-(cd out && md5sum * > MD5SUMS.txt)
-
-wget -q ${BUILD_URL}consoleText -O out/build-log-$(echo ${JOB_NAME}|sed -e 's/[^A-Za-z0-9._-]/_/g')-${BUILD_NUMBER}.txt
-
-# Publish to snapshots
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-     --server ${PUBLISH_SERVER} \
-     --link-latest \
-     out ${PUB_DEST}
diff --git a/lt-qcom-linux-integration/submit_for_testing.sh b/lt-qcom-linux-integration/submit_for_testing.sh
deleted file mode 100755
index 5581adaf81..0000000000
--- a/lt-qcom-linux-integration/submit_for_testing.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-rm -rf configs
-git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-# Install jinja2-cli and ruamel.yaml, required by submit_for_testing.py
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
-
-export BOOT_URL=${PUBLISH_SERVER}${PUB_DEST}/${BOOT_FILE}
-export BOOT_URL_COMP=
-export LXC_BOOT_FILE=$(basename ${BOOT_URL})
-
-case "${MACHINE}" in
-  dragonboard410c)
-    export LAVA_DEVICE_TYPE="dragonboard-410c"
-
-    python configs/openembedded-lkft/submit_for_testing.py \
-        --device-type ${LAVA_DEVICE_TYPE} \
-        --build-number ${BUILD_NUMBER} \
-        --lava-server ${LAVA_SERVER} \
-        --qa-server ${QA_SERVER} \
-        --qa-server-team qcomlt \
-        --qa-server-project linux-integration \
-        --git-commit ${BUILD_NUMBER} \
-        --template-path configs/lt-qcom-linux-integration/lava-job-definitions \
-        --template-base-pre base_template.yaml \
-        --template-names template.yaml
-    ;;
-  *)
-    echo "Skip LAVA_DEVICE_TYPE for ${MACHINE}"
-    ;;
-esac
diff --git a/lt-qcom-linux-test-integration.yaml b/lt-qcom-linux-test-integration.yaml
new file mode 100644
index 0000000000..4651e22252
--- /dev/null
+++ b/lt-qcom-linux-test-integration.yaml
@@ -0,0 +1,142 @@
+- job:
+    name: lt-qcom-linux-test-integration
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            linaro-qualcomm-ci:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: KERNEL_IMAGE_URL
+            default: ''
+        - string:
+            name: KERNEL_MODULES_URL
+            default: ''
+        - string:
+            name: KERNEL_DT_URL
+            default: ''
+        - string:
+            name: KERNEL_CONFIG
+            default: ''
+        - string:
+            name: KERNEL_VERSION
+            default: 'noversion'
+        - string:
+            name: KERNEL_FLAVOR
+            default: 'integration'
+        - string:
+            name: KERNEL_TEST_FLAVOR
+            default: 'linux-${KERNEL_FLAVOR}'
+        - string:
+            name: KERNEL_REPO
+            default: 'https://git.codelinaro.org/linaro/qcomlt/kernel.git'
+        - string:
+            name: KERNEL_COMMIT
+            default: ''
+        - string:
+            name: KERNEL_BRANCH
+            default: 'integration-linux-qcomlt'
+        - string:
+            name: KERNEL_DESCRIBE
+            default: ''
+        - string:
+            name: KERNEL_TOOLCHAIN
+            default: 'unknown'
+        - string:
+            name: PUB_DEST
+            default: "member-builds/qcomlt/${KERNEL_TEST_FLAVOR}/${MACHINE}/${BUILD_NUMBER}"
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'linux-integration'
+        - string:
+            name: BOOTRR_GIT_REPO
+            default: 'https://github.com/andersson/bootrr.git'
+        - string:
+            name: BOOTRR_GIT_BRANCH
+            default: 'master'
+    disabled: true
+    node: master
+    display-name: 'Qualcomm LT Linux test integration images build'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'apq8016-sbc'
+                - 'apq8096-db820c'
+                - 'msm8998-mtp'
+                - 'qcs404-evb-1000'
+                - 'qcs404-evb-4000'
+                - 'qrb5165-rb5'
+                - 'sm8150-mtp'
+                - 'sm8250-mtp'
+                - 'sm8350-mtp'
+                - 'sc7180-idp'
+                - 'sdm845-db845c'
+                - 'sdm845-mtp'
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 300
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: lt-qcom/builders-deps.sh
+        - shell:
+            !include-raw: lt-qcom-linux-test/builders.sh
+        - inject:
+            properties-file: builders_out_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: lt-qcom/publishers.sh
+        - inject:
+            properties-file: builders_out_parameters
+        - shell:
+            !include-raw: lt-qcom-linux-test/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org'
+            failure: true
+            still-failing: true
+            matrix-trigger: only-parent
diff --git a/lt-qcom-linux-test-mainline.yaml b/lt-qcom-linux-test-mainline.yaml
new file mode 100644
index 0000000000..4fee90b3c7
--- /dev/null
+++ b/lt-qcom-linux-test-mainline.yaml
@@ -0,0 +1,142 @@
+- job:
+    name: lt-qcom-linux-test-mainline
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            linaro-qualcomm-ci:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: KERNEL_IMAGE_URL
+            default: ''
+        - string:
+            name: KERNEL_MODULES_URL
+            default: ''
+        - string:
+            name: KERNEL_DT_URL
+            default: ''
+        - string:
+            name: KERNEL_CONFIG
+            default: ''
+        - string:
+            name: KERNEL_VERSION
+            default: 'noversion'
+        - string:
+            name: KERNEL_FLAVOR
+            default: 'mainline'
+        - string:
+            name: KERNEL_TEST_FLAVOR
+            default: 'linux-${KERNEL_FLAVOR}'
+        - string:
+            name: KERNEL_REPO
+            default: 'https://git.codelinaro.org/linaro/qcomlt/kernel.git'
+        - string:
+            name: KERNEL_COMMIT
+            default: ''
+        - string:
+            name: KERNEL_BRANCH
+            default: 'master'
+        - string:
+            name: KERNEL_DESCRIBE
+            default: ''
+        - string:
+            name: KERNEL_TOOLCHAIN
+            default: 'unknown'
+        - string:
+            name: PUB_DEST
+            default: "member-builds/qcomlt/${KERNEL_TEST_FLAVOR}/${MACHINE}/${BUILD_NUMBER}"
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'linux-master'
+        - string:
+            name: BOOTRR_GIT_REPO
+            default: 'https://github.com/andersson/bootrr.git'
+        - string:
+            name: BOOTRR_GIT_BRANCH
+            default: 'master'
+    disabled: true
+    node: master
+    display-name: 'Qualcomm LT Linux test mainline images build'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'apq8016-sbc'
+                - 'apq8096-db820c'
+                - 'msm8998-mtp'
+                - 'qcs404-evb-1000'
+                - 'qcs404-evb-4000'
+                - 'qrb5165-rb5'
+                - 'sm8150-mtp'
+                - 'sm8250-mtp'
+                - 'sm8350-mtp'
+                - 'sc7180-idp'
+                - 'sdm845-db845c'
+                - 'sdm845-mtp'
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 300
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+    builders:
+        - shell:
+            !include-raw: lt-qcom/builders-deps.sh
+        - shell:
+            !include-raw: lt-qcom-linux-test/builders.sh
+        - inject:
+            properties-file: builders_out_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: lt-qcom/publishers.sh
+        - inject:
+            properties-file: builders_out_parameters
+        - shell:
+            !include-raw: lt-qcom-linux-test/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org'
+            failure: true
+            still-failing: true
+            matrix-trigger: only-parent
diff --git a/lt-qcom-linux-test-release.yaml b/lt-qcom-linux-test-release.yaml
new file mode 100644
index 0000000000..06c68e0362
--- /dev/null
+++ b/lt-qcom-linux-test-release.yaml
@@ -0,0 +1,131 @@
+- job:
+    name: lt-qcom-linux-test-release
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            linaro-qualcomm-ci:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: MACHINES
+            default: 'apq8016-sbc sdm845-db845c qrb5165-rb5'
+        - string:
+            name: KERNEL_IMAGE_URL
+            default: ''
+        - string:
+            name: KERNEL_MODULES_URL
+            default: ''
+        - string:
+            name: KERNEL_DT_URL
+            default: ''
+        - string:
+            name: KERNEL_CONFIG
+            default: ''
+        - string:
+            name: KERNEL_VERSION
+            default: 'noversion'
+        - string:
+            name: KERNEL_FLAVOR
+            default: 'release'
+        - string:
+            name: KERNEL_TEST_FLAVOR
+            default: 'linux-${KERNEL_FLAVOR}'
+        - string:
+            name: KERNEL_REPO
+            default: 'https://git.codelinaro.org/linaro/qcomlt/kernel.git'
+        - string:
+            name: KERNEL_COMMIT
+            default: ''
+        - string:
+            name: KERNEL_BRANCH
+            default: 'release/qcomlt-'
+        - string:
+            name: KERNEL_DESCRIBE
+            default: ''
+        - string:
+            name: KERNEL_TOOLCHAIN
+            default: 'unknown'
+        - string:
+            name: PUB_DEST
+            default: "member-builds/qcomlt/${KERNEL_TEST_FLAVOR}/${MACHINE}/${BUILD_NUMBER}"
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'linux-release'
+        - string:
+            name: BOOTRR_GIT_REPO
+            default: 'https://github.com/andersson/bootrr.git'
+        - string:
+            name: BOOTRR_GIT_BRANCH
+            default: 'master'
+    disabled: true
+    node: master
+    display-name: 'Qualcomm LT Linux test release images build'
+    axes:
+        - axis:
+            type: dynamic
+            name: MACHINE
+            values:
+                - MACHINES
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 300
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: lt-qcom/builders-deps.sh
+        - shell:
+            !include-raw: lt-qcom-linux-test/builders.sh
+        - inject:
+            properties-file: builders_out_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: lt-qcom/publishers.sh
+        - inject:
+            properties-file: builders_out_parameters
+        - shell:
+            !include-raw: lt-qcom-linux-test/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org'
+            failure: true
+            still-failing: true
+            matrix-trigger: only-parent
diff --git a/lt-qcom-linux-test/builders.sh b/lt-qcom-linux-test/builders.sh
new file mode 100755
index 0000000000..8028658a11
--- /dev/null
+++ b/lt-qcom-linux-test/builders.sh
@@ -0,0 +1,412 @@
+#!/bin/bash
+
+set -x
+
+wget_error() {
+	wget --timeout=60 -c $1 -P out/
+	retcode=$?
+	if [ $retcode -ne 0 ]; then
+		exit $retcode
+	fi
+}
+
+function copy_archive_to_rootfs() {
+	archive_file=$1
+	archive_file_type=$2
+	target_file=$3
+	target_file_type=$4
+
+	if [[ $target_file_type = *"cpio archive"* ]]; then
+		mkdir -p out/archive
+		if [[ $archive_file_type = *"Debian binary package"* ]]; then
+			dpkg-deb -x $archive_file out/archive
+		else
+			tar -xvf $archive_file -C out/archive
+		fi
+		cd out/archive
+		find . | cpio -R 0:0 -oA -H newc -F ../../$target_file
+		cd ../../
+		rm -rf out/archive
+	else
+		set -e
+		archive_tmpd="out/archive"
+
+		if [[ $archive_file_type = *"Debian binary package"* ]]; then
+			required_size=$(dpkg -f $archive_file Installed-Size)
+		else
+			required_size=$(${GZ} -l $archive_file | tail -1 | awk '{print $2}')
+		fi
+		required_size=$(( $required_size / 1024 ))
+
+		sudo e2fsck -y -f $target_file
+		block_count=$(sudo dumpe2fs -h $target_file | grep "Block count" | awk '{print $3}')
+		block_size=$(sudo dumpe2fs -h $target_file | grep "Block size" | awk '{print $3}')
+		current_size=$(( $block_size * $block_count / 1024 ))
+
+		final_size=$(( $current_size + $required_size + 32768 ))
+		sudo resize2fs -p $target_file "$final_size"K
+
+		sudo mkdir -p $archive_tmpd
+		if [[ $archive_file_type = *"Debian binary package"* ]]; then
+			sudo dpkg-deb -x $archive_file $archive_tmpd
+		else
+			sudo tar -xvf $archive_file -C $archive_tmpd
+		fi
+
+		cdir=$(pwd)
+		pushd $cdir
+		cd $archive_tmpd
+		for f in $(find . -type f)
+		do
+			e2cp -a -p -G 0 -O 0 -v $f $cdir/$target_file:/
+		done
+		for l in $(find . -type l)
+		do
+			f=$(readlink -f $l) || continue
+			if [ -f "$f" ]; then
+				e2cp -p -G 0 -O 0 -v $f $cdir/$target_file:/$l
+			fi
+		done
+		popd
+		sudo rm -rf $archive_tmpd
+
+		set +e
+	fi
+}
+
+function remove_unused_firmware() {
+	target_file=$1
+	target_file_type=$2
+
+	# Remove all not needed firmware by platform, In db845c it ran out of space causing
+	# boot failure.
+	mkdir -p out/archive
+	firmware_list_file=$(realpath ./configs/lt-qcom-linux-test/firmware.list/${MACHINE})
+
+	cd out/archive
+	cpio -idv -H newc < ../../$target_file
+
+	if [ -f "$firmware_list_file" ]; then
+		for f in $(find ./lib/firmware/ -type f)
+		do
+			if ! grep -qxFe "$f" $firmware_list_file; then
+				rm -fv "$f"
+			fi
+		done
+		find lib/firmware/ -xtype l -delete
+		find lib/firmware/ -type d -empty -delete
+
+	else
+		rm -rf lib/firmware
+	fi
+
+	find . | cpio -R 0:0 -ov -H newc > ../../$target_file
+	cd ../../
+	rm -rf out/archive
+}
+
+function create_ramdisk_from_folder() {
+	ramdisk_name=$1
+	ramdisk_folder=$2
+	ramdisk="$ramdisk_name.cpio"
+
+	cd $ramdisk_folder
+	find . | cpio -R 0:0 -ov -H newc > "../../out/$ramdisk"
+	${GZ} "../../out/$ramdisk"
+	ramdisk=$ramdisk.gz
+	echo "$ramdisk"
+	cd ../
+}
+
+function overlay_ramdisk_from_git() {
+	git_repo=$1
+	git_branch=$2
+
+	# clone git repo and get revision details
+	project_name="$(basename "$git_repo" .git)"
+	project_folder="$project_name"
+	project_ramdisk_folder="$(realpath $project_folder)/rootfs"
+	git clone -b "$git_branch" --depth 1 "$git_repo" "$project_folder"
+	cd "$project_folder"
+	DESTDIR="$project_ramdisk_folder" prefix="/usr" make install 2>&1 > /dev/null
+	project_name="$project_name-$(git rev-parse --short HEAD)"
+
+	# created the overlayed ramdisk involves the creation of new ramdisk from folder and
+	# concat both into a single file
+	project_ramdisk_overlay=$(create_ramdisk_from_folder $project_name $project_ramdisk_folder)
+	cd ../
+
+	overlayed_ramdisk_file="$(basename $ramdisk_file)+$(basename $project_ramdisk_overlay)"
+	cat "$ramdisk_file" "out/$project_ramdisk_overlay" > "out/$overlayed_ramdisk_file"
+	echo "$overlayed_ramdisk_file"
+	rm -rf "$project_folder"
+}
+
+function overlay_ramdisk_from_file() {
+	file_name=$1
+	file_cpio="out/$2.cpio"
+
+	echo $file_name | cpio -R 0:0 -ov -H newc > $file_cpio
+	${GZ} $file_cpio
+	file_cpio=$file_cpio.gz
+
+	overlayed_ramdisk_file="$(basename $ramdisk_file)+$(basename $file_cpio)"
+	cat "$ramdisk_file" "$file_cpio" > "out/$overlayed_ramdisk_file"
+	echo "$overlayed_ramdisk_file"
+}
+
+# Set default tools to use
+if [ -z "${GZ}" ]; then
+	export GZ=gzip
+fi
+
+# Generic/default variables
+BOOTIMG_PAGESIZE=2048
+BOOTIMG_BASE=0x80000000
+RAMDISK_BASE=0x84000000
+SERIAL_CONSOLE=ttyMSM0
+KERNEL_DT_URL="${KERNEL_DT_URL}/qcom/${MACHINE}.dtb"
+KERNEL_CMDLINE_APPEND=
+ROOTFS_PARTITION=/dev/disk/by-partlabel/rootfs
+
+# Set per MACHINE configuration
+case "${MACHINE}" in
+	apq8016-sbc|qrb5165-rb5)
+		;;
+	apq8096-db820c)
+		BOOTIMG_PAGESIZE=4096
+		;;
+	msm8998-mtp|qcs404-evb-1000|qcs404-evb-4000|sm8150-mtp|sm8250-mtp|sm8350-mtp|sc7180-idp|sdm845-mtp)
+		ROOTFS_PARTITION=/dev/disk/by-partlabel/userdata
+		;;
+	sdm845-db845c)
+		BOOTIMG_PAGESIZE=4096
+
+		KERNEL_CMDLINE_APPEND="clk_ignore_unused pd_ignore_unused"
+		;;
+	*)
+		echo "Currently MACHINE: ${MACHINE} isn't supported"
+		exit 1
+		;;
+esac
+
+# Validate required parameters
+if [ -z "${KERNEL_IMAGE_URL}" ]; then
+	echo "ERROR: KERNEL_IMAGE_URL is empty"
+	exit 1
+fi
+
+# find rootfs and ramdisk to use
+case "${MACHINE}" in
+	apq8016-sbc|apq8096-db820c|sdm845-db845c|qrb5165-rb5)
+		./configs/lt-qcom-linux-test/get_latest_testimage.py
+	;;
+	*)
+		./configs/lt-qcom-linux-test/get_latest_testimage.py https://snapshots.linaro.org/member-builds/qcomlt/testimages/arm64/
+	;;
+esac
+RAMDISK_URL=$(cat output.log  | grep RAMDISK_URL | cut -d= -f2)
+ROOTFS_URL=$(cat output.log  | grep ROOTFS_URL | cut -d= -f2)
+ROOTFS_DESKTOP_URL=$(cat output.log  | grep ROOTFS_DESKTOP_URL | cut -d= -f2)
+
+# Build information
+mkdir -p out
+cat > out/HEADER.textile << EOF
+
+h4. QCOM Landing Team - $BUILD_DISPLAY_NAME
+
+Build description:
+* Build URL: "$BUILD_URL":$BUILD_URL
+* Kernel image URL: $KERNEL_IMAGE_URL
+* Kernel dt URL: $KERNEL_DT_URL
+* kernel modules URL: $KERNEL_MODULES_URL
+* Ramdisk URL: $RAMDISK_URL
+* RootFS URL: $ROOTFS_URL
+EOF
+
+# Ramdisk/RootFS image and modules populate, download step
+wget_error ${RAMDISK_URL}
+ramdisk_file=out/$(basename ${RAMDISK_URL})
+ramdisk_file_type=$(file $ramdisk_file)
+
+wget_error ${ROOTFS_URL}
+rootfs_file=out/$(basename ${ROOTFS_URL})
+rootfs_file_type=$(file $rootfs_file)
+wget_error ${ROOTFS_DESKTOP_URL}
+rootfs_desktop_file=out/$(basename ${ROOTFS_DESKTOP_URL})
+rootfs_desktop_file_type=$(file $rootfs_desktop_file)
+
+if [[ ! -z "${KERNEL_MODULES_URL}" ]]; then
+	wget_error ${KERNEL_MODULES_URL}
+	modules_file="out/$(basename ${KERNEL_MODULES_URL})"
+
+	# XXX: Compress modules to gzip for use copy_archive_to_rootfs
+	# generic code to calculate size in ext4 filesystem
+	modules_file_type=$(file $modules_file)
+	if [[ $modules_file_type = *"XZ compressed data"* ]]; then
+		xz -d $modules_file
+		modules_file="out/$(basename ${KERNEL_MODULES_URL} .xz)"
+		${GZ} $modules_file
+		modules_file=$modules_file.gz
+	elif [[ $modules_file_type = *"bzip2 compressed data"* ]]; then
+		bzip2 -d $modules_file
+		modules_file="out/$(basename ${KERNEL_MODULES_URL} .bz2)"
+		${GZ} $modules_file
+		modules_file=$modules_file.gz
+	fi
+fi
+
+# Uncompress images to be able populate with modules
+rootfs_desktop_comp=''
+if [[ $rootfs_desktop_file_type = *"gzip compressed data"* ]]; then
+	${GZ} -d $rootfs_desktop_file
+	rootfs_desktop_file=out/$(basename ${ROOTFS_DESKTOP_URL} .gz)
+	rootfs_desktop_file_type=$(file $rootfs_desktop_file)
+	rootfs_desktop_comp='gz'
+fi
+rootfs_comp=''
+if [[ $rootfs_file_type = *"gzip compressed data"* ]]; then
+	${GZ} -d $rootfs_file
+	rootfs_file=out/$(basename ${ROOTFS_URL} .gz)
+	rootfs_file_type=$(file $rootfs_file)
+	rootfs_comp='gz'
+fi
+if [[ $ramdisk_file_type = *"gzip compressed data"* ]]; then
+	${GZ} -d $ramdisk_file
+	ramdisk_file=out/$(basename ${RAMDISK_URL} .gz)
+	ramdisk_file_type=$(file $ramdisk_file)
+	ramdisk_comp='gz'
+fi
+
+
+# If rootfs is Android sparse image convert to ext4 to populate with modules
+if [[ $rootfs_desktop_file_type = *"Android sparse image"* ]]; then
+	rootfs_desktop_file_ext4=out/$(basename ${rootfs_desktop_file} .img).ext4
+	simg2img $rootfs_desktop_file $rootfs_desktop_file_ext4
+	rootfs_desktop_file=$rootfs_desktop_file_ext4
+elif [[ $rootfs_desktop_file_type = *"ext4 filesystem data"* ]]; then
+	true
+else
+	echo "ERROR: ROOTFS_IMAGE type isn't supported: $rootfs_file_type"
+	exit 1
+fi
+if [[ $rootfs_file_type = *"Android sparse image"* ]]; then
+	rootfs_file_ext4=out/$(basename ${rootfs_file} .img).ext4
+	simg2img $rootfs_file $rootfs_file_ext4
+	rootfs_file=$rootfs_file_ext4
+elif [[ $rootfs_file_type = *"ext4 filesystem data"* ]]; then
+	true
+else
+	echo "ERROR: ROOTFS_IMAGE type isn't supported: $rootfs_file_type"
+	exit 1
+fi
+
+# Populate modules and remove not used firmware in ramdisk
+remove_unused_firmware "$ramdisk_file" "$ramdisk_file_type"
+if [[ ! -z "$modules_file" ]]; then
+	modules_file_type=$(file $modules_file)
+	copy_archive_to_rootfs "$modules_file" "$modules_file_type" "$ramdisk_file" "$ramdisk_file_type"
+	copy_archive_to_rootfs "$modules_file" "$modules_file_type" "$rootfs_file" "$rootfs_file_type"
+	copy_archive_to_rootfs "$modules_file" "$modules_file_type" "$rootfs_desktop_file" "$rootfs_desktop_file_type"
+fi
+
+# If rootfs was Android sparse image trasform from ext4
+if [[ $rootfs_desktop_file_type = *"Android sparse image"* ]]; then
+	rootfs_desktop_file_img=out/$(basename $rootfs_desktop_file .ext4).img
+	img2simg $rootfs_desktop_file $rootfs_desktop_file_img
+	rm $rootfs_desktop_file
+	rootfs_desktop_file=$rootfs_desktop_file_img
+fi
+if [[ $rootfs_file_type = *"Android sparse image"* ]]; then
+	rootfs_file_img=out/$(basename $rootfs_file .ext4).img
+	img2simg $rootfs_file $rootfs_file_img
+	rm $rootfs_file
+	rootfs_file=$rootfs_file_img
+fi
+
+
+# Compress ramdisk/rootfs images
+if [[ $ramdisk_comp = "gz" ]]; then
+	${GZ} $ramdisk_file
+	ramdisk_file="$ramdisk_file".gz
+	ramdisk_file_type=$(file $ramdisk_file)
+	ramdisk_comp=""
+fi
+if [[ $rootfs_comp = "gz" ]]; then
+	${GZ} $rootfs_file
+	rootfs_file="$rootfs_file".gz
+	rootfs_file_type=$(file $rootfs_file)
+	rootfs_comp=""
+fi
+if [[ $rootfs_desktop_comp = "gz" ]]; then
+	${GZ} $rootfs_desktop_file
+	rootfs_desktop_file="$rootfs_desktop_file".gz
+	rootfs_desktop_file_type=$(file $rootfs_desktop_file)
+	rootfs_desktop_comp=""
+fi
+
+# Compress kernel image if isn't
+wget_error ${KERNEL_IMAGE_URL}
+kernel_file=out/$(basename ${KERNEL_IMAGE_URL})
+kernel_file_type=$(file $kernel_file)
+if [[ ! $kernel_file_type = *"gzip compressed data"* ]]; then
+	${GZ} -kf $kernel_file
+	kernel_file=$kernel_file.gz
+fi
+
+# Making android boot img
+dt_mkbootimg_arg=""
+if [[ ! -z "${KERNEL_DT_URL}" ]]; then
+	wget_error ${KERNEL_DT_URL}
+	dt_mkbootimg_arg="--dt out/$(basename ${KERNEL_DT_URL})"
+fi
+
+# Overlay ramdisk to install tools, artifacts, etc
+if [[ ! -z "${BOOTRR_GIT_REPO}" ]]; then
+	overlayed_ramdisk_file="out/$(overlay_ramdisk_from_git "${BOOTRR_GIT_REPO}" "${BOOTRR_GIT_BRANCH}")"
+	ramdisk_file=$overlayed_ramdisk_file
+fi
+
+# Create boot image (bootrr), uses systemd autologin root
+boot_file=boot-${KERNEL_TEST_FLAVOR}-${KERNEL_VERSION}-${BUILD_NUMBER}-${MACHINE}.img
+skales-mkbootimg \
+	--kernel $kernel_file \
+	--ramdisk $overlayed_ramdisk_file \
+	--output out/$boot_file \
+	$dt_mkbootimg_arg \
+	--pagesize "${BOOTIMG_PAGESIZE}" \
+	--base "${BOOTIMG_BASE}" \
+	--ramdisk_base "${RAMDISK_BASE}" \
+	--cmdline "root=/dev/ram0 init=/sbin/init rw console=tty0 console=${SERIAL_CONSOLE},115200n8 earlycon debug net.ifnames=0 ${KERNEL_CMDLINE_APPEND}"
+
+# Create boot image (functional), sdm845-mtp requires an initramfs to mount the rootfs and then
+# exec switch_rootfs, use the same method in other boards too
+boot_rootfs_file=boot-rootfs-${KERNEL_TEST_FLAVOR}-${KERNEL_VERSION}-${BUILD_NUMBER}-${MACHINE}.img
+
+mkdir -p etc
+initrd_release_file=etc/initrd-release
+touch $initrd_release_file
+overlayed_ramdisk_file="out/$(overlay_ramdisk_from_file "$initrd_release_file" "init_rootfs")"
+
+skales-mkbootimg \
+	--kernel $kernel_file \
+	--ramdisk $overlayed_ramdisk_file \
+	--output out/$boot_rootfs_file \
+	$dt_mkbootimg_arg \
+	--pagesize "${BOOTIMG_PAGESIZE}" \
+	--base "${BOOTIMG_BASE}" \
+	--ramdisk_base "${RAMDISK_BASE}" \
+	--cmdline "root=${ROOTFS_PARTITION} init=/sbin/init rw console=tty0 console=${SERIAL_CONSOLE},115200n8 earlycon debug net.ifnames=0 ${KERNEL_CMDLINE_APPEND}"
+
+echo BOOT_FILE=$boot_file >> builders_out_parameters
+echo BOOT_ROOTFS_FILE=$boot_rootfs_file >> builders_out_parameters
+echo ROOTFS_FILE="$(basename $rootfs_file)" >> builders_out_parameters
+echo ROOTFS_DESKTOP_FILE="$(basename $rootfs_desktop_file)" >> builders_out_parameters
+
+# Parameters for LAVA jobs
+echo KERNEL_IMAGE="$(basename $KERNEL_IMAGE_URL)" >> builders_out_parameters
+echo KERNEL_DT="$(basename $KERNEL_DT_URL)" >> builders_out_parameters
+echo RAMDISK_URL="${RAMDISK_URL}" >> builders_out_parameters
+echo KERNEL_DT_URL="${KERNEL_DT_URL}" >> builders_out_parameters
+
+ls -l out/
diff --git a/lt-qcom-linux-test/copy_test_overlay.sh b/lt-qcom-linux-test/copy_test_overlay.sh
new file mode 100755
index 0000000000..d3acc20fac
--- /dev/null
+++ b/lt-qcom-linux-test/copy_test_overlay.sh
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# Copies a test tarball overlay into the Android boot image ramdisk
+
+set -ex
+
+if [ $# -lt 2 ]; then
+	echo "Usage: $0 <boot_file> <overlay_test_file>"
+	exit 1
+fi
+
+boot_file=$1
+overlay_file=$2
+
+abootimg -x $boot_file
+mkdir -p ramdisk
+tar -xvzf $overlay_file -C ramdisk
+cd ramdisk
+overlay_file=$(basename $2 .tar.gz).cpio
+find . | cpio -R 0:0 -ov -H newc > ../$overlay_file
+cd ../
+gzip $overlay_file
+overlay_file=$overlay_file.gz
+overlayed_initrd=initrd.img+$overlay_file
+cat initrd.img $overlay_file > $overlayed_initrd
+
+image_size=`du -b $boot_file | cut -f 1`
+overlay_size=`gzip -l $overlay_file | tail -1 | awk '{print $2}'`
+final_size=$(( $overlay_size + $image_size ))
+abootimg -u $boot_file -r $overlayed_initrd -c "bootsize=$final_size"
diff --git a/lt-qcom-linux-test/firmware.list/apq8016-sbc b/lt-qcom-linux-test/firmware.list/apq8016-sbc
new file mode 100644
index 0000000000..86d2a72851
--- /dev/null
+++ b/lt-qcom-linux-test/firmware.list/apq8016-sbc
@@ -0,0 +1,42 @@
+./lib/firmware/
+./lib/firmware/LICENSE.qcom
+./lib/firmware/a300_pfp.fw
+./lib/firmware/a300_pm4.fw
+./lib/firmware/qcom/
+./lib/firmware/qcom/a300_pfp.fw
+./lib/firmware/qcom/a300_pm4.fw
+./lib/firmware/qcom/msm8916/
+./lib/firmware/qcom/msm8916/mba.mbn
+./lib/firmware/qcom/msm8916/modem.b00
+./lib/firmware/qcom/msm8916/modem.b01
+./lib/firmware/qcom/msm8916/modem.b02
+./lib/firmware/qcom/msm8916/modem.b07
+./lib/firmware/qcom/msm8916/modem.b17
+./lib/firmware/qcom/msm8916/modem.b19
+./lib/firmware/qcom/msm8916/modem.b20
+./lib/firmware/qcom/msm8916/modem.b23
+./lib/firmware/qcom/msm8916/modem.b24
+./lib/firmware/qcom/msm8916/modem.b25
+./lib/firmware/qcom/msm8916/modem.b27
+./lib/firmware/qcom/msm8916/modem.mdt
+./lib/firmware/qcom/msm8916/wcnss.b00
+./lib/firmware/qcom/msm8916/wcnss.b01
+./lib/firmware/qcom/msm8916/wcnss.b02
+./lib/firmware/qcom/msm8916/wcnss.b04
+./lib/firmware/qcom/msm8916/wcnss.b06
+./lib/firmware/qcom/msm8916/wcnss.b09
+./lib/firmware/qcom/msm8916/wcnss.b10
+./lib/firmware/qcom/msm8916/wcnss.b11
+./lib/firmware/qcom/msm8916/wcnss.mdt
+./lib/firmware/qcom/venus-1.8/
+./lib/firmware/qcom/venus-1.8/venus.b00
+./lib/firmware/qcom/venus-1.8/venus.b01
+./lib/firmware/qcom/venus-1.8/venus.b02
+./lib/firmware/qcom/venus-1.8/venus.b03
+./lib/firmware/qcom/venus-1.8/venus.b04
+./lib/firmware/qcom/venus-1.8/venus.mdt
+./lib/firmware/regulatory.db
+./lib/firmware/regulatory.db.p7s
+./lib/firmware/wlan/
+./lib/firmware/wlan/prima/
+./lib/firmware/wlan/prima/WCNSS_qcom_wlan_nv.bin
diff --git a/lt-qcom-linux-test/firmware.list/apq8096-db820c b/lt-qcom-linux-test/firmware.list/apq8096-db820c
new file mode 100644
index 0000000000..8fe5c20e9f
--- /dev/null
+++ b/lt-qcom-linux-test/firmware.list/apq8096-db820c
@@ -0,0 +1,72 @@
+./lib/firmware/
+./lib/firmware/LICENSE.QualcommAtheros_ath10k
+./lib/firmware/LICENSE.qcom
+./lib/firmware/ath10k/
+./lib/firmware/ath10k/QCA6174/
+./lib/firmware/ath10k/QCA6174/hw2.1/
+./lib/firmware/ath10k/QCA6174/hw2.1/board-2.bin
+./lib/firmware/ath10k/QCA6174/hw2.1/board.bin
+./lib/firmware/ath10k/QCA6174/hw2.1/firmware-5.bin
+./lib/firmware/ath10k/QCA6174/hw3.0/
+./lib/firmware/ath10k/QCA6174/hw3.0/board-2.bin
+./lib/firmware/ath10k/QCA6174/hw3.0/board.bin
+./lib/firmware/ath10k/QCA6174/hw3.0/firmware-4.bin
+./lib/firmware/ath10k/QCA6174/hw3.0/firmware-6.bin
+./lib/firmware/ath10k/QCA6174/hw3.0/firmware-sdio-6.bin
+./lib/firmware/qca/
+./lib/firmware/qca/crbtfw21.tlv
+./lib/firmware/qca/crbtfw32.tlv
+./lib/firmware/qca/crnv21.bin
+./lib/firmware/qca/crnv32.bin
+./lib/firmware/qca/crnv32u.bin
+./lib/firmware/qca/htbtfw20.tlv
+./lib/firmware/qca/htnv20.bin
+./lib/firmware/qca/nvm_00130300.bin
+./lib/firmware/qca/nvm_00130302.bin
+./lib/firmware/qca/nvm_00230302.bin
+./lib/firmware/qca/nvm_00440302.bin
+./lib/firmware/qca/nvm_00440302_eu.bin
+./lib/firmware/qca/nvm_00440302_i2s_eu.bin
+./lib/firmware/qca/nvm_usb_00000200.bin
+./lib/firmware/qca/nvm_usb_00000201.bin
+./lib/firmware/qca/nvm_usb_00000300.bin
+./lib/firmware/qca/nvm_usb_00000302.bin
+./lib/firmware/qca/nvm_usb_00000302_eu.bin
+./lib/firmware/qca/rampatch_00130300.bin
+./lib/firmware/qca/rampatch_00130302.bin
+./lib/firmware/qca/rampatch_00230302.bin
+./lib/firmware/qca/rampatch_00440302.bin
+./lib/firmware/qca/rampatch_usb_00000200.bin
+./lib/firmware/qca/rampatch_usb_00000201.bin
+./lib/firmware/qca/rampatch_usb_00000300.bin
+./lib/firmware/qca/rampatch_usb_00000302.bin
+./lib/firmware/qcom/
+./lib/firmware/qcom/a530_pfp.fw
+./lib/firmware/qcom/a530_pm4.fw
+./lib/firmware/qcom/a530_zap.b00
+./lib/firmware/qcom/a530_zap.b01
+./lib/firmware/qcom/a530_zap.b02
+./lib/firmware/qcom/a530_zap.mdt
+./lib/firmware/qcom/a530v3_gpmu.fw2
+./lib/firmware/qcom/msm8996/
+./lib/firmware/qcom/msm8996/adsp.b00
+./lib/firmware/qcom/msm8996/adsp.b01
+./lib/firmware/qcom/msm8996/adsp.b02
+./lib/firmware/qcom/msm8996/adsp.b03
+./lib/firmware/qcom/msm8996/adsp.b04
+./lib/firmware/qcom/msm8996/adsp.b05
+./lib/firmware/qcom/msm8996/adsp.b06
+./lib/firmware/qcom/msm8996/adsp.b08
+./lib/firmware/qcom/msm8996/adsp.b09
+./lib/firmware/qcom/msm8996/adsp.mdt
+./lib/firmware/qcom/msm8996/adspr.jsn
+./lib/firmware/qcom/msm8996/adspua.jsn
+./lib/firmware/qcom/venus-4.2/
+./lib/firmware/qcom/venus-4.2/venus.b00
+./lib/firmware/qcom/venus-4.2/venus.b01
+./lib/firmware/qcom/venus-4.2/venus.b02
+./lib/firmware/qcom/venus-4.2/venus.b03
+./lib/firmware/qcom/venus-4.2/venus.b04
+./lib/firmware/qcom/venus-4.2/venus.mdt
+./lib/firmware/regulatory.db
+./lib/firmware/regulatory.db.p7s
diff --git a/lt-qcom-linux-test/firmware.list/qrb5165-rb5 b/lt-qcom-linux-test/firmware.list/qrb5165-rb5
new file mode 100644
index 0000000000..b60afb7eef
--- /dev/null
+++ b/lt-qcom-linux-test/firmware.list/qrb5165-rb5
@@ -0,0 +1,105 @@
+./lib/firmware/
+./lib/firmware/LICENSE.QualcommAtheros_ath10k
+./lib/firmware/ath11k/
+./lib/firmware/ath11k/IPQ6018/
+./lib/firmware/ath11k/IPQ6018/hw1.0/
+./lib/firmware/ath11k/IPQ6018/hw1.0/board-2.bin
+./lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.b00
+./lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.b01
+./lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.b02
+./lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.flist
+./lib/firmware/ath11k/IPQ6018/hw1.0/m3_fw.mdt
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b00
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b01
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b02
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b03
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b04
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b05
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b07
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.b08
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.flist
+./lib/firmware/ath11k/IPQ6018/hw1.0/q6_fw.mdt
+./lib/firmware/ath11k/IPQ8074/
+./lib/firmware/ath11k/IPQ8074/hw2.0/
+./lib/firmware/ath11k/IPQ8074/hw2.0/board-2.bin
+./lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.b00
+./lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.b01
+./lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.b02
+./lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.flist
+./lib/firmware/ath11k/IPQ8074/hw2.0/m3_fw.mdt
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b00
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b01
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b02
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b03
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b04
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b05
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b07
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.b08
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.flist
+./lib/firmware/ath11k/IPQ8074/hw2.0/q6_fw.mdt
+./lib/firmware/ath11k/QCA6390/
+./lib/firmware/ath11k/QCA6390/hw2.0/
+./lib/firmware/ath11k/QCA6390/hw2.0/amss.bin
+./lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin
+./lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin.firmware-qcom-rb5
+./lib/firmware/ath11k/QCA6390/hw2.0/board-2.bin.linux-firmware
+./lib/firmware/ath11k/QCA6390/hw2.0/m3.bin
+./lib/firmware/lt9611uxc_fw.bin
+./lib/firmware/qca/
+./lib/firmware/qca/crbtfw21.tlv
+./lib/firmware/qca/crbtfw32.tlv
+./lib/firmware/qca/crnv21.bin
+./lib/firmware/qca/crnv32.bin
+./lib/firmware/qca/crnv32u.bin
+./lib/firmware/qca/htbtfw20.tlv
+./lib/firmware/qca/htnv20.bin
+./lib/firmware/qca/nvm_00130300.bin
+./lib/firmware/qca/nvm_00130302.bin
+./lib/firmware/qca/nvm_00230302.bin
+./lib/firmware/qca/nvm_00440302.bin
+./lib/firmware/qca/nvm_00440302_eu.bin
+./lib/firmware/qca/nvm_00440302_i2s_eu.bin
+./lib/firmware/qca/nvm_usb_00000200.bin
+./lib/firmware/qca/nvm_usb_00000201.bin
+./lib/firmware/qca/nvm_usb_00000300.bin
+./lib/firmware/qca/nvm_usb_00000302.bin
+./lib/firmware/qca/nvm_usb_00000302_eu.bin
+./lib/firmware/qca/rampatch_00130300.bin
+./lib/firmware/qca/rampatch_00130302.bin
+./lib/firmware/qca/rampatch_00230302.bin
+./lib/firmware/qca/rampatch_00440302.bin
+./lib/firmware/qca/rampatch_usb_00000200.bin
+./lib/firmware/qca/rampatch_usb_00000201.bin
+./lib/firmware/qca/rampatch_usb_00000300.bin
+./lib/firmware/qca/rampatch_usb_00000302.bin
+./lib/firmware/qcom/
+./lib/firmware/qcom/a650_gmu.bin
+./lib/firmware/qcom/a650_sqe.fw
+./lib/firmware/qcom/sm8250/
+./lib/firmware/qcom/sm8250/a650_zap.mbn
+./lib/firmware/qcom/sm8250/adsp.mbn
+./lib/firmware/qcom/sm8250/adspr.jsn
+./lib/firmware/qcom/sm8250/adspua.jsn
+./lib/firmware/qcom/sm8250/cdsp.mbn
+./lib/firmware/qcom/sm8250/cdspr.jsn
+./lib/firmware/qcom/sm8250/dspso.bin
+./lib/firmware/qcom/sm8250/npur.jsn
+./lib/firmware/qcom/sm8250/slpi.mbn
+./lib/firmware/qcom/sm8250/slpir.jsn
+./lib/firmware/qcom/sm8250/slpius.jsn
+./lib/firmware/qcom/vpu-1.0/
+./lib/firmware/qcom/vpu-1.0/venus.b00
+./lib/firmware/qcom/vpu-1.0/venus.b01
+./lib/firmware/qcom/vpu-1.0/venus.b02
+./lib/firmware/qcom/vpu-1.0/venus.b03
+./lib/firmware/qcom/vpu-1.0/venus.b04
+./lib/firmware/qcom/vpu-1.0/venus.b05
+./lib/firmware/qcom/vpu-1.0/venus.b06
+./lib/firmware/qcom/vpu-1.0/venus.b07
+./lib/firmware/qcom/vpu-1.0/venus.b08
+./lib/firmware/qcom/vpu-1.0/venus.b09
+./lib/firmware/qcom/vpu-1.0/venus.b10
+./lib/firmware/qcom/vpu-1.0/venus.b19
+./lib/firmware/qcom/vpu-1.0/venus.mdt
+./lib/firmware/regulatory.db
+./lib/firmware/regulatory.db.p7s
diff --git a/lt-qcom-linux-test/firmware.list/sdm845-db845c b/lt-qcom-linux-test/firmware.list/sdm845-db845c
new file mode 100644
index 0000000000..101973d00e
--- /dev/null
+++ b/lt-qcom-linux-test/firmware.list/sdm845-db845c
@@ -0,0 +1,90 @@
+./lib/firmware/
+./lib/firmware/LICENSE.QualcommAtheros_ath10k
+./lib/firmware/LICENSE.qcom
+./lib/firmware/ath10k/
+./lib/firmware/ath10k/WCN3990/
+./lib/firmware/ath10k/WCN3990/hw1.0/
+./lib/firmware/ath10k/WCN3990/hw1.0/board-2.bin
+./lib/firmware/ath10k/WCN3990/hw1.0/firmware-5.bin
+./lib/firmware/ath10k/WCN3990/hw1.0/wlanmdsp.mbn
+./lib/firmware/qca/
+./lib/firmware/qca/crbtfw21.tlv
+./lib/firmware/qca/crbtfw32.tlv
+./lib/firmware/qca/crnv21.bin
+./lib/firmware/qca/crnv32.bin
+./lib/firmware/qca/crnv32u.bin
+./lib/firmware/qca/htbtfw20.tlv
+./lib/firmware/qca/htnv20.bin
+./lib/firmware/qca/nvm_00130300.bin
+./lib/firmware/qca/nvm_00130302.bin
+./lib/firmware/qca/nvm_00230302.bin
+./lib/firmware/qca/nvm_00440302.bin
+./lib/firmware/qca/nvm_00440302_eu.bin
+./lib/firmware/qca/nvm_00440302_i2s_eu.bin
+./lib/firmware/qca/nvm_usb_00000200.bin
+./lib/firmware/qca/nvm_usb_00000201.bin
+./lib/firmware/qca/nvm_usb_00000300.bin
+./lib/firmware/qca/nvm_usb_00000302.bin
+./lib/firmware/qca/nvm_usb_00000302_eu.bin
+./lib/firmware/qca/rampatch_00130300.bin
+./lib/firmware/qca/rampatch_00130302.bin
+./lib/firmware/qca/rampatch_00230302.bin
+./lib/firmware/qca/rampatch_00440302.bin
+./lib/firmware/qca/rampatch_usb_00000200.bin
+./lib/firmware/qca/rampatch_usb_00000201.bin
+./lib/firmware/qca/rampatch_usb_00000300.bin
+./lib/firmware/qca/rampatch_usb_00000302.bin
+./lib/firmware/qcom/
+./lib/firmware/qcom/a630_gmu.bin
+./lib/firmware/qcom/a630_sqe.fw
+./lib/firmware/qcom/a630_zap.b00
+./lib/firmware/qcom/a630_zap.b01
+./lib/firmware/qcom/a630_zap.b02
+./lib/firmware/qcom/a630_zap.elf
+./lib/firmware/qcom/a630_zap.mdt
+./lib/firmware/qcom/sdm845/
+./lib/firmware/qcom/sdm845/a630_zap.mbn
+./lib/firmware/qcom/sdm845/adsp.b00
+./lib/firmware/qcom/sdm845/adsp.b01
+./lib/firmware/qcom/sdm845/adsp.b02
+./lib/firmware/qcom/sdm845/adsp.b03
+./lib/firmware/qcom/sdm845/adsp.b04
+./lib/firmware/qcom/sdm845/adsp.b05
+./lib/firmware/qcom/sdm845/adsp.b06
+./lib/firmware/qcom/sdm845/adsp.b07
+./lib/firmware/qcom/sdm845/adsp.b08
+./lib/firmware/qcom/sdm845/adsp.b09
+./lib/firmware/qcom/sdm845/adsp.b10
+./lib/firmware/qcom/sdm845/adsp.b11
+./lib/firmware/qcom/sdm845/adsp.b12
+./lib/firmware/qcom/sdm845/adsp.b13
+./lib/firmware/qcom/sdm845/adsp.mbn
+./lib/firmware/qcom/sdm845/adsp.mdt
+./lib/firmware/qcom/sdm845/adspr.jsn
+./lib/firmware/qcom/sdm845/adspua.jsn
+./lib/firmware/qcom/sdm845/cdsp.b00
+./lib/firmware/qcom/sdm845/cdsp.b01
+./lib/firmware/qcom/sdm845/cdsp.b02
+./lib/firmware/qcom/sdm845/cdsp.b03
+./lib/firmware/qcom/sdm845/cdsp.b04
+./lib/firmware/qcom/sdm845/cdsp.b05
+./lib/firmware/qcom/sdm845/cdsp.b06
+./lib/firmware/qcom/sdm845/cdsp.b08
+./lib/firmware/qcom/sdm845/cdsp.mbn
+./lib/firmware/qcom/sdm845/cdsp.mdt
+./lib/firmware/qcom/sdm845/cdspr.jsn
+./lib/firmware/qcom/sdm845/mba.mbn
+./lib/firmware/qcom/sdm845/modem.mbn
+./lib/firmware/qcom/sdm845/modemuw.jsn
+./lib/firmware/qcom/sdm845/wlanmdsp.mbn
+./lib/firmware/qcom/venus-5.2/
+./lib/firmware/qcom/venus-5.2/venus.b00
+./lib/firmware/qcom/venus-5.2/venus.b01
+./lib/firmware/qcom/venus-5.2/venus.b02
+./lib/firmware/qcom/venus-5.2/venus.b03
+./lib/firmware/qcom/venus-5.2/venus.b04
+./lib/firmware/qcom/venus-5.2/venus.mbn
+./lib/firmware/qcom/venus-5.2/venus.mdt
+./lib/firmware/regulatory.db
+./lib/firmware/regulatory.db.p7s
+./lib/firmware/renesas_usb_fw.mem
diff --git a/lt-qcom-linux-test/get_latest_testimage.py b/lt-qcom-linux-test/get_latest_testimage.py
new file mode 100755
index 0000000000..6b66da315f
--- /dev/null
+++ b/lt-qcom-linux-test/get_latest_testimage.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+import sys
+import urllib.parse
+import urllib.request
+import re
+
+from bs4 import BeautifulSoup, SoupStrainer
+
+def validate_url(url):
+    urllib.request.urlopen(url)
+
+def get_image_url(page, base_url, rex_str):
+    rex = re.compile(rex_str)
+    url = ''
+    soup = BeautifulSoup(page, "html.parser", parse_only=SoupStrainer("a"))
+    for line in soup.find_all('a', href=True):
+        s = rex.search(line['href'])
+        if s:
+            url = base_url + line['href']
+            break
+    return url
+
+def get_base_url(url, job_url):
+    f = urllib.request.urlopen(job_url + "lastSuccessfulBuild/buildNumber")
+    last_build = int(f.read().decode("utf-8"))
+    url = '%s/%d/' % (url, last_build)
+    f = urllib.request.urlopen(url)
+    page = f.read().decode("utf-8")
+    base_url_p = urllib.parse.urlparse(url)
+    base_url = "%s://%s" % (base_url_p.scheme, base_url_p.netloc)
+    return (page, base_url)
+
+def main(url='https://snapshots.linaro.org/member-builds/qcomlt/testimages/qcom-armv8a/',
+         job_url='https://ci.linaro.org/job/lt-qcom-linux-testimages/',
+         output='output.log'):
+
+    (page, base_url) = get_base_url(url, job_url)
+    ramdisk_url = get_image_url(page, base_url, 'initramfs-test-image-.*\.rootfs\.cpio\.gz$')
+    validate_url(ramdisk_url)
+    rootfs_url = get_image_url(page, base_url, 'rpb-console-image-test-.*\.rootfs\.ext4\.gz$')
+    validate_url(rootfs_url)
+    print('RAMDISK_URL=%s' % ramdisk_url)
+    print('ROOTFS_URL=%s' % rootfs_url)
+
+    rootfs_desktop_url = get_image_url(page, base_url, 'rpb-desktop-image-test-.*\.rootfs\.ext4\.gz$')
+    validate_url(rootfs_desktop_url)
+    print('ROOTFS_DESKTOP_URL=%s' % rootfs_desktop_url)
+
+    print('Writting output to %s' % output)
+    with open(output, 'w') as f:
+        f.write("RAMDISK_URL=" + ramdisk_url + '\n')
+        f.write("ROOTFS_URL=" + rootfs_url + '\n')
+        f.write("ROOTFS_DESKTOP_URL=" + rootfs_desktop_url + '\n')
+
+if __name__ == "__main__":
+    main(*sys.argv[1:])
diff --git a/lt-qcom-linux-test/submit_for_testing.sh b/lt-qcom-linux-test/submit_for_testing.sh
new file mode 100755
index 0000000000..b82ee9d8c7
--- /dev/null
+++ b/lt-qcom-linux-test/submit_for_testing.sh
@@ -0,0 +1,192 @@
+#!/bin/bash
+
+set -ex
+
+# Create variables file to use with lava-test-plans submit_for_testing.py
+function create_testing_variables_file () {
+	cat << EOF > $1
+"LAVA_JOB_PRIORITY": "$LAVA_JOB_PRIORITY"
+
+"PROJECT": "projects/lt-qcom/"
+"PROJECT_NAME": "lt-qcom"
+"OS_INFO": "kernel"
+
+"BUILD_URL": "$BUILD_URL"
+"BUILD_NUMBER": "$BUILD_NUMBER"
+"KERNEL_REPO": "$KERNEL_REPO"
+"KERNEL_BRANCH": "$KERNEL_BRANCH"
+"KERNEL_COMMIT": "$KERNEL_COMMIT"
+"KERNEL_DESCRIBE": "$KERNEL_DESCRIBE"
+"KERNEL_CONFIG": "$KERNEL_CONFIG"
+"TOOLCHAIN": "$KERNEL_TOOLCHAIN"
+
+"DEPLOY_OS": "oe"
+"BOOT_URL": "$BOOT_URL"
+"BOOT_URL_COMP": "$BOOT_URL_COMP"
+"LXC_BOOT_FILE": "$LXC_BOOT_FILE"
+"ROOTFS_URL": "$ROOTFS_URL"
+"ROOTFS_URL_COMP": "$ROOTFS_URL_COMP"
+"LXC_ROOTFS_FILE": "$LXC_ROOTFS_FILE"
+
+"SMOKE_TESTS": "$SMOKE_TESTS"
+"WLAN_DEVICE": "$WLAN_DEVICE"
+"ETH_DEVICE": "$ETH_DEVICE"
+"DEQP_FAIL_LIST": "$DEQP_FAIL_LIST"
+EOF
+}
+
+case "${MACHINE}" in
+  apq8016-sbc|apq8096-db820c|sdm845-mtp|sdm845-db845c|qcs404-evb-4000|sm8150-mtp|sm8250-mtp|sm8350-mtp)
+
+    export SMOKE_TESTS="pwd, uname -a, ip a, vmstat, lsblk, lscpu"
+    export WLAN_DEVICE="wlan0"
+    export ETH_DEVICE="eth0"
+
+    if [ ${MACHINE} = "apq8016-sbc" ]; then
+      export LAVA_DEVICE_TYPE="dragonboard-410c"
+      export DEQP_FAIL_LIST="deqp-freedreno-a307-fails.txt"
+    elif [ ${MACHINE} = "apq8096-db820c" ]; then
+      export LAVA_DEVICE_TYPE="dragonboard-820c"
+      export DEQP_FAIL_LIST="deqp-freedreno-a530-fails.txt"
+    elif [ ${MACHINE} = "sdm845-db845c" ]; then
+      export LAVA_DEVICE_TYPE="dragonboard-845c"
+      export DEQP_FAIL_LIST="deqp-freedreno-a630-fails.txt"
+    elif [ ${MACHINE} = "sdm845-mtp" ]; then
+      export LAVA_DEVICE_TYPE="sdm845-mtp"
+    elif [ ${MACHINE} = "qcs404-evb-4000" ]; then
+      export LAVA_DEVICE_TYPE="qcs404-evb-4k"
+    else
+      export LAVA_DEVICE_TYPE="${MACHINE}"
+    fi
+    ;;
+  *)
+    echo "No LAVA test for ${MACHINE}"
+    exit
+    ;;
+esac
+
+rm -rf lava-test-plans
+if [ "$LAVA_TEST_PLANS_GIT_REPO" ]; then
+  git clone --depth 1 $LAVA_TEST_PLANS_GIT_REPO lava-test-plans
+else
+  git clone --depth 1 https://github.com/Linaro/lava-test-plans.git
+fi
+
+# lava-test-plans setup
+pushd lava-test-plans
+git rev-parse HEAD
+
+# TODO: workaround while project requirements file is created again
+if [ ! -f requirements.txt ]; then
+    cat << EOF > requirements.txt
+requests
+ruamel.yaml
+Jinja2
+docker
+configobj
+EOF
+fi
+pip3 install -r requirements.txt
+popd
+
+# Select which testcases will be send to LAVA
+# - bootrr on integration, mainline and release.
+# - smoke on integration, mainline and release with Dragonboard machines.
+case "${MACHINE}" in
+  apq8016-sbc|apq8096-db820c|sdm845-db845c)
+      SMOKE_TEST_CASE=true
+      DESKTOP_TEST_CASE=true
+      MULTIMEDIA_TEST_CASE=true
+  ;;
+esac
+
+export LAVA_JOB_PRIORITY="high"
+export BOOT_URL=${PUBLISH_SERVER}${PUB_DEST}/${BOOT_FILE}
+export BOOT_URL_COMP=
+export LXC_BOOT_FILE=$(basename ${BOOT_URL})
+
+create_testing_variables_file out/submit_for_testing_bootrr.yaml
+
+cd lava-test-plans
+./submit_for_testing.py \
+    --device-type ${LAVA_DEVICE_TYPE} \
+    --build-number ${KERNEL_DESCRIBE} \
+    --lava-server ${LAVA_SERVER} \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team qcomlt \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --testplan-device-path lava_test_plans/projects/lt-qcom/devices \
+    ${DRY_RUN} \
+    --test-case testcases/kernel-bootrr.yaml \
+    --variables ../out/submit_for_testing_bootrr.yaml
+cd ..
+
+if [ $SMOKE_TEST_CASE = true ]; then
+  export LAVA_JOB_PRIORITY="medium"
+  export BOOT_URL=${PUBLISH_SERVER}${PUB_DEST}/${BOOT_ROOTFS_FILE}
+  export BOOT_URL_COMP=
+  export LXC_BOOT_FILE=$(basename ${BOOT_URL})
+  export ROOTFS_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_FILE}
+  export ROOTFS_URL_COMP="gz"
+  export LXC_ROOTFS_FILE=$(basename ${ROOTFS_FILE} .gz)
+
+  create_testing_variables_file out/submit_for_testing_rootfs.yaml
+
+  cd lava-test-plans
+  ./submit_for_testing.py \
+      --device-type ${LAVA_DEVICE_TYPE} \
+      --build-number ${KERNEL_DESCRIBE} \
+      --lava-server ${LAVA_SERVER} \
+      --qa-server ${QA_SERVER} \
+      --qa-server-team qcomlt \
+      --qa-server-project ${QA_SERVER_PROJECT} \
+      --testplan-device-path lava_test_plans/projects/lt-qcom/devices \
+      ${DRY_RUN} \
+      --test-case testcases/kernel-smoke.yaml \
+      --variables ../out/submit_for_testing_rootfs.yaml
+  cd ..
+fi
+
+if [ $DESKTOP_TEST_CASE = true ] || [ $MULTIMEDIA_TEST_CASE = true ]; then
+  export LAVA_JOB_PRIORITY="medium"
+  export BOOT_URL=${PUBLISH_SERVER}${PUB_DEST}/${BOOT_ROOTFS_FILE}
+  export BOOT_URL_COMP=
+  export LXC_BOOT_FILE=$(basename ${BOOT_URL})
+  export ROOTFS_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_DESKTOP_FILE}
+  export ROOTFS_URL_COMP="gz"
+  export LXC_ROOTFS_FILE=$(basename ${ROOTFS_DESKTOP_FILE} .gz)
+
+  create_testing_variables_file out/submit_for_testing_rootfs_desktop.yaml
+fi
+
+if [ $DESKTOP_TEST_CASE = true ]; then
+  cd lava-test-plans
+  ./submit_for_testing.py \
+      --device-type ${LAVA_DEVICE_TYPE} \
+      --build-number ${KERNEL_DESCRIBE} \
+      --lava-server ${LAVA_SERVER} \
+      --qa-server ${QA_SERVER} \
+      --qa-server-team qcomlt \
+      --qa-server-project ${QA_SERVER_PROJECT} \
+      --testplan-device-path lava_test_plans/projects/lt-qcom/devices \
+      ${DRY_RUN} \
+      --test-case testcases/kernel-desktop.yaml \
+      --variables ../out/submit_for_testing_rootfs_desktop.yaml
+  cd ..
+fi
+
+if [ $MULTIMEDIA_TEST_CASE = true ]; then
+  cd lava-test-plans
+  ./submit_for_testing.py \
+      --device-type ${LAVA_DEVICE_TYPE} \
+      --build-number ${KERNEL_DESCRIBE} \
+      --lava-server ${LAVA_SERVER} \
+      --qa-server ${QA_SERVER} \
+      --qa-server-team qcomlt \
+      --qa-server-project ${QA_SERVER_PROJECT} \
+      --testplan-device-path lava_test_plans/projects/lt-qcom/devices \
+      ${DRY_RUN} \
+      --test-case testcases/kernel-multimedia.yaml \
+      --variables ../out/submit_for_testing_rootfs_desktop.yaml
+  cd ..
+fi
diff --git a/lt-qcom-linux-test/test_submit_for_testing.sh b/lt-qcom-linux-test/test_submit_for_testing.sh
new file mode 100755
index 0000000000..af137f3a53
--- /dev/null
+++ b/lt-qcom-linux-test/test_submit_for_testing.sh
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+set -ex
+
+mkdir -p out
+virtualenv --python=$(which python3) .venv
+source .venv/bin/activate
+
+export LAVA_TEST_PLANS_GIT_REPO=https://github.com/alimon/lava-test-plans.git
+
+export BUILD_NUMBER=774
+export BUILD_URL=https://ci.linaro.org/job/lt-qcom-linux-integration/774/MACHINE=apq8016-sbc,label=docker-stretch-amd64/
+export KERNEL_REPO=https://git.codelinaro.org/linaro/qcomlt/kernel.git/
+export KERNEL_BRANCH=integration-linux-qcomlt
+export KERNEL_COMMIT=d975b65255b62891a533fa57196a7bd1097a7825
+export KERNEL_DESCRIBE=v5.11-439-gd975b65255b6
+export KERNEL_CONFIG=defconfig
+export KERNEL_TOOLCHAIN=unknown
+
+export PUBLISH_SERVER=https://snapshots.linaro.org/
+
+export QA_SERVER="http://localhost:8000"
+export QA_REPORTS_TOKEN="secret"
+export LAVA_SERVER=https://validation.linaro.org/RPC2/
+export QA_SERVER_PROJECT="linux-integration"
+
+export DRY_RUN="--dry-run "
+
+export MACHINE="sdm845-db845c"
+export PUB_DEST=member-builds/qcomlt/linux-integration/${MACHINE}/774/
+export BOOT_FILE=boot-linux-integration-v5.11-435-g01c71850a6a8-774-sdm845-db845c.img
+export BOOT_ROOTFS_FILE=boot-rootfs-linux-integration-v5.11-435-g01c71850a6a8-774-sdm845-db845c.img
+export ROOTFS_FILE=rpb-console-image-test-qemuarm64-20210219075501-702.rootfs.img.gz
+export ROOTFS_DESKTOP_FILE=rpb-desktop-image-test-qemuarm64-20210219075501-702.rootfs.img.gz
+bash submit_for_testing.sh
+cp -r lava-test-plans/tmp/dragonboard-845c out/
+
+export MACHINE="apq8016-sbc"
+export PUB_DEST=member-builds/qcomlt/linux-integration/${MACHINE}/774/
+export BOOT_FILE=boot-linux-integration-v5.11-435-g01c71850a6a8-774-apq8016-sbc.img
+export BOOT_ROOTFS_FILE=boot-rootfs-linux-integration-v5.11-435-g01c71850a6a8-774-apq8016-sbc.img
+export ROOTFS_FILE=rpb-console-image-test-qemuarm64-20210219075501-702.rootfs.img.gz
+export ROOTFS_DESKTOP_FILE=rpb-desktop-image-test-qemuarm64-20210219075501-702.rootfs.img.gz
+bash submit_for_testing.sh
+cp -r lava-test-plans/tmp/dragonboard-410c out/
+
+# cleanup virtualenv
+deactivate
+rm -rf .venv
diff --git a/lt-qcom-linux-testimages.yaml b/lt-qcom-linux-testimages.yaml
new file mode 100644
index 0000000000..bc5783621e
--- /dev/null
+++ b/lt-qcom-linux-testimages.yaml
@@ -0,0 +1,120 @@
+- job:
+    name: lt-qcom-linux-testimages
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            linaro-qualcomm-ci:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'initramfs-tiny-image initramfs-test-image rpb-console-image-test rpb-desktop-image-test'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/96boards/oe-rpb-manifest.git'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'qcom/master'
+        - string:
+            name: DISTRO
+            default: 'rpb'
+        - string:
+            name: QCOM_USERSPACE_TOOLS
+            default: 'fastrpc pd-mapper qrtr rmtfs tqftpserv'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+    disabled: true
+    node: master
+    display-name: 'Qualcomm LT User space for kernel testing'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'qemuarm64'
+                - 'qemuarm'
+                - 'qcom-armv8a'
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - workspace-cleanup
+        - credentials-binding:
+            - text:
+                credential-id: TUXSUITE_TOKEN
+                variable: TUXSUITE_TOKEN
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+    builders:
+        - shell: |
+            #!/bin/bash
+            echo "PUB_DEST=member-builds/qcomlt/testimages/$(echo ${MACHINE} | sed 's/qemu//')/${BUILD_NUMBER}" > pub_dest_parameters
+
+            # ensure that we generate the right image type, by default qemu* only generates .ext4, we need .ext4.gz
+            # enable mesa to test freedreno
+            cat << EOF > local.conf.json
+            {"local_conf" : [
+            "IMAGE_FSTYPES:remove = 'ext4'",
+            "IMAGE_FSTYPES:append = ' ext4.gz'",
+            "PACKAGECONFIG:append:pn-mesa = 'freedreno xa'",
+            "PREFERRED_PROVIDER_virtual/kernel = 'linux-dummy'",
+            "PREFERRED_PROVIDER_android-tools-conf = 'android-tools-conf-configfs'"
+            ]}
+            EOF
+
+            if [ "${MACHINE}" = "qcom-armv8a" ]; then
+              # install firmware
+              # remove kernel and modules to beign installed
+              cat << EOF >> local.conf.json
+              {"local_conf" : [
+              "MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS:remove = 'kernel-modules'",
+              "RDEPENDS:packagegroup-rpb:remove = 'kernel-modules'",
+              "PACKAGE_EXCLUDE:append = ' kernel-modules'"
+              ]}
+            EOF
+            else
+              # configure serial in rpb-console-image-test
+              # add ext4 block size to 4096, boards with UFS storage needs it
+              # add machine dependent qcom services to initramfs and rpb images
+              cat << EOF >> local.conf.json
+              {"local_conf" : [
+              "SERIAL_CONSOLES = '115200;ttyMSM0'",
+              "EXTRA_IMAGECMD_ext4 += ' -b 4096 '",
+              "CORE_IMAGE_EXTRA_INSTALL += '${QCOM_USERSPACE_TOOLS}'",
+              "PACKAGE_INSTALL:append = ' ${QCOM_USERSPACE_TOOLS}'"
+              ]}
+            EOF
+            fi
+        - inject:
+            properties-file: pub_dest_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/builders-tux.sh
+        - inject:
+            properties-file: parameters
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+        - email-ext:
+            recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org'
+            failure: true
+            still-failing: true
+            matrix-trigger: only-parent
diff --git a/lt-qcom-linux.yaml b/lt-qcom-linux.yaml
index 1108e70fac..d7eeb4468c 100644
--- a/lt-qcom-linux.yaml
+++ b/lt-qcom-linux.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro-landing-team-qualcomm-personnel:
+            linaro-qualcomm-ci:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -18,7 +18,7 @@
     parameters:
         - string:
             name: KERNEL_REPO_URL
-            default: 'https://git.linaro.org/landing-teams/working/qualcomm/kernel.git'
+            default: 'https://git.codelinaro.org/linaro/qcomlt/kernel.git'
         - string:
             name: KERNEL_CONFIGS_arm64
             default: 'defconfig distro.config'
@@ -35,11 +35,20 @@
         - string:
             name: KERNEL_BRANCH
         - string:
+            name: KERNEL_FLAVOR
+            default: 'linux'
+        - string:
+            name: KERNEL_DEBIAN
+            default: ''
+        - string:
             name: TARGET_REPO
             default: 'linaro-overlay-sid'
         - string:
             name: KDEB_CHANGELOG_DIST
             default: 'sid'
+        - string:
+            name: UPDATE_DEFCONFIG
+            default: 'True'
     axes:
         - axis:
             type: user-defined
@@ -51,12 +60,12 @@
             type: slave
             name: label
             values:
-                - docker-stretch-amd64
+                - docker-buster-amd64
     execution-strategy:
         sequential: false
-    disabled: false
+    disabled: true
     node: master
-    display-name: 'Qualcomm LT Linux kernel build'
+    display-name: 'Qualcomm LT Dragonboard Linux kernel build'
     scm:
         - git:
             url: ${KERNEL_REPO_URL}
@@ -72,20 +81,37 @@
         - timestamps
         - build-name:
             name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
     builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-            sudo apt-get update
-            sudo apt-get install -y ccache bc kmod cpio
+        - shell:
+            !include-raw: lt-qcom-linux/builders-deps.sh
+        - shell:
+            !include-raw: lt-qcom/install-gcc-toolchain.sh
+        - inject:
+            properties-file: gcc_toolchain_env
         - shell:
             !include-raw: lt-qcom-linux/builders.sh
+        - inject:
+            properties-file: kernel_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: lt-qcom-linux/builders_linaro_ci.sh
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: lt-qcom/publishers.sh
         - trigger-builds:
+            - project: 'lt-qcom-linux-test-${KERNEL_FLAVOR}'
+              property-file: test_params
             - project: 'build-package-obs'
               property-file: params
               block: true
     publishers:
         - email-ext:
-            recipients: 'nicolas.dechesne@linaro.org anibal.limon@linaro.org'
-            always: true
+            recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org'
+            failure: true
+            still-failing: true
             matrix-trigger: only-parent
diff --git a/lt-qcom-linux/aic100.sh b/lt-qcom-linux/aic100.sh
new file mode 100644
index 0000000000..b8d8002036
--- /dev/null
+++ b/lt-qcom-linux/aic100.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -ex
+
+# setup and download sources
+KERNEL_VERSION=5.4.1
+mkdir -p ${WORKSPACE}/out
+wget https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-${KERNEL_VERSION}.tar.xz
+tar xf linux-${KERNEL_VERSION}.tar.xz
+cd linux-${KERNEL_VERSION}
+
+if [ "${DISTRO}" == "bionic" ]; then
+    sudo apt update
+    sudo apt install -y bc kmod cpio dpkg-dev wget flex bison bc kmod cpio libssl-dev liblz4-tool libelf-dev libssl-dev build-essential rsync
+    make mrproper
+    wget https://git.linaro.org/ci/job/configs.git/plain/lt-qcom-linux/aic100/config-5.4.1-050401-generic -O .config
+    make EXTRAVERSION=-050401-generic -j$(nproc) deb-pkg
+    cp ../*.deb ${WORKSPACE}/out
+
+elif [ "${DISTRO}" == "centos7" ]; then
+    sudo yum install -y git which gcc ncurses-devel make gcc bc bison flex elfutils-libelf-devel openssl-devel vim rpm-build rsync
+    make mrproper
+    wget https://git.linaro.org/ci/job/configs.git/plain/lt-qcom-linux/aic100/config-5.4.1-1.el7.elrepo.x86_64 -O .config
+    make EXTRAVERSION=-1.el7.elrepo.x86_64 -j$(nproc) rpm-pkg
+    cp ~/rpmbuild/RPMS/x86_64/*.rpm ${WORKSPACE}/out
+fi
diff --git a/lt-qcom-linux/aic100/config-5.4.1-050401-generic b/lt-qcom-linux/aic100/config-5.4.1-050401-generic
new file mode 100644
index 0000000000..868b99a4a3
--- /dev/null
+++ b/lt-qcom-linux/aic100/config-5.4.1-050401-generic
@@ -0,0 +1,10436 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86 5.4.1-050401-generic Kernel Configuration
+#
+
+#
+# Compiler: gcc (Ubuntu 9.2.1-19ubuntu1) 9.2.1 20191109
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=90201
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_ASM_INLINE=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+# CONFIG_KERNEL_GZIP is not set
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+CONFIG_KERNEL_LZ4=y
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+CONFIG_NO_HZ_IDLE=y
+# CONFIG_NO_HZ_FULL is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_TICK_CPU_ACCOUNTING=y
+# CONFIG_VIRT_CPU_ACCOUNTING_GEN is not set
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+# CONFIG_PSI_DEFAULT_DISABLED is not set
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_TASKS_RCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+# end of RCU Subsystem
+
+CONFIG_BUILD_BIN2C=y
+# CONFIG_IKCONFIG is not set
+CONFIG_IKHEADERS=m
+CONFIG_LOG_BUF_SHIFT=18
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+CONFIG_UCLAMP_TASK=y
+CONFIG_UCLAMP_BUCKETS_COUNT=5
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+# CONFIG_MEMCG_SWAP_ENABLED is not set
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+# CONFIG_RT_GROUP_SCHED is not set
+CONFIG_UCLAMP_TASK_GROUP=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+CONFIG_BPF_JIT_ALWAYS_ON=y
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+CONFIG_PC104=y
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+CONFIG_SLUB_MEMCG_SYSFS_ON=y
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+CONFIG_SLAB_FREELIST_RANDOM=y
+CONFIG_SLAB_FREELIST_HARDENED=y
+CONFIG_SHUFFLE_PAGE_ALLOCATOR=y
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_DYNAMIC_PHYSICAL_MASK=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+CONFIG_X86_CPU_RESCTRL=y
+CONFIG_X86_EXTENDED_PLATFORM=y
+CONFIG_X86_NUMACHIP=y
+# CONFIG_X86_VSMP is not set
+# CONFIG_X86_UV is not set
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
+CONFIG_X86_INTEL_LPSS=y
+CONFIG_X86_AMD_PLATFORM_DEVICE=y
+CONFIG_IOSF_MBI=y
+CONFIG_IOSF_MBI_DEBUG=y
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+CONFIG_KVM_DEBUG_FS=y
+# CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
+CONFIG_PARAVIRT_CLOCK=y
+CONFIG_JAILHOUSE_GUEST=y
+CONFIG_ACRN_GUEST=y
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+CONFIG_PROCESSOR_SELECT=y
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+CONFIG_CALGARY_IOMMU=y
+CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y
+CONFIG_MAXSMP=y
+CONFIG_NR_CPUS_RANGE_BEGIN=8192
+CONFIG_NR_CPUS_RANGE_END=8192
+CONFIG_NR_CPUS_DEFAULT=8192
+CONFIG_NR_CPUS=8192
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCELOG_LEGACY=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+CONFIG_X86_MCE_INJECT=m
+CONFIG_X86_THERMAL_VECTOR=y
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+# CONFIG_PERF_EVENTS_AMD_POWER is not set
+# end of Performance monitoring
+
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=m
+CONFIG_X86_CPUID=m
+# CONFIG_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
+CONFIG_AMD_MEM_ENCRYPT=y
+# CONFIG_AMD_MEM_ENCRYPT_ACTIVE_BY_DEFAULT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=10
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
+CONFIG_X86_INTEL_MPX=y
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+CONFIG_HZ_250=y
+# CONFIG_HZ_300 is not set
+# CONFIG_HZ_1000 is not set
+CONFIG_HZ=250
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+CONFIG_KEXEC_FILE=y
+CONFIG_ARCH_HAS_KEXEC_PURGATORY=y
+CONFIG_KEXEC_SIG=y
+# CONFIG_KEXEC_SIG_FORCE is not set
+CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+CONFIG_RANDOMIZE_BASE=y
+CONFIG_X86_NEED_RELOCS=y
+CONFIG_PHYSICAL_ALIGN=0x200000
+CONFIG_DYNAMIC_MEMORY_LAYOUT=y
+CONFIG_RANDOMIZE_MEMORY=y
+CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+# CONFIG_LEGACY_VSYSCALL_EMULATE is not set
+CONFIG_LEGACY_VSYSCALL_XONLY=y
+# CONFIG_LEGACY_VSYSCALL_NONE is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+CONFIG_LIVEPATCH=y
+# end of Processor type and features
+
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+CONFIG_PM_WAKELOCKS=y
+CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_GC=y
+CONFIG_PM=y
+CONFIG_PM_DEBUG=y
+CONFIG_PM_ADVANCED_DEBUG=y
+# CONFIG_PM_TEST_SUSPEND is not set
+CONFIG_PM_SLEEP_DEBUG=y
+# CONFIG_DPM_WATCHDOG is not set
+CONFIG_PM_TRACE=y
+CONFIG_PM_TRACE_RTC=y
+CONFIG_PM_CLK=y
+CONFIG_PM_GENERIC_DOMAINS=y
+CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
+CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+CONFIG_ACPI_DEBUGGER=y
+CONFIG_ACPI_DEBUGGER_USER=y
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_LPIT=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+CONFIG_ACPI_EC_DEBUGFS=m
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+CONFIG_ACPI_TAD=m
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_NUMA=y
+CONFIG_ACPI_CUSTOM_DSDT_FILE=""
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_DEBUG=y
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+CONFIG_ACPI_HMAT=y
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+CONFIG_ACPI_APEI_EINJ=m
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_DPTF_POWER=m
+CONFIG_ACPI_WATCHDOG=y
+CONFIG_ACPI_EXTLOG=m
+CONFIG_ACPI_ADXL=y
+# CONFIG_PMIC_OPREGION is not set
+CONFIG_ACPI_CONFIGFS=m
+CONFIG_TPS68470_PMIC_OPREGION=y
+CONFIG_X86_PM_TIMER=y
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ=y
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=y
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+CONFIG_X86_SPEEDSTEP_CENTRINO=y
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_CPU_IDLE_GOV_TEO=y
+CONFIG_CPU_IDLE_GOV_HALTPOLL=y
+CONFIG_HALTPOLL_CPUIDLE=m
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+CONFIG_ISA_BUS=y
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+# CONFIG_X86_SYSFB is not set
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+CONFIG_X86_X32=y
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
+CONFIG_X86_DEV_DMA_OPS=y
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=y
+CONFIG_EDD_OFF=y
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=m
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=m
+# CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE is not set
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+CONFIG_EFI_BOOTLOADER_CONTROL=m
+CONFIG_EFI_CAPSULE_LOADER=m
+CONFIG_EFI_TEST=m
+CONFIG_APPLE_PROPERTIES=y
+CONFIG_RESET_ATTACK_MITIGATION=y
+CONFIG_EFI_RCI2_TABLE=y
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
+# CONFIG_KVM_MMU_AUDIT is not set
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_OPROFILE=m
+# CONFIG_OPROFILE_EVENT_MULTIPLEX is not set
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_ISA_BUS_API=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
+# CONFIG_REFCOUNT_FULL is not set
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC=""
+CONFIG_HAVE_GCC_PLUGINS=y
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULE_SIG_FORMAT=y
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+# CONFIG_MODVERSIONS is not set
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_MODULE_SIG=y
+# CONFIG_MODULE_SIG_FORCE is not set
+CONFIG_MODULE_SIG_ALL=y
+# CONFIG_MODULE_SIG_SHA1 is not set
+# CONFIG_MODULE_SIG_SHA224 is not set
+# CONFIG_MODULE_SIG_SHA256 is not set
+# CONFIG_MODULE_SIG_SHA384 is not set
+CONFIG_MODULE_SIG_SHA512=y
+CONFIG_MODULE_SIG_HASH="sha512"
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+CONFIG_UNUSED_SYMBOLS=y
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_RQ_ALLOC_TIME=y
+CONFIG_BLK_SCSI_REQUEST=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+CONFIG_BLK_CMDLINE_PARSER=y
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+CONFIG_BLK_CGROUP_IOCOST=y
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+CONFIG_BLK_SED_OPAL=y
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+CONFIG_AIX_PARTITION=y
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+CONFIG_ATARI_PARTITION=y
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+CONFIG_LDM_PARTITION=y
+# CONFIG_LDM_DEBUG is not set
+CONFIG_SGI_PARTITION=y
+CONFIG_ULTRIX_PARTITION=y
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+CONFIG_SYSV68_PARTITION=y
+CONFIG_CMDLINE_PARTITION=y
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=m
+CONFIG_IOSCHED_BFQ=m
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=65536
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
+CONFIG_TRANSPARENT_HUGEPAGE_MADVISE=y
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+CONFIG_CMA=y
+# CONFIG_CMA_DEBUG is not set
+# CONFIG_CMA_DEBUGFS is not set
+CONFIG_CMA_AREAS=7
+CONFIG_MEM_SOFT_DIRTY=y
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+CONFIG_Z3FOLD=m
+CONFIG_ZSMALLOC=y
+CONFIG_PGTABLE_MAPPING=y
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+CONFIG_IDLE_PAGE_TRACKING=y
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+CONFIG_DEVICE_PRIVATE=y
+CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+CONFIG_TLS_DEVICE=y
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=m
+CONFIG_XFRM_USER=m
+CONFIG_XFRM_INTERFACE=m
+# CONFIG_XFRM_SUB_POLICY is not set
+# CONFIG_XFRM_MIGRATE is not set
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+# CONFIG_NET_KEY_MIGRATE is not set
+CONFIG_SMC=m
+CONFIG_SMC_DIAG=m
+CONFIG_XDP_SOCKETS=y
+CONFIG_XDP_SOCKETS_DIAG=m
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+# CONFIG_IP_MROUTE_MULTIPLE_TABLES is not set
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+CONFIG_INET_DIAG_DESTROY=y
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+# CONFIG_IPV6_OPTIMISTIC_DAD is not set
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+CONFIG_IPV6_SEG6_LWTUNNEL=y
+CONFIG_IPV6_SEG6_HMAC=y
+CONFIG_IPV6_SEG6_BPF=y
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=m
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+# CONFIG_NF_CONNTRACK_PROCFS is not set
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=m
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+
+#
+# DECnet: Netfilter Configuration
+#
+CONFIG_DECNET_NF_GRABULATOR=m
+# end of DECnet: Netfilter Configuration
+
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+CONFIG_BPFILTER=y
+CONFIG_BPFILTER_UMH=m
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+# CONFIG_IP_DCCP_CCID3 is not set
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+CONFIG_RDS=m
+CONFIG_RDS_RDMA=m
+CONFIG_RDS_TCP=m
+# CONFIG_RDS_DEBUG is not set
+CONFIG_TIPC=m
+CONFIG_TIPC_MEDIA_IB=y
+CONFIG_TIPC_MEDIA_UDP=y
+CONFIG_TIPC_DIAG=m
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+CONFIG_ATM_MPOA=m
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+CONFIG_L2TP_DEBUGFS=m
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=m
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=m
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+CONFIG_NET_DSA=m
+CONFIG_NET_DSA_TAG_8021Q=m
+CONFIG_NET_DSA_TAG_BRCM_COMMON=m
+CONFIG_NET_DSA_TAG_BRCM=m
+CONFIG_NET_DSA_TAG_BRCM_PREPEND=m
+CONFIG_NET_DSA_TAG_GSWIP=m
+CONFIG_NET_DSA_TAG_DSA=m
+CONFIG_NET_DSA_TAG_EDSA=m
+CONFIG_NET_DSA_TAG_MTK=m
+CONFIG_NET_DSA_TAG_KSZ=m
+CONFIG_NET_DSA_TAG_QCA=m
+CONFIG_NET_DSA_TAG_LAN9303=m
+CONFIG_NET_DSA_TAG_SJA1105=m
+CONFIG_NET_DSA_TAG_TRAILER=m
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+CONFIG_DECNET=m
+# CONFIG_DECNET_ROUTER is not set
+CONFIG_LLC=m
+CONFIG_LLC2=m
+CONFIG_ATALK=m
+CONFIG_DEV_APPLETALK=m
+CONFIG_LTPC=m
+CONFIG_COPS=m
+CONFIG_COPS_DAYNA=y
+CONFIG_COPS_TANGENT=y
+# CONFIG_IPDDP is not set
+CONFIG_X25=m
+CONFIG_LAPB=m
+CONFIG_PHONET=m
+CONFIG_6LOWPAN=m
+# CONFIG_6LOWPAN_DEBUGFS is not set
+CONFIG_6LOWPAN_NHC=m
+CONFIG_6LOWPAN_NHC_DEST=m
+CONFIG_6LOWPAN_NHC_FRAGMENT=m
+CONFIG_6LOWPAN_NHC_HOP=m
+CONFIG_6LOWPAN_NHC_IPV6=m
+CONFIG_6LOWPAN_NHC_MOBILITY=m
+CONFIG_6LOWPAN_NHC_ROUTING=m
+CONFIG_6LOWPAN_NHC_UDP=m
+# CONFIG_6LOWPAN_GHC_EXT_HDR_HOP is not set
+# CONFIG_6LOWPAN_GHC_UDP is not set
+# CONFIG_6LOWPAN_GHC_ICMPV6 is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_DEST is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG is not set
+# CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE is not set
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_IEEE802154_6LOWPAN=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+# CONFIG_CLS_U32_PERF is not set
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+# CONFIG_NET_ACT_IFE is not set
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_TC_SKB_EXT=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
+CONFIG_BATMAN_ADV=m
+# CONFIG_BATMAN_ADV_BATMAN_V is not set
+CONFIG_BATMAN_ADV_BLA=y
+CONFIG_BATMAN_ADV_DAT=y
+CONFIG_BATMAN_ADV_NC=y
+CONFIG_BATMAN_ADV_MCAST=y
+# CONFIG_BATMAN_ADV_DEBUGFS is not set
+# CONFIG_BATMAN_ADV_DEBUG is not set
+CONFIG_BATMAN_ADV_SYSFS=y
+# CONFIG_BATMAN_ADV_TRACING is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+CONFIG_HYPERV_VSOCKETS=m
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+CONFIG_NET_SWITCHDEV=y
+CONFIG_NET_L3_MASTER_DEV=y
+CONFIG_NET_NCSI=y
+CONFIG_NCSI_OEM_CMD_GET_MAC=y
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+CONFIG_BPF_STREAM_PARSER=y
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+CONFIG_NET_PKTGEN=m
+CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_6LOWPAN=m
+CONFIG_BT_LEDS=y
+# CONFIG_BT_SELFTEST is not set
+CONFIG_BT_DEBUGFS=y
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_QCA=m
+CONFIG_BT_HCIBTUSB=m
+CONFIG_BT_HCIBTUSB_AUTOSUSPEND=y
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_SERDEV=y
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_NOKIA=m
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_LL=y
+CONFIG_BT_HCIUART_3WIRE=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_BCM=y
+CONFIG_BT_HCIUART_RTL=y
+CONFIG_BT_HCIUART_QCA=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIUART_MRVL=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_WILINK=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_MTKUART=m
+CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+# CONFIG_AF_RXRPC_DEBUG is not set
+CONFIG_RXKAD=y
+CONFIG_AF_KCM=m
+CONFIG_STREAM_PARSER=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+CONFIG_CFG80211_DEBUGFS=y
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+CONFIG_MAC80211_MESSAGE_TRACING=y
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+CONFIG_WIMAX=m
+CONFIG_WIMAX_DEBUG_LEVEL=8
+CONFIG_RFKILL=y
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+CONFIG_RFKILL_GPIO=m
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+CONFIG_CAIF=m
+# CONFIG_CAIF_DEBUG is not set
+CONFIG_CAIF_NETDEV=m
+CONFIG_CAIF_USB=m
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+CONFIG_CEPH_LIB_USE_DNS_RESOLVER=y
+CONFIG_NFC=m
+CONFIG_NFC_DIGITAL=m
+CONFIG_NFC_NCI=m
+CONFIG_NFC_NCI_SPI=m
+CONFIG_NFC_NCI_UART=m
+CONFIG_NFC_HCI=m
+CONFIG_NFC_SHDLC=y
+
+#
+# Near Field Communication (NFC) devices
+#
+CONFIG_NFC_TRF7970A=m
+CONFIG_NFC_MEI_PHY=m
+CONFIG_NFC_SIM=m
+CONFIG_NFC_PORT100=m
+CONFIG_NFC_FDP=m
+CONFIG_NFC_FDP_I2C=m
+CONFIG_NFC_PN544=m
+CONFIG_NFC_PN544_I2C=m
+CONFIG_NFC_PN544_MEI=m
+CONFIG_NFC_PN533=m
+CONFIG_NFC_PN533_USB=m
+CONFIG_NFC_PN533_I2C=m
+CONFIG_NFC_MICROREAD=m
+CONFIG_NFC_MICROREAD_I2C=m
+CONFIG_NFC_MICROREAD_MEI=m
+CONFIG_NFC_MRVL=m
+CONFIG_NFC_MRVL_USB=m
+CONFIG_NFC_MRVL_UART=m
+CONFIG_NFC_MRVL_I2C=m
+CONFIG_NFC_MRVL_SPI=m
+CONFIG_NFC_ST21NFCA=m
+CONFIG_NFC_ST21NFCA_I2C=m
+CONFIG_NFC_ST_NCI=m
+CONFIG_NFC_ST_NCI_I2C=m
+CONFIG_NFC_ST_NCI_SPI=m
+CONFIG_NFC_NXP_NCI=m
+CONFIG_NFC_NXP_NCI_I2C=m
+CONFIG_NFC_S3FWRN5=m
+CONFIG_NFC_S3FWRN5_I2C=m
+CONFIG_NFC_ST95HF=m
+# end of Near Field Communication (NFC) devices
+
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_SOCK_VALIDATE_XMIT=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+CONFIG_EISA=y
+CONFIG_EISA_VLB_PRIMING=y
+CONFIG_EISA_PCI_EISA=y
+CONFIG_EISA_VIRTUAL_ROOT=y
+CONFIG_EISA_NAMES=y
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+# CONFIG_PCIE_ECRC is not set
+CONFIG_PCIEASPM=y
+CONFIG_PCIEASPM_DEBUG=y
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+CONFIG_PCIE_DPC=y
+CONFIG_PCIE_PTM=y
+# CONFIG_PCIE_BW is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+CONFIG_PCI_REALLOC_ENABLE_AUTO=y
+CONFIG_PCI_STUB=m
+CONFIG_PCI_PF_STUB=m
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+CONFIG_HOTPLUG_PCI_CPCI=y
+CONFIG_HOTPLUG_PCI_CPCI_ZT5550=m
+CONFIG_HOTPLUG_PCI_CPCI_GENERIC=m
+CONFIG_HOTPLUG_PCI_SHPC=y
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+
+CONFIG_VMD=m
+CONFIG_PCI_HYPERV_INTERFACE=m
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_EP=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+CONFIG_PCIE_DW_PLAT_EP=y
+CONFIG_PCI_MESON=y
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+CONFIG_PCI_ENDPOINT=y
+CONFIG_PCI_ENDPOINT_CONFIGFS=y
+# CONFIG_PCI_EPF_TEST is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_PCCARD=m
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+CONFIG_RAPIDIO=y
+CONFIG_RAPIDIO_TSI721=m
+CONFIG_RAPIDIO_DISC_TIMEOUT=30
+# CONFIG_RAPIDIO_ENABLE_RX_TX_PORTS is not set
+CONFIG_RAPIDIO_DMA_ENGINE=y
+# CONFIG_RAPIDIO_DEBUG is not set
+CONFIG_RAPIDIO_ENUM_BASIC=m
+CONFIG_RAPIDIO_CHMAN=m
+CONFIG_RAPIDIO_MPORT_CDEV=m
+
+#
+# RapidIO Switch drivers
+#
+CONFIG_RAPIDIO_TSI57X=m
+CONFIG_RAPIDIO_CPS_XX=m
+CONFIG_RAPIDIO_TSI568=m
+CONFIG_RAPIDIO_CPS_GEN2=m
+CONFIG_RAPIDIO_RXS_GEN3=m
+# end of RapidIO Switch drivers
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+# CONFIG_STANDALONE is not set
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+CONFIG_FW_LOADER_COMPRESS=y
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+CONFIG_HMEM_REPORTING=y
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SLIMBUS=m
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_SPMI=m
+CONFIG_REGMAP_W1=m
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_REGMAP_SCCB=m
+CONFIG_REGMAP_I3C=m
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+CONFIG_GNSS=m
+CONFIG_GNSS_SERIAL=m
+CONFIG_GNSS_MTK_SERIAL=m
+CONFIG_GNSS_SIRF_SERIAL=m
+CONFIG_GNSS_UBX_SERIAL=m
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+CONFIG_MTD_AR7_PARTS=m
+CONFIG_MTD_CMDLINE_PARTS=m
+CONFIG_MTD_REDBOOT_PARTS=m
+CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=-1
+# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
+# CONFIG_MTD_REDBOOT_PARTS_READONLY is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+CONFIG_MTD_BLOCK_RO=m
+CONFIG_FTL=m
+CONFIG_NFTL=m
+CONFIG_NFTL_RW=y
+CONFIG_INFTL=m
+CONFIG_RFD_FTL=m
+CONFIG_SSFDC=m
+CONFIG_SM_FTL=m
+CONFIG_MTD_OOPS=m
+CONFIG_MTD_SWAP=m
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+CONFIG_MTD_CFI=m
+CONFIG_MTD_JEDECPROBE=m
+CONFIG_MTD_GEN_PROBE=m
+# CONFIG_MTD_CFI_ADV_OPTIONS is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+CONFIG_MTD_CFI_INTELEXT=m
+CONFIG_MTD_CFI_AMDSTD=m
+CONFIG_MTD_CFI_STAA=m
+CONFIG_MTD_CFI_UTIL=m
+CONFIG_MTD_RAM=m
+CONFIG_MTD_ROM=m
+CONFIG_MTD_ABSENT=m
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=m
+# CONFIG_MTD_PHYSMAP_COMPAT is not set
+CONFIG_MTD_PHYSMAP_GPIO_ADDR=y
+CONFIG_MTD_SBC_GXX=m
+CONFIG_MTD_AMD76XROM=m
+CONFIG_MTD_ICHXROM=m
+CONFIG_MTD_ESB2ROM=m
+CONFIG_MTD_CK804XROM=m
+CONFIG_MTD_SCB2_FLASH=m
+CONFIG_MTD_NETtel=m
+CONFIG_MTD_L440GX=m
+CONFIG_MTD_PCI=m
+CONFIG_MTD_PCMCIA=m
+# CONFIG_MTD_PCMCIA_ANONYMOUS is not set
+CONFIG_MTD_INTEL_VR_NOR=m
+CONFIG_MTD_PLATRAM=m
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+CONFIG_MTD_PMC551=m
+# CONFIG_MTD_PMC551_BUGFIX is not set
+# CONFIG_MTD_PMC551_DEBUG is not set
+CONFIG_MTD_DATAFLASH=m
+# CONFIG_MTD_DATAFLASH_WRITE_VERIFY is not set
+CONFIG_MTD_DATAFLASH_OTP=y
+CONFIG_MTD_MCHP23K256=m
+CONFIG_MTD_SST25L=m
+CONFIG_MTD_SLRAM=m
+CONFIG_MTD_PHRAM=m
+CONFIG_MTD_MTDRAM=m
+CONFIG_MTDRAM_TOTAL_SIZE=4096
+CONFIG_MTDRAM_ERASE_SIZE=128
+CONFIG_MTD_BLOCK2MTD=m
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+CONFIG_MTD_NAND_CORE=m
+CONFIG_MTD_ONENAND=m
+CONFIG_MTD_ONENAND_VERIFY_WRITE=y
+CONFIG_MTD_ONENAND_GENERIC=m
+# CONFIG_MTD_ONENAND_OTP is not set
+CONFIG_MTD_ONENAND_2X_PROGRAM=y
+CONFIG_MTD_NAND_ECC_SW_HAMMING=m
+# CONFIG_MTD_NAND_ECC_SW_HAMMING_SMC is not set
+CONFIG_MTD_RAW_NAND=m
+CONFIG_MTD_NAND_ECC_SW_BCH=y
+
+#
+# Raw/parallel NAND flash controllers
+#
+CONFIG_MTD_NAND_DENALI=m
+CONFIG_MTD_NAND_DENALI_PCI=m
+CONFIG_MTD_NAND_CAFE=m
+CONFIG_MTD_NAND_MXIC=m
+CONFIG_MTD_NAND_GPIO=m
+CONFIG_MTD_NAND_PLATFORM=m
+
+#
+# Misc
+#
+CONFIG_MTD_SM_COMMON=m
+CONFIG_MTD_NAND_NANDSIM=m
+CONFIG_MTD_NAND_RICOH=m
+CONFIG_MTD_NAND_DISKONCHIP=m
+# CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADVANCED is not set
+CONFIG_MTD_NAND_DISKONCHIP_PROBE_ADDRESS=0
+# CONFIG_MTD_NAND_DISKONCHIP_BBTWRITE is not set
+CONFIG_MTD_SPI_NAND=m
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+CONFIG_MTD_LPDDR=m
+CONFIG_MTD_QINFO_PROBE=m
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+CONFIG_SPI_MTK_QUADSPI=m
+# CONFIG_SPI_INTEL_SPI_PCI is not set
+# CONFIG_SPI_INTEL_SPI_PLATFORM is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+CONFIG_MTD_UBI_FASTMAP=y
+CONFIG_MTD_UBI_GLUEBI=m
+CONFIG_MTD_UBI_BLOCK=y
+CONFIG_MTD_HYPERBUS=m
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+CONFIG_PARPORT_PC_FIFO=y
+# CONFIG_PARPORT_PC_SUPERIO is not set
+CONFIG_PARPORT_PC_PCMCIA=m
+CONFIG_PARPORT_AX88796=m
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=y
+CONFIG_PARIDE=m
+
+#
+# Parallel IDE high-level drivers
+#
+CONFIG_PARIDE_PD=m
+CONFIG_PARIDE_PCD=m
+CONFIG_PARIDE_PF=m
+CONFIG_PARIDE_PT=m
+CONFIG_PARIDE_PG=m
+
+#
+# Parallel IDE protocol modules
+#
+CONFIG_PARIDE_ATEN=m
+CONFIG_PARIDE_BPCK=m
+CONFIG_PARIDE_COMM=m
+CONFIG_PARIDE_DSTR=m
+CONFIG_PARIDE_FIT2=m
+CONFIG_PARIDE_FIT3=m
+CONFIG_PARIDE_EPAT=m
+CONFIG_PARIDE_EPATC8=y
+CONFIG_PARIDE_EPIA=m
+CONFIG_PARIDE_FRIQ=m
+CONFIG_PARIDE_FRPW=m
+CONFIG_PARIDE_KBIC=m
+CONFIG_PARIDE_KTTI=m
+CONFIG_PARIDE_ON20=m
+CONFIG_PARIDE_ON26=m
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+CONFIG_ZRAM_WRITEBACK=y
+CONFIG_ZRAM_MEMORY_TRACKING=y
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=8
+CONFIG_BLK_DEV_CRYPTOLOOP=m
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SKD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+CONFIG_VIRTIO_BLK_SCSI=y
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+# CONFIG_NVME_TARGET_FCLOOP is not set
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+CONFIG_AD525X_DPOT=m
+CONFIG_AD525X_DPOT_I2C=m
+CONFIG_AD525X_DPOT_SPI=m
+CONFIG_DUMMY_IRQ=m
+CONFIG_IBM_ASM=m
+CONFIG_PHANTOM=m
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+CONFIG_ICS932S401=m
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_HP_ILO=m
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+CONFIG_HMC6352=m
+CONFIG_DS1682=m
+CONFIG_VMWARE_BALLOON=m
+CONFIG_LATTICE_ECP3_CONFIG=m
+CONFIG_SRAM=y
+# CONFIG_PCI_ENDPOINT_TEST is not set
+CONFIG_XILINX_SDFEC=m
+CONFIG_MISC_RTSX=m
+CONFIG_PVPANIC=m
+CONFIG_C2PORT=m
+CONFIG_C2PORT_DURAMAR_2150=m
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+CONFIG_TI_ST=m
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+CONFIG_INTEL_MEI_TXE=m
+CONFIG_INTEL_MEI_HDCP=m
+CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+CONFIG_INTEL_MIC_BUS=m
+
+#
+# SCIF Bus Driver
+#
+CONFIG_SCIF_BUS=m
+
+#
+# VOP Bus Driver
+#
+CONFIG_VOP_BUS=m
+
+#
+# Intel MIC Host Driver
+#
+CONFIG_INTEL_MIC_HOST=m
+
+#
+# Intel MIC Card Driver
+#
+CONFIG_INTEL_MIC_CARD=m
+
+#
+# SCIF Driver
+#
+CONFIG_SCIF=m
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+CONFIG_MIC_COSM=m
+
+#
+# VOP Driver
+#
+CONFIG_VOP=m
+CONFIG_VHOST_RING=m
+# end of Intel MIC & related support
+
+CONFIG_GENWQE=m
+CONFIG_GENWQE_PLATFORM_ERROR_RECOVERY=0
+CONFIG_ECHO=m
+CONFIG_MISC_ALCOR_PCI=m
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+CONFIG_HABANA_AI=m
+# end of Misc devices
+
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=y
+# CONFIG_BLK_DEV_SR_VENDOR is not set
+CONFIG_CHR_DEV_SG=y
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+CONFIG_SCSI_SCAN_ASYNC=y
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AHA1740=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=8
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+CONFIG_AIC7XXX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=32
+CONFIG_AIC79XX_RESET_DELAY_MS=5000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+CONFIG_AIC79XX_REG_PRETTY_PRINT=y
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+# CONFIG_SCSI_MVSAS_TASKLET is not set
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+CONFIG_SCSI_UFS_DWC_TC_PCI=m
+CONFIG_SCSI_UFSHCD_PLATFORM=m
+CONFIG_SCSI_UFS_CDNS_PLATFORM=m
+CONFIG_SCSI_UFS_DWC_TC_PLATFORM=m
+CONFIG_SCSI_UFS_BSG=y
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+CONFIG_SCSI_FLASHPOINT=y
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+CONFIG_SCSI_FDOMAIN=m
+CONFIG_SCSI_FDOMAIN_PCI=m
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+CONFIG_SCSI_PPA=m
+CONFIG_SCSI_IMM=m
+# CONFIG_SCSI_IZIP_EPP16 is not set
+# CONFIG_SCSI_IZIP_SLOW_CTR is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+CONFIG_QEDI=m
+CONFIG_QEDF=m
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_SIM710=m
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+CONFIG_SCSI_LOWLEVEL_PCMCIA=y
+CONFIG_PCMCIA_AHA152X=m
+CONFIG_PCMCIA_FDOMAIN=m
+CONFIG_PCMCIA_QLOGIC=m
+CONFIG_PCMCIA_SYM53C500=m
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=m
+CONFIG_SCSI_DH_HP_SW=m
+CONFIG_SCSI_DH_EMC=m
+CONFIG_SCSI_DH_ALUA=m
+# end of SCSI device support
+
+CONFIG_ATA=y
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+CONFIG_SATA_ZPODD=y
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=3
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=y
+CONFIG_SATA_DWC=m
+CONFIG_SATA_DWC_OLD_DMA=y
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=y
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+CONFIG_PATA_PLATFORM=m
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=y
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+CONFIG_MD_MULTIPATH=m
+CONFIG_MD_FAULTY=m
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=y
+# CONFIG_DM_DEBUG is not set
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_DUST is not set
+CONFIG_DM_INIT=y
+CONFIG_DM_UEVENT=y
+CONFIG_DM_FLAKEY=m
+CONFIG_DM_VERITY=m
+CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG=y
+# CONFIG_DM_VERITY_FEC is not set
+CONFIG_DM_SWITCH=m
+CONFIG_DM_LOG_WRITES=m
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+CONFIG_FIREWIRE_NOSY=m
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=m
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+CONFIG_EQUALIZER=m
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_RIONET=m
+CONFIG_RIONET_TX_SIZE=128
+CONFIG_RIONET_RX_SIZE=128
+CONFIG_TUN=y
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_SUNGEM_PHY=m
+CONFIG_ARCNET=m
+CONFIG_ARCNET_1201=m
+CONFIG_ARCNET_1051=m
+CONFIG_ARCNET_RAW=m
+CONFIG_ARCNET_CAP=m
+CONFIG_ARCNET_COM90xx=m
+CONFIG_ARCNET_COM90xxIO=m
+CONFIG_ARCNET_RIM_I=m
+CONFIG_ARCNET_COM20020=m
+CONFIG_ARCNET_COM20020_PCI=m
+CONFIG_ARCNET_COM20020_CS=m
+CONFIG_ATM_DRIVERS=y
+CONFIG_ATM_DUMMY=m
+CONFIG_ATM_TCP=m
+CONFIG_ATM_LANAI=m
+CONFIG_ATM_ENI=m
+# CONFIG_ATM_ENI_DEBUG is not set
+# CONFIG_ATM_ENI_TUNE_BURST is not set
+CONFIG_ATM_FIRESTREAM=m
+CONFIG_ATM_ZATM=m
+# CONFIG_ATM_ZATM_DEBUG is not set
+CONFIG_ATM_NICSTAR=m
+# CONFIG_ATM_NICSTAR_USE_SUNI is not set
+# CONFIG_ATM_NICSTAR_USE_IDT77105 is not set
+CONFIG_ATM_IDT77252=m
+# CONFIG_ATM_IDT77252_DEBUG is not set
+# CONFIG_ATM_IDT77252_RCV_ALL is not set
+CONFIG_ATM_IDT77252_USE_SUNI=y
+CONFIG_ATM_AMBASSADOR=m
+# CONFIG_ATM_AMBASSADOR_DEBUG is not set
+CONFIG_ATM_HORIZON=m
+# CONFIG_ATM_HORIZON_DEBUG is not set
+CONFIG_ATM_IA=m
+# CONFIG_ATM_IA_DEBUG is not set
+CONFIG_ATM_FORE200E=m
+# CONFIG_ATM_FORE200E_USE_TASKLET is not set
+CONFIG_ATM_FORE200E_TX_RETRY=16
+CONFIG_ATM_FORE200E_DEBUG=0
+CONFIG_ATM_HE=m
+CONFIG_ATM_HE_USE_SUNI=y
+CONFIG_ATM_SOLOS=m
+
+#
+# CAIF transport drivers
+#
+CONFIG_CAIF_TTY=m
+CONFIG_CAIF_SPI_SLAVE=m
+# CONFIG_CAIF_SPI_SYNC is not set
+CONFIG_CAIF_HSI=m
+CONFIG_CAIF_VIRTIO=m
+
+#
+# Distributed Switch Architecture drivers
+#
+CONFIG_B53=m
+CONFIG_B53_SPI_DRIVER=m
+CONFIG_B53_MDIO_DRIVER=m
+CONFIG_B53_MMAP_DRIVER=m
+CONFIG_B53_SRAB_DRIVER=m
+CONFIG_B53_SERDES=m
+CONFIG_NET_DSA_BCM_SF2=m
+# CONFIG_NET_DSA_LOOP is not set
+CONFIG_NET_DSA_LANTIQ_GSWIP=m
+CONFIG_NET_DSA_MT7530=m
+CONFIG_NET_DSA_MV88E6060=m
+CONFIG_NET_DSA_MICROCHIP_KSZ_COMMON=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C=m
+CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795=m
+CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI=m
+CONFIG_NET_DSA_MV88E6XXX=m
+CONFIG_NET_DSA_MV88E6XXX_GLOBAL2=y
+CONFIG_NET_DSA_MV88E6XXX_PTP=y
+CONFIG_NET_DSA_SJA1105=m
+CONFIG_NET_DSA_SJA1105_PTP=y
+CONFIG_NET_DSA_SJA1105_TAS=y
+CONFIG_NET_DSA_QCA8K=m
+CONFIG_NET_DSA_REALTEK_SMI=m
+CONFIG_NET_DSA_SMSC_LAN9303=m
+CONFIG_NET_DSA_SMSC_LAN9303_I2C=m
+CONFIG_NET_DSA_SMSC_LAN9303_MDIO=m
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_EL3=m
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+CONFIG_AMD_XGBE_DCB=y
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+CONFIG_BNXT_DCB=y
+CONFIG_BNXT_HWMON=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+CONFIG_CHELSIO_T4_DCB=y
+CONFIG_CHELSIO_T4_FCOE=y
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CIRRUS=y
+CONFIG_CS89x0=m
+CONFIG_CS89x0_PLATFORM=y
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+# CONFIG_TULIP_MMIO is not set
+# CONFIG_TULIP_NAPI is not set
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_ESWITCH=y
+CONFIG_MLX5_CORE_EN_DCB=y
+CONFIG_MLX5_CORE_IPOIB=y
+CONFIG_MLX5_FPGA_IPSEC=y
+CONFIG_MLX5_EN_IPSEC=y
+CONFIG_MLX5_FPGA_TLS=y
+CONFIG_MLX5_TLS=y
+CONFIG_MLX5_EN_TLS=y
+CONFIG_MLX5_SW_STEERING=y
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_SWITCHIB=m
+CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
+CONFIG_MLXSW_SPECTRUM_DCB=y
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+CONFIG_NFP_APP_FLOWER=y
+CONFIG_NFP_APP_ABM_NIC=y
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_ISCSI=y
+CONFIG_QED_FCOE=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+CONFIG_ATP=m
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+CONFIG_8139TOO_PIO=y
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_ROCKER=m
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+CONFIG_STMMAC_PLATFORM=m
+CONFIG_DWMAC_GENERIC=m
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+CONFIG_FDDI=y
+CONFIG_DEFXX=m
+# CONFIG_DEFXX_MMIO is not set
+CONFIG_SKFP=m
+# CONFIG_HIPPI is not set
+CONFIG_NET_SB1000=m
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+CONFIG_MDIO_MSCC_MIIM=m
+CONFIG_MDIO_THUNDER=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+CONFIG_LED_TRIGGER_PHY=y
+
+#
+# MII PHY device drivers
+#
+CONFIG_SFP=m
+CONFIG_ADIN_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_ICPLUS_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+CONFIG_PLIP=m
+CONFIG_PPP=y
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=y
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+CONFIG_SLIP_MODE_SLIP6=y
+CONFIG_USB_NET_DRIVERS=m
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_CDC_PHONET=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+# CONFIG_ATH_DEBUG is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_COMMON_DEBUG=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+CONFIG_ATH9K_STATION_STATISTICS=y
+# CONFIG_ATH9K_DYNACK is not set
+CONFIG_ATH9K_WOW=y
+CONFIG_ATH9K_RFKILL=y
+CONFIG_ATH9K_CHANNEL_CONTEXT=y
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
+CONFIG_ATH9K_HWRNG=y
+CONFIG_ATH9K_COMMON_SPECTRAL=y
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+CONFIG_CARL9170_HWRNG=y
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+CONFIG_WIL6210_TRACING=y
+CONFIG_WIL6210_DEBUGFS=y
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+CONFIG_ATH10K_SDIO=m
+CONFIG_ATH10K_USB=m
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+CONFIG_ATH10K_SPECTRAL=y
+CONFIG_ATH10K_TRACING=y
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+# CONFIG_B43_SDIO is not set
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+# CONFIG_B43LEGACY_DEBUG is not set
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+CONFIG_BRCM_TRACING=y
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+CONFIG_IPW2100_MONITOR=y
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+CONFIG_IPW2200_MONITOR=y
+CONFIG_IPW2200_RADIOTAP=y
+CONFIG_IPW2200_PROMISCUOUS=y
+CONFIG_IPW2200_QOS=y
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+CONFIG_IWLEGACY_DEBUGFS=y
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+CONFIG_IWLWIFI_DEBUGFS=y
+CONFIG_IWLWIFI_DEVICE_TRACING=y
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+CONFIG_MT7603E=m
+CONFIG_MT7615E=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+CONFIG_RTL8XXXU_UNTESTED=y
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+CONFIG_RTW88_DEBUG=y
+CONFIG_RTW88_DEBUGFS=y
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+CONFIG_MAC80211_HWSIM=m
+CONFIG_USB_NET_RNDIS_WLAN=m
+CONFIG_VIRT_WIFI=m
+
+#
+# WiMAX Wireless Broadband devices
+#
+CONFIG_WIMAX_I2400M=m
+CONFIG_WIMAX_I2400M_USB=m
+CONFIG_WIMAX_I2400M_DEBUG_LEVEL=8
+# end of WiMAX Wireless Broadband devices
+
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+CONFIG_HDLC_X25=m
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_LAPBETHER=m
+CONFIG_X25_ASY=m
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+CONFIG_IEEE802154_AT86RF230_DEBUGFS=y
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+CONFIG_IEEE802154_CA8210_DEBUGFS=y
+CONFIG_IEEE802154_MCR20A=m
+CONFIG_IEEE802154_HWSIM=m
+CONFIG_XEN_NETDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_THUNDERBOLT_NET=m
+CONFIG_HYPERV_NET=m
+CONFIG_NETDEVSIM=m
+CONFIG_NET_FAILOVER=m
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=m
+CONFIG_CAPI_TRACE=y
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_NVM=y
+CONFIG_NVM_PBLK=m
+# CONFIG_NVM_PBLK_DEBUG is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=m
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+CONFIG_INPUT_MATRIXKMAP=m
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+CONFIG_INPUT_MOUSEDEV_PSAUX=y
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+CONFIG_INPUT_EVBUG=m
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+CONFIG_KEYBOARD_ADC=m
+CONFIG_KEYBOARD_ADP5520=m
+CONFIG_KEYBOARD_ADP5588=m
+CONFIG_KEYBOARD_ADP5589=m
+CONFIG_KEYBOARD_APPLESPI=m
+CONFIG_KEYBOARD_ATKBD=y
+CONFIG_KEYBOARD_QT1050=m
+CONFIG_KEYBOARD_QT1070=m
+CONFIG_KEYBOARD_QT2160=m
+CONFIG_KEYBOARD_DLINK_DIR685=m
+CONFIG_KEYBOARD_LKKBD=m
+CONFIG_KEYBOARD_GPIO=m
+CONFIG_KEYBOARD_GPIO_POLLED=m
+CONFIG_KEYBOARD_TCA6416=m
+CONFIG_KEYBOARD_TCA8418=m
+CONFIG_KEYBOARD_MATRIX=m
+CONFIG_KEYBOARD_LM8323=m
+CONFIG_KEYBOARD_LM8333=m
+CONFIG_KEYBOARD_MAX7359=m
+CONFIG_KEYBOARD_MCS=m
+CONFIG_KEYBOARD_MPR121=m
+CONFIG_KEYBOARD_NEWTON=m
+CONFIG_KEYBOARD_OPENCORES=m
+CONFIG_KEYBOARD_SAMSUNG=m
+CONFIG_KEYBOARD_STOWAWAY=m
+CONFIG_KEYBOARD_SUNKBD=m
+CONFIG_KEYBOARD_TM2_TOUCHKEY=m
+CONFIG_KEYBOARD_TWL4030=m
+CONFIG_KEYBOARD_XTKBD=m
+CONFIG_KEYBOARD_CROS_EC=m
+CONFIG_KEYBOARD_MTK_PMIC=m
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=m
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_88PM860X=m
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT_T37=y
+CONFIG_TOUCHSCREEN_AUO_PIXCIR=m
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+CONFIG_TOUCHSCREEN_CY8CTMG110=m
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DA9034=m
+CONFIG_TOUCHSCREEN_DA9052=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=y
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
+CONFIG_TOUCHSCREEN_UCB1400=m
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM831X=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+CONFIG_TOUCHSCREEN_MC13783=m
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
+CONFIG_TOUCHSCREEN_PCAP=m
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+CONFIG_TOUCHSCREEN_ZFORCE=m
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+CONFIG_TOUCHSCREEN_IQS5XX=m
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_88PM860X_ONKEY=m
+CONFIG_INPUT_88PM80X_ONKEY=m
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_ARIZONA_HAPTICS=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+CONFIG_INPUT_MSM_VIBRATOR=m
+CONFIG_INPUT_PCSPKR=m
+CONFIG_INPUT_MAX77693_HAPTIC=m
+CONFIG_INPUT_MAX8925_ONKEY=m
+CONFIG_INPUT_MAX8997_HAPTIC=m
+CONFIG_INPUT_MC13783_PWRBUTTON=m
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+CONFIG_INPUT_GP2A=m
+CONFIG_INPUT_GPIO_BEEPER=m
+CONFIG_INPUT_GPIO_DECODER=m
+CONFIG_INPUT_GPIO_VIBRA=m
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+# CONFIG_INPUT_KXTJ9_POLLED_MODE is not set
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+CONFIG_INPUT_RETU_PWRBUTTON=m
+CONFIG_INPUT_AXP20X_PEK=m
+CONFIG_INPUT_TWL4030_PWRBUTTON=m
+CONFIG_INPUT_TWL4030_VIBRA=m
+CONFIG_INPUT_TWL6040_VIBRA=m
+CONFIG_INPUT_UINPUT=y
+CONFIG_INPUT_PALMAS_PWRBUTTON=m
+CONFIG_INPUT_PCF50633_PMU=m
+CONFIG_INPUT_PCF8574=m
+CONFIG_INPUT_PWM_BEEPER=m
+CONFIG_INPUT_PWM_VIBRA=m
+CONFIG_INPUT_GPIO_ROTARY_ENCODER=m
+CONFIG_INPUT_DA9052_ONKEY=m
+CONFIG_INPUT_DA9055_ONKEY=m
+CONFIG_INPUT_DA9063_ONKEY=m
+CONFIG_INPUT_WM831X_ON=m
+CONFIG_INPUT_PCAP=m
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_SOC_BUTTON_ARRAY=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_INPUT_RAVE_SP_PWRBUTTON=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+CONFIG_RMI4_F34=y
+CONFIG_RMI4_F54=y
+CONFIG_RMI4_F55=y
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=m
+CONFIG_SERIO_CT82C710=m
+CONFIG_SERIO_PARKBD=m
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+CONFIG_SERIO_PS2MULT=m
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+CONFIG_USERIO=m
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=0
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+CONFIG_TRACE_ROUTER=m
+CONFIG_TRACE_SINK=m
+CONFIG_NULL_TTY=m
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+CONFIG_SERIAL_8250_FINTEK=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=m
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_MEN_MCB=m
+CONFIG_SERIAL_8250_NR_UARTS=48
+CONFIG_SERIAL_8250_RUNTIME_UARTS=32
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+CONFIG_SERIAL_8250_DW=m
+CONFIG_SERIAL_8250_RT288X=y
+CONFIG_SERIAL_8250_LPSS=m
+CONFIG_SERIAL_8250_MID=m
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_KGDB_NMI=y
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=y
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=y
+CONFIG_SERIAL_SCCNXP_CONSOLE=y
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+CONFIG_SERIAL_MEN_Z135=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+CONFIG_SERIAL_DEV_BUS=y
+CONFIG_SERIAL_DEV_CTRL_TTYPORT=y
+CONFIG_TTY_PRINTK=y
+CONFIG_TTY_PRINTK_LEVEL=6
+CONFIG_PRINTER=m
+# CONFIG_LP_CONSOLE is not set
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+CONFIG_IPMI_SSIF=m
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=m
+CONFIG_APPLICOM=m
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+CONFIG_MWAVE=m
+CONFIG_RAW_DRIVER=m
+CONFIG_MAX_RAW_DEVS=256
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+CONFIG_HPET_MMAP_DEFAULT=y
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+CONFIG_XILLYBUS=m
+CONFIG_XILLYBUS_PCIE=m
+# end of Character devices
+
+CONFIG_RANDOM_TRUST_CPU=y
+CONFIG_RANDOM_TRUST_BOOTLOADER=y
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=y
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_CHT_WC=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=y
+CONFIG_I2C_DESIGNWARE_PLATFORM=y
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
+CONFIG_I2C_DESIGNWARE_BAYTRAIL=y
+# CONFIG_I2C_EMEV2 is not set
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_DLN2=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_MLXCPLD=m
+CONFIG_I2C_CROS_EC_TUNNEL=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+# CONFIG_I2C_SLAVE is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+CONFIG_I3C=m
+CONFIG_CDNS_I3C_MASTER=m
+CONFIG_DW_I3C_MASTER=m
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+CONFIG_SPI_AXI_SPI_ENGINE=m
+CONFIG_SPI_BITBANG=m
+CONFIG_SPI_BUTTERFLY=m
+CONFIG_SPI_CADENCE=m
+CONFIG_SPI_DESIGNWARE=m
+CONFIG_SPI_DW_PCI=m
+CONFIG_SPI_DW_MID_DMA=y
+CONFIG_SPI_DW_MMIO=m
+CONFIG_SPI_DLN2=m
+CONFIG_SPI_NXP_FLEXSPI=m
+CONFIG_SPI_GPIO=m
+CONFIG_SPI_LM70_LLP=m
+CONFIG_SPI_OC_TINY=m
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_ROCKCHIP is not set
+CONFIG_SPI_SC18IS602=m
+CONFIG_SPI_SIFIVE=m
+CONFIG_SPI_MXIC=m
+CONFIG_SPI_XCOMM=m
+# CONFIG_SPI_XILINX is not set
+CONFIG_SPI_ZYNQMP_GQSPI=m
+
+#
+# SPI Protocol Masters
+#
+CONFIG_SPI_SPIDEV=m
+CONFIG_SPI_LOOPBACK_TEST=m
+CONFIG_SPI_TLE62X0=m
+CONFIG_SPI_SLAVE=y
+CONFIG_SPI_SLAVE_TIME=m
+CONFIG_SPI_SLAVE_SYSTEM_CONTROL=m
+CONFIG_SPMI=m
+CONFIG_HSI=m
+CONFIG_HSI_BOARDINFO=y
+
+#
+# HSI controllers
+#
+
+#
+# HSI clients
+#
+CONFIG_HSI_CHAR=m
+CONFIG_PPS=y
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=y
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=y
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=y
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_PINCTRL_MADERA=m
+CONFIG_PINCTRL_CS47L15=y
+CONFIG_PINCTRL_CS47L35=y
+CONFIG_PINCTRL_CS47L85=y
+CONFIG_PINCTRL_CS47L90=y
+CONFIG_PINCTRL_CS47L92=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+CONFIG_GPIO_EXAR=m
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_LYNXPOINT=y
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_MENZ127=m
+CONFIG_GPIO_SIOX=m
+CONFIG_GPIO_VX855=m
+CONFIG_GPIO_XILINX=y
+CONFIG_GPIO_AMD_FCH=m
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_104_DIO_48E=m
+CONFIG_GPIO_104_IDIO_16=m
+CONFIG_GPIO_104_IDI_48=m
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_GPIO_MM=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_ADP5520=m
+CONFIG_GPIO_ARIZONA=m
+CONFIG_GPIO_BD9571MWV=m
+CONFIG_GPIO_CRYSTAL_COVE=m
+CONFIG_GPIO_DA9052=m
+CONFIG_GPIO_DA9055=m
+CONFIG_GPIO_DLN2=m
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+CONFIG_GPIO_LP873X=m
+CONFIG_GPIO_MADERA=m
+CONFIG_GPIO_PALMAS=y
+CONFIG_GPIO_RC5T583=y
+CONFIG_GPIO_TPS65086=m
+CONFIG_GPIO_TPS6586X=y
+CONFIG_GPIO_TPS65910=y
+CONFIG_GPIO_TPS65912=m
+CONFIG_GPIO_TPS68470=y
+CONFIG_GPIO_TQMX86=m
+CONFIG_GPIO_TWL4030=m
+CONFIG_GPIO_TWL6040=m
+CONFIG_GPIO_UCB1400=m
+CONFIG_GPIO_WHISKEY_COVE=m
+CONFIG_GPIO_WM831X=m
+CONFIG_GPIO_WM8350=m
+CONFIG_GPIO_WM8994=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+CONFIG_GPIO_PCI_IDIO_16=m
+CONFIG_GPIO_PCIE_IDIO_24=m
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+CONFIG_GPIO_MAX3191X=m
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+CONFIG_GPIO_XRA1403=m
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+CONFIG_GPIO_VIPERBOARD=m
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+CONFIG_W1_MASTER_MATROX=m
+CONFIG_W1_MASTER_DS2490=m
+CONFIG_W1_MASTER_DS2482=m
+CONFIG_W1_MASTER_DS1WM=m
+CONFIG_W1_MASTER_GPIO=m
+CONFIG_W1_MASTER_SGI=m
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+CONFIG_W1_SLAVE_THERM=m
+CONFIG_W1_SLAVE_SMEM=m
+CONFIG_W1_SLAVE_DS2405=m
+CONFIG_W1_SLAVE_DS2408=m
+CONFIG_W1_SLAVE_DS2408_READBACK=y
+CONFIG_W1_SLAVE_DS2413=m
+CONFIG_W1_SLAVE_DS2406=m
+CONFIG_W1_SLAVE_DS2423=m
+CONFIG_W1_SLAVE_DS2805=m
+CONFIG_W1_SLAVE_DS2431=m
+CONFIG_W1_SLAVE_DS2433=m
+# CONFIG_W1_SLAVE_DS2433_CRC is not set
+CONFIG_W1_SLAVE_DS2438=m
+CONFIG_W1_SLAVE_DS250X=m
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+CONFIG_W1_SLAVE_DS28E04=m
+CONFIG_W1_SLAVE_DS28E17=m
+# end of 1-wire Slaves
+
+CONFIG_POWER_AVS=y
+CONFIG_POWER_RESET=y
+CONFIG_POWER_RESET_RESTART=y
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+CONFIG_MAX8925_POWER=m
+CONFIG_WM831X_BACKUP=m
+CONFIG_WM831X_POWER=m
+CONFIG_WM8350_POWER=m
+CONFIG_TEST_POWER=m
+CONFIG_BATTERY_88PM860X=m
+CONFIG_CHARGER_ADP5061=m
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+CONFIG_CHARGER_SBS=m
+CONFIG_MANAGER_SBS=m
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_DA9030=m
+CONFIG_BATTERY_DA9052=m
+CONFIG_CHARGER_DA9150=m
+CONFIG_BATTERY_DA9150=m
+CONFIG_CHARGER_AXP20X=m
+CONFIG_BATTERY_AXP20X=m
+CONFIG_AXP20X_POWER=m
+CONFIG_AXP288_CHARGER=m
+CONFIG_AXP288_FUEL_GAUGE=m
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+CONFIG_BATTERY_MAX1721X=m
+CONFIG_BATTERY_TWL4030_MADC=m
+CONFIG_CHARGER_88PM860X=m
+CONFIG_CHARGER_PCF50633=m
+CONFIG_BATTERY_RX51=m
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_TWL4030=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_LP8788=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_LT3651=m
+CONFIG_CHARGER_MAX14577=m
+CONFIG_CHARGER_MAX77693=m
+CONFIG_CHARGER_MAX8997=m
+CONFIG_CHARGER_MAX8998=m
+CONFIG_CHARGER_BQ2415X=m
+CONFIG_CHARGER_BQ24190=m
+CONFIG_CHARGER_BQ24257=m
+CONFIG_CHARGER_BQ24735=m
+CONFIG_CHARGER_BQ25890=m
+CONFIG_CHARGER_SMB347=m
+CONFIG_CHARGER_TPS65090=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+CONFIG_BATTERY_RT5033=m
+CONFIG_CHARGER_RT9455=m
+CONFIG_CHARGER_CROS_USBPD=m
+CONFIG_CHARGER_WILCO=m
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_DA9052_ADC=m
+CONFIG_SENSORS_DA9055=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_MLXREG_FAN=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_MENF21BMC_HWMON=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_IRPS5401=m
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_WM831X=m
+CONFIG_SENSORS_WM8350=m
+CONFIG_SENSORS_XGENE=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+CONFIG_THERMAL_STATISTICS=y
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+# CONFIG_CLOCK_THERMAL is not set
+CONFIG_DEVFREQ_THERMAL=y
+CONFIG_THERMAL_EMULATION=y
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+CONFIG_INTEL_SOC_DTS_THERMAL=m
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+CONFIG_INT3406_THERMAL=m
+CONFIG_PROC_THERMAL_MMIO_RAPL=y
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_BXT_PMIC_THERMAL=m
+CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+CONFIG_WATCHDOG_SYSFS=y
+
+#
+# Watchdog Pretimeout Governors
+#
+CONFIG_WATCHDOG_PRETIMEOUT_GOV=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_SEL=m
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_NOOP=y
+CONFIG_WATCHDOG_PRETIMEOUT_GOV_PANIC=m
+CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP=y
+# CONFIG_WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_SOFT_WATCHDOG_PRETIMEOUT=y
+CONFIG_DA9052_WATCHDOG=m
+CONFIG_DA9055_WATCHDOG=m
+CONFIG_DA9063_WATCHDOG=m
+CONFIG_DA9062_WATCHDOG=m
+CONFIG_MENF21BMC_WATCHDOG=m
+CONFIG_MENZ069_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_WM831X_WATCHDOG=m
+CONFIG_WM8350_WATCHDOG=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_RAVE_SP_WATCHDOG=m
+CONFIG_MLX_WDT=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_TWL4030_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+# CONFIG_SSB_PCMCIAHOST is not set
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+CONFIG_BCMA_HOST_SOC=y
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_SFLASH=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=y
+CONFIG_MFD_AS3711=y
+CONFIG_PMIC_ADP5520=y
+CONFIG_MFD_AAT2870_CORE=y
+CONFIG_MFD_BCM590XX=m
+CONFIG_MFD_BD9571MWV=m
+CONFIG_MFD_AXP20X=m
+CONFIG_MFD_AXP20X_I2C=m
+CONFIG_MFD_CROS_EC_DEV=m
+CONFIG_MFD_MADERA=m
+CONFIG_MFD_MADERA_I2C=m
+CONFIG_MFD_MADERA_SPI=m
+CONFIG_MFD_CS47L15=y
+CONFIG_MFD_CS47L35=y
+CONFIG_MFD_CS47L85=y
+CONFIG_MFD_CS47L90=y
+CONFIG_MFD_CS47L92=y
+CONFIG_PMIC_DA903X=y
+CONFIG_PMIC_DA9052=y
+CONFIG_MFD_DA9052_SPI=y
+CONFIG_MFD_DA9052_I2C=y
+CONFIG_MFD_DA9055=y
+CONFIG_MFD_DA9062=m
+CONFIG_MFD_DA9063=y
+CONFIG_MFD_DA9150=m
+CONFIG_MFD_DLN2=m
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+CONFIG_HTC_I2CPLD=y
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+CONFIG_INTEL_SOC_PMIC=y
+CONFIG_INTEL_SOC_PMIC_BXTWC=m
+CONFIG_INTEL_SOC_PMIC_CHTWC=y
+CONFIG_INTEL_SOC_PMIC_CHTDC_TI=m
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+CONFIG_MFD_88PM800=m
+CONFIG_MFD_88PM805=m
+CONFIG_MFD_88PM860X=y
+CONFIG_MFD_MAX14577=y
+CONFIG_MFD_MAX77693=y
+CONFIG_MFD_MAX77843=y
+CONFIG_MFD_MAX8907=m
+CONFIG_MFD_MAX8925=y
+CONFIG_MFD_MAX8997=y
+CONFIG_MFD_MAX8998=y
+CONFIG_MFD_MT6397=m
+CONFIG_MFD_MENF21BMC=m
+CONFIG_EZX_PCAP=y
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+CONFIG_UCB1400_CORE=m
+CONFIG_MFD_RDC321X=m
+CONFIG_MFD_RT5033=m
+CONFIG_MFD_RC5T583=y
+CONFIG_MFD_SEC_CORE=y
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+CONFIG_MFD_SKY81452=m
+CONFIG_MFD_SMSC=y
+CONFIG_ABX500_CORE=y
+CONFIG_AB3100_CORE=y
+CONFIG_AB3100_OTP=m
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+CONFIG_MFD_LP8788=y
+CONFIG_MFD_TI_LMU=m
+CONFIG_MFD_PALMAS=y
+CONFIG_TPS6105X=m
+CONFIG_TPS65010=m
+CONFIG_TPS6507X=m
+CONFIG_MFD_TPS65086=m
+CONFIG_MFD_TPS65090=y
+CONFIG_MFD_TPS68470=y
+CONFIG_MFD_TI_LP873X=m
+CONFIG_MFD_TPS6586X=y
+CONFIG_MFD_TPS65910=y
+CONFIG_MFD_TPS65912=y
+CONFIG_MFD_TPS65912_I2C=y
+CONFIG_MFD_TPS65912_SPI=y
+CONFIG_MFD_TPS80031=y
+CONFIG_TWL4030_CORE=y
+CONFIG_MFD_TWL4030_AUDIO=y
+CONFIG_TWL6040_CORE=y
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+CONFIG_MFD_TQMX86=m
+CONFIG_MFD_VX855=m
+CONFIG_MFD_ARIZONA=y
+CONFIG_MFD_ARIZONA_I2C=m
+CONFIG_MFD_ARIZONA_SPI=m
+CONFIG_MFD_CS47L24=y
+CONFIG_MFD_WM5102=y
+CONFIG_MFD_WM5110=y
+CONFIG_MFD_WM8997=y
+CONFIG_MFD_WM8998=y
+CONFIG_MFD_WM8400=y
+CONFIG_MFD_WM831X=y
+CONFIG_MFD_WM831X_I2C=y
+CONFIG_MFD_WM831X_SPI=y
+CONFIG_MFD_WM8350=y
+CONFIG_MFD_WM8350_I2C=y
+CONFIG_MFD_WM8994=m
+CONFIG_RAVE_SP_CORE=m
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_88PM800=m
+CONFIG_REGULATOR_88PM8607=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_AAT2870=m
+CONFIG_REGULATOR_AB3100=m
+CONFIG_REGULATOR_ARIZONA_LDO1=m
+CONFIG_REGULATOR_ARIZONA_MICSUPP=m
+CONFIG_REGULATOR_AS3711=m
+CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_BD9571MWV=m
+CONFIG_REGULATOR_DA903X=m
+CONFIG_REGULATOR_DA9052=m
+CONFIG_REGULATOR_DA9055=m
+CONFIG_REGULATOR_DA9062=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LM363X=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LP8788=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX14577=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8907=m
+CONFIG_REGULATOR_MAX8925=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MAX8997=m
+CONFIG_REGULATOR_MAX8998=m
+CONFIG_REGULATOR_MAX77693=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_MT6323=m
+CONFIG_REGULATOR_MT6397=m
+CONFIG_REGULATOR_PALMAS=m
+CONFIG_REGULATOR_PCAP=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_PWM=m
+CONFIG_REGULATOR_QCOM_SPMI=m
+CONFIG_REGULATOR_RC5T583=m
+CONFIG_REGULATOR_RT5033=m
+CONFIG_REGULATOR_S2MPA01=m
+CONFIG_REGULATOR_S2MPS11=m
+CONFIG_REGULATOR_S5M8767=m
+CONFIG_REGULATOR_SKY81452=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65086=m
+CONFIG_REGULATOR_TPS65090=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_REGULATOR_TPS6586X=m
+CONFIG_REGULATOR_TPS65910=m
+CONFIG_REGULATOR_TPS65912=m
+CONFIG_REGULATOR_TPS80031=m
+CONFIG_REGULATOR_TWL4030=m
+CONFIG_REGULATOR_WM831X=m
+CONFIG_REGULATOR_WM8350=m
+CONFIG_REGULATOR_WM8400=m
+CONFIG_REGULATOR_WM8994=m
+CONFIG_CEC_CORE=y
+CONFIG_CEC_NOTIFIER=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+CONFIG_LIRC=y
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+CONFIG_RC_LOOPBACK=m
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
+CONFIG_RC_XBOX_DVD=m
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=y
+# CONFIG_MEDIA_CONTROLLER_REQUEST_API is not set
+CONFIG_VIDEO_DEV=m
+CONFIG_VIDEO_V4L2_SUBDEV_API=y
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+# CONFIG_VIDEO_PCI_SKELETON is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_MEM2MEM_DEV=m
+CONFIG_V4L2_FLASH_LED_CLASS=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+CONFIG_DVB_USB_CXUSB_ANALOG=y
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+CONFIG_VIDEO_TW5864=m
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+CONFIG_VIDEO_FB_IVTV_FORCE_PAT=y
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+CONFIG_VIDEO_COBALT=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+CONFIG_VIDEO_IPU3_CIO2=m
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CAFE_CCIC=m
+CONFIG_VIDEO_VIA_CAMERA=m
+CONFIG_VIDEO_CADENCE=y
+CONFIG_VIDEO_CADENCE_CSI2RX=m
+CONFIG_VIDEO_CADENCE_CSI2TX=m
+CONFIG_VIDEO_ASPEED=m
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m
+CONFIG_VIDEO_SH_VEU=m
+CONFIG_V4L_TEST_DRIVERS=y
+CONFIG_VIDEO_VIMC=m
+CONFIG_VIDEO_VIVID=m
+CONFIG_VIDEO_VIVID_CEC=y
+CONFIG_VIDEO_VIVID_MAX_DEVS=64
+CONFIG_VIDEO_VIM2M=m
+CONFIG_VIDEO_VICODEC=m
+CONFIG_DVB_PLATFORM_DRIVERS=y
+CONFIG_CEC_PLATFORM_DRIVERS=y
+CONFIG_VIDEO_CROS_EC_CEC=m
+CONFIG_VIDEO_SECO_CEC=m
+CONFIG_VIDEO_SECO_RC=y
+CONFIG_SDR_PLATFORM_DRIVERS=y
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+CONFIG_RADIO_SI476X=m
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+CONFIG_RADIO_WL128X=m
+# end of Texas Instruments WL128x FM driver (ST based)
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+CONFIG_SMS_SIANO_DEBUGFS=y
+CONFIG_VIDEO_V4L2_TPG=m
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TDA1997X=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+CONFIG_VIDEO_TLV320AIC23B=m
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+CONFIG_VIDEO_ADV7180=m
+CONFIG_VIDEO_ADV7183=m
+CONFIG_VIDEO_ADV7604=m
+CONFIG_VIDEO_ADV7604_CEC=y
+CONFIG_VIDEO_ADV7842=m
+CONFIG_VIDEO_ADV7842_CEC=y
+CONFIG_VIDEO_BT819=m
+CONFIG_VIDEO_BT856=m
+CONFIG_VIDEO_BT866=m
+CONFIG_VIDEO_KS0127=m
+CONFIG_VIDEO_ML86V7667=m
+CONFIG_VIDEO_SAA7110=m
+CONFIG_VIDEO_SAA711X=m
+CONFIG_VIDEO_TC358743=m
+CONFIG_VIDEO_TC358743_CEC=y
+CONFIG_VIDEO_TVP514X=m
+CONFIG_VIDEO_TVP5150=m
+CONFIG_VIDEO_TVP7002=m
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+CONFIG_VIDEO_TW9910=m
+CONFIG_VIDEO_VPX3220=m
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+CONFIG_VIDEO_SAA7185=m
+CONFIG_VIDEO_ADV7170=m
+CONFIG_VIDEO_ADV7175=m
+CONFIG_VIDEO_ADV7343=m
+CONFIG_VIDEO_ADV7393=m
+CONFIG_VIDEO_ADV7511=m
+CONFIG_VIDEO_ADV7511_CEC=y
+CONFIG_VIDEO_AD9389B=m
+CONFIG_VIDEO_AK881X=m
+CONFIG_VIDEO_THS8200=m
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_APTINA_PLL=m
+CONFIG_VIDEO_SMIAPP_PLL=m
+CONFIG_VIDEO_IMX214=m
+CONFIG_VIDEO_IMX258=m
+CONFIG_VIDEO_IMX274=m
+CONFIG_VIDEO_IMX319=m
+CONFIG_VIDEO_IMX355=m
+CONFIG_VIDEO_OV2640=m
+CONFIG_VIDEO_OV2659=m
+CONFIG_VIDEO_OV2680=m
+CONFIG_VIDEO_OV2685=m
+CONFIG_VIDEO_OV5647=m
+CONFIG_VIDEO_OV6650=m
+CONFIG_VIDEO_OV5670=m
+CONFIG_VIDEO_OV5675=m
+CONFIG_VIDEO_OV5695=m
+CONFIG_VIDEO_OV7251=m
+CONFIG_VIDEO_OV772X=m
+CONFIG_VIDEO_OV7640=m
+CONFIG_VIDEO_OV7670=m
+CONFIG_VIDEO_OV7740=m
+CONFIG_VIDEO_OV8856=m
+CONFIG_VIDEO_OV9640=m
+CONFIG_VIDEO_OV9650=m
+CONFIG_VIDEO_OV13858=m
+CONFIG_VIDEO_VS6624=m
+CONFIG_VIDEO_MT9M001=m
+CONFIG_VIDEO_MT9M032=m
+CONFIG_VIDEO_MT9M111=m
+CONFIG_VIDEO_MT9P031=m
+CONFIG_VIDEO_MT9T001=m
+CONFIG_VIDEO_MT9T112=m
+CONFIG_VIDEO_MT9V011=m
+CONFIG_VIDEO_MT9V032=m
+CONFIG_VIDEO_MT9V111=m
+CONFIG_VIDEO_SR030PC30=m
+CONFIG_VIDEO_NOON010PC30=m
+CONFIG_VIDEO_M5MOLS=m
+CONFIG_VIDEO_RJ54N1=m
+CONFIG_VIDEO_S5K6AA=m
+CONFIG_VIDEO_S5K6A3=m
+CONFIG_VIDEO_S5K4ECGX=m
+CONFIG_VIDEO_S5K5BAF=m
+CONFIG_VIDEO_SMIAPP=m
+CONFIG_VIDEO_ET8EK8=m
+CONFIG_VIDEO_S5C73M3=m
+
+#
+# Lens drivers
+#
+CONFIG_VIDEO_AD5820=m
+CONFIG_VIDEO_AK7375=m
+CONFIG_VIDEO_DW9714=m
+CONFIG_VIDEO_DW9807_VCM=m
+
+#
+# Flash devices
+#
+CONFIG_VIDEO_ADP1653=m
+CONFIG_VIDEO_LM3560=m
+CONFIG_VIDEO_LM3646=m
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# SDR tuner chips
+#
+CONFIG_SDR_MAX2175=m
+
+#
+# Miscellaneous helper chips
+#
+CONFIG_VIDEO_THS7303=m
+CONFIG_VIDEO_M52790=m
+CONFIG_VIDEO_I2C=m
+CONFIG_VIDEO_ST_MIPID02=m
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+CONFIG_VIDEO_GS1662=m
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+CONFIG_CXD2880_SPI_DRV=m
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+CONFIG_DVB_S5H1432=m
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+CONFIG_DVB_DIB9000=m
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+CONFIG_DVB_CXD2880=m
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+CONFIG_DVB_MN88443X=m
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+CONFIG_DVB_LNBH29=m
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+CONFIG_DVB_LGS8GL5=m
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_SIS=m
+CONFIG_AGP_VIA=y
+CONFIG_INTEL_GTT=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=16
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+CONFIG_DRM_DP_CEC=y
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+# CONFIG_DRM_RADEON_USERPTR is not set
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+CONFIG_DRM_AMD_ACP=y
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN1_0=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DCN2_1=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
+
+CONFIG_HSA_AMD=y
+CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+# CONFIG_DRM_NOUVEAU_SVM is not set
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+CONFIG_DRM_I915_GVT=y
+CONFIG_DRM_I915_GVT_KVMGT=m
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+CONFIG_DRM_VKMS=m
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN=m
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+CONFIG_DRM_ANALOGIX_ANX78XX=m
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+CONFIG_DRM_GM12U320=m
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+CONFIG_DRM_XEN=y
+CONFIG_DRM_XEN_FRONTEND=m
+CONFIG_DRM_VBOXVIDEO=m
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+CONFIG_FIRMWARE_EDID=y
+CONFIG_FB_DDC=m
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+CONFIG_FB_HECUBA=m
+CONFIG_FB_SVGALIB=m
+CONFIG_FB_BACKLIGHT=m
+CONFIG_FB_MODE_HELPERS=y
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+CONFIG_FB_CIRRUS=m
+CONFIG_FB_PM2=m
+CONFIG_FB_PM2_FIFO_DISCONNECT=y
+CONFIG_FB_CYBER2000=m
+CONFIG_FB_CYBER2000_DDC=y
+CONFIG_FB_ARC=m
+CONFIG_FB_ASILIANT=y
+CONFIG_FB_IMSTT=y
+CONFIG_FB_VGA16=m
+CONFIG_FB_UVESA=m
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+CONFIG_FB_N411=m
+CONFIG_FB_HGA=m
+CONFIG_FB_OPENCORES=m
+CONFIG_FB_S1D13XXX=m
+CONFIG_FB_NVIDIA=m
+CONFIG_FB_NVIDIA_I2C=y
+# CONFIG_FB_NVIDIA_DEBUG is not set
+CONFIG_FB_NVIDIA_BACKLIGHT=y
+CONFIG_FB_RIVA=m
+CONFIG_FB_RIVA_I2C=y
+# CONFIG_FB_RIVA_DEBUG is not set
+CONFIG_FB_RIVA_BACKLIGHT=y
+CONFIG_FB_I740=m
+CONFIG_FB_LE80578=m
+CONFIG_FB_CARILLO_RANCH=m
+CONFIG_FB_INTEL=m
+# CONFIG_FB_INTEL_DEBUG is not set
+CONFIG_FB_INTEL_I2C=y
+CONFIG_FB_MATROX=m
+CONFIG_FB_MATROX_MILLENIUM=y
+CONFIG_FB_MATROX_MYSTIQUE=y
+CONFIG_FB_MATROX_G=y
+CONFIG_FB_MATROX_I2C=m
+CONFIG_FB_MATROX_MAVEN=m
+CONFIG_FB_RADEON=m
+CONFIG_FB_RADEON_I2C=y
+CONFIG_FB_RADEON_BACKLIGHT=y
+# CONFIG_FB_RADEON_DEBUG is not set
+CONFIG_FB_ATY128=m
+CONFIG_FB_ATY128_BACKLIGHT=y
+CONFIG_FB_ATY=m
+CONFIG_FB_ATY_CT=y
+# CONFIG_FB_ATY_GENERIC_LCD is not set
+CONFIG_FB_ATY_GX=y
+CONFIG_FB_ATY_BACKLIGHT=y
+CONFIG_FB_S3=m
+CONFIG_FB_S3_DDC=y
+CONFIG_FB_SAVAGE=m
+CONFIG_FB_SAVAGE_I2C=y
+# CONFIG_FB_SAVAGE_ACCEL is not set
+CONFIG_FB_SIS=m
+CONFIG_FB_SIS_300=y
+CONFIG_FB_SIS_315=y
+CONFIG_FB_VIA=m
+# CONFIG_FB_VIA_DIRECT_PROCFS is not set
+CONFIG_FB_VIA_X_COMPATIBILITY=y
+CONFIG_FB_NEOMAGIC=m
+CONFIG_FB_KYRO=m
+CONFIG_FB_3DFX=m
+# CONFIG_FB_3DFX_ACCEL is not set
+# CONFIG_FB_3DFX_I2C is not set
+CONFIG_FB_VOODOO1=m
+CONFIG_FB_VT8623=m
+CONFIG_FB_TRIDENT=m
+CONFIG_FB_ARK=m
+CONFIG_FB_PM3=m
+CONFIG_FB_CARMINE=m
+CONFIG_FB_CARMINE_DRAM_EVAL=y
+# CONFIG_CARMINE_DRAM_CUSTOM is not set
+CONFIG_FB_SM501=m
+CONFIG_FB_SMSCUFX=m
+CONFIG_FB_UDL=m
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+CONFIG_FB_METRONOME=m
+CONFIG_FB_MB862XX=m
+CONFIG_FB_MB862XX_PCI_GDC=y
+CONFIG_FB_MB862XX_I2C=y
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_CARILLO_RANCH=m
+CONFIG_BACKLIGHT_PWM=m
+CONFIG_BACKLIGHT_DA903X=m
+CONFIG_BACKLIGHT_DA9052=m
+CONFIG_BACKLIGHT_MAX8925=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_WM831X=m
+CONFIG_BACKLIGHT_ADP5520=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_88PM860X=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_AAT2870=m
+CONFIG_BACKLIGHT_LM3630A=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_LP855X=m
+CONFIG_BACKLIGHT_LP8788=m
+CONFIG_BACKLIGHT_PANDORA=m
+CONFIG_BACKLIGHT_SKY81452=m
+CONFIG_BACKLIGHT_AS3711=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+CONFIG_BACKLIGHT_RAVE_SP=m
+# end of Backlight & LCD device support
+
+CONFIG_VGASTATE=m
+CONFIG_VIDEOMODE_HELPERS=y
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+# CONFIG_VGACON_SOFT_SCROLLBACK is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+# CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER is not set
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+# CONFIG_SND_PCM_OSS is not set
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+CONFIG_SND_SUPPORT_OLD_API=y
+CONFIG_SND_PROC_FS=y
+CONFIG_SND_VERBOSE_PROCFS=y
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+# CONFIG_SND_SEQUENCER_OSS is not set
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+CONFIG_SND_PCSP=m
+CONFIG_SND_DUMMY=m
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=0
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+CONFIG_SND_HDA_INTEL_DETECT_DMIC=y
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=1
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=64
+CONFIG_SND_INTEL_NHLT=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+CONFIG_SND_SOC_FSL_ASRC=m
+CONFIG_SND_SOC_FSL_SAI=m
+CONFIG_SND_SOC_FSL_AUDMIX=m
+CONFIG_SND_SOC_FSL_SSI=m
+CONFIG_SND_SOC_FSL_SPDIF=m
+CONFIG_SND_SOC_FSL_ESAI=m
+CONFIG_SND_SOC_FSL_MICFIL=m
+CONFIG_SND_SOC_IMX_AUDMUX=m
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_SOC_IMG=y
+CONFIG_SND_SOC_IMG_I2S_IN=m
+CONFIG_SND_SOC_IMG_I2S_OUT=m
+CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
+CONFIG_SND_SOC_IMG_SPDIF_IN=m
+CONFIG_SND_SOC_IMG_SPDIF_OUT=m
+CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SST_IPC=m
+CONFIG_SND_SST_IPC_PCI=m
+CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+# CONFIG_SND_SOC_INTEL_SKYLAKE is not set
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+# CONFIG_SND_SOC_INTEL_CNL is not set
+# CONFIG_SND_SOC_INTEL_CFL is not set
+# CONFIG_SND_SOC_INTEL_CML_H is not set
+# CONFIG_SND_SOC_INTEL_CML_LP is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+# CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC is not set
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+# CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH is not set
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+CONFIG_SND_SOC_INTEL_SOF_RT5682_MACH=m
+CONFIG_SND_SOC_INTEL_CML_LP_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_MTK_BTCVSD=m
+CONFIG_SND_SOC_SOF_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_PCI=m
+CONFIG_SND_SOC_SOF_ACPI=m
+CONFIG_SND_SOC_SOF_OPTIONS=m
+# CONFIG_SND_SOC_SOF_NOCODEC_SUPPORT is not set
+# CONFIG_SND_SOC_SOF_STRICT_ABI_CHECKS is not set
+# CONFIG_SND_SOC_SOF_DEBUG is not set
+CONFIG_SND_SOC_SOF=m
+CONFIG_SND_SOC_SOF_PROBE_WORK_QUEUE=y
+CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y
+CONFIG_SND_SOC_SOF_INTEL_ACPI=m
+CONFIG_SND_SOC_SOF_INTEL_PCI=m
+CONFIG_SND_SOC_SOF_INTEL_HIFI_EP_IPC=m
+CONFIG_SND_SOC_SOF_INTEL_ATOM_HIFI_EP=m
+CONFIG_SND_SOC_SOF_INTEL_COMMON=m
+CONFIG_SND_SOC_SOF_BAYTRAIL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BAYTRAIL=m
+CONFIG_SND_SOC_SOF_BROADWELL_SUPPORT=y
+CONFIG_SND_SOC_SOF_BROADWELL=m
+CONFIG_SND_SOC_SOF_MERRIFIELD_SUPPORT=y
+CONFIG_SND_SOC_SOF_MERRIFIELD=m
+CONFIG_SND_SOC_SOF_APOLLOLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_APOLLOLAKE=m
+CONFIG_SND_SOC_SOF_GEMINILAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_GEMINILAKE=m
+CONFIG_SND_SOC_SOF_CANNONLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_CANNONLAKE=m
+CONFIG_SND_SOC_SOF_COFFEELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_COFFEELAKE=m
+CONFIG_SND_SOC_SOF_ICELAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ICELAKE=m
+CONFIG_SND_SOC_SOF_COMETLAKE_LP=m
+CONFIG_SND_SOC_SOF_COMETLAKE_LP_SUPPORT=y
+CONFIG_SND_SOC_SOF_COMETLAKE_H=m
+CONFIG_SND_SOC_SOF_COMETLAKE_H_SUPPORT=y
+CONFIG_SND_SOC_SOF_TIGERLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_TIGERLAKE=m
+CONFIG_SND_SOC_SOF_ELKHARTLAKE_SUPPORT=y
+CONFIG_SND_SOC_SOF_ELKHARTLAKE=m
+CONFIG_SND_SOC_SOF_HDA_COMMON=m
+CONFIG_SND_SOC_SOF_HDA_LINK=y
+CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y
+CONFIG_SND_SOC_SOF_HDA_ALWAYS_ENABLE_DMI_L1=y
+CONFIG_SND_SOC_SOF_HDA_LINK_BASELINE=m
+CONFIG_SND_SOC_SOF_HDA=m
+CONFIG_SND_SOC_SOF_XTENSA=m
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=m
+CONFIG_SND_SOC_XILINX_SPDIF=m
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_ZX_TDM=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CROS_EC_CODEC=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_ANALOG=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SI476X=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WCD9335=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_XEN_FRONTEND=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=m
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=m
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=m
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=m
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=m
+CONFIG_HID_BETOP_FF=m
+CONFIG_HID_BIGBEN_FF=m
+CONFIG_HID_CHERRY=m
+CONFIG_HID_CHICONY=m
+CONFIG_HID_CORSAIR=m
+CONFIG_HID_COUGAR=m
+CONFIG_HID_MACALLY=m
+CONFIG_HID_PRODIKEYS=m
+CONFIG_HID_CMEDIA=m
+CONFIG_HID_CP2112=m
+CONFIG_HID_CREATIVE_SB0540=m
+CONFIG_HID_CYPRESS=m
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=m
+CONFIG_HID_GEMBIRD=m
+CONFIG_HID_GFRM=m
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GOOGLE_HAMMER=m
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+CONFIG_HID_VIEWSONIC=m
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+CONFIG_HID_ITE=m
+CONFIG_HID_JABRA=m
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=m
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=m
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=m
+CONFIG_HID_MALTRON=m
+CONFIG_HID_MAYFLASH=m
+CONFIG_HID_REDRAGON=m
+CONFIG_HID_MICROSOFT=m
+CONFIG_HID_MONTEREY=m
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=m
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+CONFIG_HID_RETRODE=m
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+CONFIG_HID_STEAM=m
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+CONFIG_HID_UDRAW_PS3=m
+CONFIG_HID_U2FZERO=m
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+CONFIG_HID_SENSOR_CUSTOM_SENSOR=m
+CONFIG_HID_ALPS=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=m
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+
+#
+# USB HID Boot Protocol drivers
+#
+CONFIG_USB_KBD=m
+CONFIG_USB_MOUSE=m
+# end of USB HID Boot Protocol drivers
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+# end of I2C HID support
+
+#
+# Intel ISH HID support
+#
+CONFIG_INTEL_ISH_HID=m
+CONFIG_INTEL_ISH_FIRMWARE_DOWNLOADER=m
+# end of Intel ISH HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+CONFIG_USB_LED_TRIG=y
+CONFIG_USB_ULPI_BUS=m
+CONFIG_USB_CONN_GPIO=m
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+CONFIG_USB_DYNAMIC_MINORS=y
+# CONFIG_USB_OTG is not set
+# CONFIG_USB_OTG_WHITELIST is not set
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_LEDS_TRIGGER_USBPORT=m
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=m
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=y
+CONFIG_USB_XHCI_DBGCAP=y
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+CONFIG_USB_EHCI_FSL=m
+CONFIG_USB_EHCI_HCD_PLATFORM=y
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+CONFIG_USB_SL811_HCD_ISO=y
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+CONFIG_USBIP_CORE=m
+CONFIG_USBIP_VHCI_HCD=m
+CONFIG_USBIP_VHCI_HC_PORTS=8
+CONFIG_USBIP_VHCI_NR_HCS=1
+CONFIG_USBIP_HOST=m
+CONFIG_USBIP_VUDC=m
+# CONFIG_USBIP_DEBUG is not set
+CONFIG_USB_CDNS3=m
+CONFIG_USB_CDNS3_GADGET=y
+CONFIG_USB_CDNS3_HOST=y
+CONFIG_USB_CDNS3_PCI_WRAP=m
+CONFIG_USB_MUSB_HDRC=m
+# CONFIG_USB_MUSB_HOST is not set
+# CONFIG_USB_MUSB_GADGET is not set
+CONFIG_USB_MUSB_DUAL_ROLE=y
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+CONFIG_USB_DWC3_ULPI=y
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+CONFIG_USB_DWC2=y
+CONFIG_USB_DWC2_HOST=y
+
+#
+# Gadget/Dual-role mode requires USB Gadget support to be enabled
+#
+CONFIG_USB_DWC2_PCI=m
+# CONFIG_USB_DWC2_DEBUG is not set
+# CONFIG_USB_DWC2_TRACK_MISSED_SOFS is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_PCI=m
+CONFIG_USB_CHIPIDEA_UDC=y
+CONFIG_USB_CHIPIDEA_HOST=y
+CONFIG_USB_ISP1760=m
+CONFIG_USB_ISP1760_HCD=y
+CONFIG_USB_ISP1761_UDC=y
+# CONFIG_USB_ISP1760_HOST_ROLE is not set
+# CONFIG_USB_ISP1760_GADGET_ROLE is not set
+CONFIG_USB_ISP1760_DUAL_ROLE=y
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+# CONFIG_USB_SERIAL_SAFE_PADDED is not set
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=m
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+CONFIG_USB_SERIAL_DEBUG=m
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+# CONFIG_USB_SISUSBVGA_CON is not set
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+CONFIG_USB_TEST=m
+CONFIG_USB_EHSET_TEST_FIXTURE=m
+CONFIG_USB_ISIGHTFW=m
+CONFIG_USB_YUREX=m
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+CONFIG_USB_HSIC_USB4604=m
+CONFIG_USB_LINK_LAYER_TEST=m
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+CONFIG_USB_GPIO_VBUS=m
+CONFIG_TAHVO_USB=m
+CONFIG_TAHVO_USB_HOST_BY_DEFAULT=y
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+CONFIG_U_SERIAL_CONSOLE=y
+
+#
+# USB Peripheral Controller
+#
+CONFIG_USB_FOTG210_UDC=m
+CONFIG_USB_GR_UDC=m
+CONFIG_USB_R8A66597=m
+CONFIG_USB_PXA27X=m
+CONFIG_USB_MV_UDC=m
+CONFIG_USB_MV_U3D=m
+CONFIG_USB_SNP_CORE=m
+# CONFIG_USB_M66592 is not set
+CONFIG_USB_BDC_UDC=m
+
+#
+# Platform Support
+#
+CONFIG_USB_BDC_PCI=m
+CONFIG_USB_AMD5536UDC=m
+CONFIG_USB_NET2272=m
+CONFIG_USB_NET2272_DMA=y
+CONFIG_USB_NET2280=m
+CONFIG_USB_GOKU=m
+CONFIG_USB_EG20T=m
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+CONFIG_USB_LIBCOMPOSITE=m
+CONFIG_USB_F_ACM=m
+CONFIG_USB_F_SS_LB=m
+CONFIG_USB_U_SERIAL=m
+CONFIG_USB_U_ETHER=m
+CONFIG_USB_U_AUDIO=m
+CONFIG_USB_F_SERIAL=m
+CONFIG_USB_F_OBEX=m
+CONFIG_USB_F_NCM=m
+CONFIG_USB_F_ECM=m
+CONFIG_USB_F_PHONET=m
+CONFIG_USB_F_EEM=m
+CONFIG_USB_F_SUBSET=m
+CONFIG_USB_F_RNDIS=m
+CONFIG_USB_F_MASS_STORAGE=m
+CONFIG_USB_F_FS=m
+CONFIG_USB_F_UAC1=m
+CONFIG_USB_F_UAC1_LEGACY=m
+CONFIG_USB_F_UAC2=m
+CONFIG_USB_F_UVC=m
+CONFIG_USB_F_MIDI=m
+CONFIG_USB_F_HID=m
+CONFIG_USB_F_PRINTER=m
+CONFIG_USB_F_TCM=m
+CONFIG_USB_CONFIGFS=m
+CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
+CONFIG_USB_CONFIGFS_OBEX=y
+CONFIG_USB_CONFIGFS_NCM=y
+CONFIG_USB_CONFIGFS_ECM=y
+CONFIG_USB_CONFIGFS_ECM_SUBSET=y
+CONFIG_USB_CONFIGFS_RNDIS=y
+CONFIG_USB_CONFIGFS_EEM=y
+CONFIG_USB_CONFIGFS_PHONET=y
+CONFIG_USB_CONFIGFS_MASS_STORAGE=y
+CONFIG_USB_CONFIGFS_F_LB_SS=y
+CONFIG_USB_CONFIGFS_F_FS=y
+CONFIG_USB_CONFIGFS_F_UAC1=y
+CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=y
+CONFIG_USB_CONFIGFS_F_UAC2=y
+CONFIG_USB_CONFIGFS_F_MIDI=y
+CONFIG_USB_CONFIGFS_F_HID=y
+CONFIG_USB_CONFIGFS_F_UVC=y
+CONFIG_USB_CONFIGFS_F_PRINTER=y
+CONFIG_USB_CONFIGFS_F_TCM=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_AUDIO=m
+CONFIG_GADGET_UAC1=y
+# CONFIG_GADGET_UAC1_LEGACY is not set
+CONFIG_USB_ETH=m
+CONFIG_USB_ETH_RNDIS=y
+CONFIG_USB_ETH_EEM=y
+CONFIG_USB_G_NCM=m
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FUNCTIONFS=m
+CONFIG_USB_FUNCTIONFS_ETH=y
+CONFIG_USB_FUNCTIONFS_RNDIS=y
+CONFIG_USB_FUNCTIONFS_GENERIC=y
+CONFIG_USB_MASS_STORAGE=m
+CONFIG_USB_GADGET_TARGET=m
+CONFIG_USB_G_SERIAL=m
+CONFIG_USB_MIDI_GADGET=m
+CONFIG_USB_G_PRINTER=m
+CONFIG_USB_CDC_COMPOSITE=m
+CONFIG_USB_G_NOKIA=m
+CONFIG_USB_G_ACM_MS=m
+# CONFIG_USB_G_MULTI is not set
+CONFIG_USB_G_HID=m
+CONFIG_USB_G_DBGP=m
+# CONFIG_USB_G_DBGP_PRINTK is not set
+CONFIG_USB_G_DBGP_SERIAL=y
+CONFIG_USB_G_WEBCAM=m
+CONFIG_TYPEC=m
+CONFIG_TYPEC_TCPM=m
+CONFIG_TYPEC_TCPCI=m
+CONFIG_TYPEC_RT1711H=m
+CONFIG_TYPEC_FUSB302=m
+CONFIG_TYPEC_UCSI=m
+CONFIG_UCSI_CCG=m
+CONFIG_UCSI_ACPI=m
+CONFIG_TYPEC_TPS6598X=m
+
+#
+# USB Type-C Multiplexer/DeMultiplexer Switch support
+#
+CONFIG_TYPEC_MUX_PI3USB30532=m
+# end of USB Type-C Multiplexer/DeMultiplexer Switch support
+
+#
+# USB Type-C Alternate Mode drivers
+#
+CONFIG_TYPEC_DP_ALTMODE=m
+CONFIG_TYPEC_NVIDIA_ALTMODE=m
+# end of USB Type-C Alternate Mode drivers
+
+CONFIG_USB_ROLE_SWITCH=m
+CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_MMC=y
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_F_SDH30=m
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_ALCOR=m
+CONFIG_MMC_TIFM_SD=m
+CONFIG_MMC_SPI=m
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+CONFIG_MMC_SDHCI_XENON=m
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+CONFIG_MS_BLOCK=m
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_CLASS_FLASH=m
+CONFIG_LEDS_BRIGHTNESS_HW_CHANGED=y
+
+#
+# LED drivers
+#
+CONFIG_LEDS_88PM860X=m
+CONFIG_LEDS_APU=m
+CONFIG_LEDS_AS3645A=m
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_LM3601X=m
+CONFIG_LEDS_MT6323=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_LP8788=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA955X_GPIO=y
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_WM831X_STATUS=m
+CONFIG_LEDS_WM8350=m
+CONFIG_LEDS_DA903X=m
+CONFIG_LEDS_DA9052=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_PWM=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_ADP5520=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_MAX8997=m
+CONFIG_LEDS_LM355x=m
+CONFIG_LEDS_MENF21BMC=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+CONFIG_LEDS_LM36274=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+CONFIG_LEDS_TRIGGER_MTD=y
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+CONFIG_LEDS_TRIGGER_ACTIVITY=m
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+CONFIG_LEDS_TRIGGER_NETDEV=m
+CONFIG_LEDS_TRIGGER_PATTERN=m
+CONFIG_LEDS_TRIGGER_AUDIO=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_OPA_VNIC=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+# CONFIG_EDAC_LEGACY_SYSFS is not set
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_88PM860X=m
+CONFIG_RTC_DRV_88PM80X=m
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_CENTURY=y
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_LP8788=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_MAX8907=m
+CONFIG_RTC_DRV_MAX8925=m
+CONFIG_RTC_DRV_MAX8998=m
+CONFIG_RTC_DRV_MAX8997=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_PALMAS=m
+CONFIG_RTC_DRV_TPS6586X=m
+CONFIG_RTC_DRV_TPS65910=m
+CONFIG_RTC_DRV_TPS80031=m
+CONFIG_RTC_DRV_RC5T583=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_S5M=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RX6110=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_DA9052=m
+CONFIG_RTC_DRV_DA9055=m
+CONFIG_RTC_DRV_DA9063=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_WM831X=m
+CONFIG_RTC_DRV_WM8350=m
+CONFIG_RTC_DRV_PCF50633=m
+CONFIG_RTC_DRV_AB3100=m
+CONFIG_RTC_DRV_CROS_EC=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_PCAP=m
+CONFIG_RTC_DRV_MC13XXX=m
+CONFIG_RTC_DRV_MT6397=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_RTC_DRV_WILCO_EC=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_INTEL_MIC_X100_DMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=m
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=m
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+CONFIG_HSU_DMA=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+CONFIG_SW_SYNC=y
+CONFIG_UDMABUF=y
+# CONFIG_DMABUF_SELFTESTS is not set
+# end of DMABUF options
+
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+CONFIG_HD44780=m
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+CONFIG_IMG_ASCII_LCD=m
+CONFIG_PARPORT_PANEL=m
+CONFIG_PANEL_PARPORT=0
+CONFIG_PANEL_PROFILE=5
+# CONFIG_PANEL_CHANGE_MESSAGE is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+CONFIG_PANEL=m
+CONFIG_CHARLCD=m
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+CONFIG_VFIO_NOIOMMU=y
+CONFIG_VFIO_PCI=m
+CONFIG_VFIO_PCI_VGA=y
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI_IGD=y
+CONFIG_VFIO_MDEV=m
+CONFIG_VFIO_MDEV_DEVICE=m
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+# CONFIG_VBOXGUEST is not set
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_INPUT=m
+CONFIG_VIRTIO_MMIO=y
+CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GNTDEV_DMABUF=y
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_GRANT_DMA_ALLOC=y
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=m
+CONFIG_XEN_PVCALLS_FRONTEND=m
+# CONFIG_XEN_PVCALLS_BACKEND is not set
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=y
+CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+# end of Xen driver support
+
+CONFIG_GREYBUS=m
+CONFIG_GREYBUS_ES2=m
+CONFIG_STAGING=y
+CONFIG_PRISM2_USB=m
+CONFIG_COMEDI=m
+# CONFIG_COMEDI_DEBUG is not set
+CONFIG_COMEDI_DEFAULT_BUF_SIZE_KB=2048
+CONFIG_COMEDI_DEFAULT_BUF_MAXSIZE_KB=20480
+CONFIG_COMEDI_MISC_DRIVERS=y
+CONFIG_COMEDI_BOND=m
+CONFIG_COMEDI_TEST=m
+CONFIG_COMEDI_PARPORT=m
+CONFIG_COMEDI_ISA_DRIVERS=y
+CONFIG_COMEDI_PCL711=m
+CONFIG_COMEDI_PCL724=m
+CONFIG_COMEDI_PCL726=m
+CONFIG_COMEDI_PCL730=m
+CONFIG_COMEDI_PCL812=m
+CONFIG_COMEDI_PCL816=m
+CONFIG_COMEDI_PCL818=m
+CONFIG_COMEDI_PCM3724=m
+CONFIG_COMEDI_AMPLC_DIO200_ISA=m
+CONFIG_COMEDI_AMPLC_PC236_ISA=m
+CONFIG_COMEDI_AMPLC_PC263_ISA=m
+CONFIG_COMEDI_RTI800=m
+CONFIG_COMEDI_RTI802=m
+CONFIG_COMEDI_DAC02=m
+CONFIG_COMEDI_DAS16M1=m
+CONFIG_COMEDI_DAS08_ISA=m
+CONFIG_COMEDI_DAS16=m
+CONFIG_COMEDI_DAS800=m
+CONFIG_COMEDI_DAS1800=m
+CONFIG_COMEDI_DAS6402=m
+CONFIG_COMEDI_DT2801=m
+CONFIG_COMEDI_DT2811=m
+CONFIG_COMEDI_DT2814=m
+CONFIG_COMEDI_DT2815=m
+CONFIG_COMEDI_DT2817=m
+CONFIG_COMEDI_DT282X=m
+CONFIG_COMEDI_DMM32AT=m
+CONFIG_COMEDI_FL512=m
+CONFIG_COMEDI_AIO_AIO12_8=m
+CONFIG_COMEDI_AIO_IIRO_16=m
+CONFIG_COMEDI_II_PCI20KC=m
+CONFIG_COMEDI_C6XDIGIO=m
+CONFIG_COMEDI_MPC624=m
+CONFIG_COMEDI_ADQ12B=m
+CONFIG_COMEDI_NI_AT_A2150=m
+CONFIG_COMEDI_NI_AT_AO=m
+CONFIG_COMEDI_NI_ATMIO=m
+CONFIG_COMEDI_NI_ATMIO16D=m
+CONFIG_COMEDI_NI_LABPC_ISA=m
+CONFIG_COMEDI_PCMAD=m
+CONFIG_COMEDI_PCMDA12=m
+CONFIG_COMEDI_PCMMIO=m
+CONFIG_COMEDI_PCMUIO=m
+CONFIG_COMEDI_MULTIQ3=m
+CONFIG_COMEDI_S526=m
+CONFIG_COMEDI_PCI_DRIVERS=m
+CONFIG_COMEDI_8255_PCI=m
+CONFIG_COMEDI_ADDI_WATCHDOG=m
+CONFIG_COMEDI_ADDI_APCI_1032=m
+CONFIG_COMEDI_ADDI_APCI_1500=m
+CONFIG_COMEDI_ADDI_APCI_1516=m
+CONFIG_COMEDI_ADDI_APCI_1564=m
+CONFIG_COMEDI_ADDI_APCI_16XX=m
+CONFIG_COMEDI_ADDI_APCI_2032=m
+CONFIG_COMEDI_ADDI_APCI_2200=m
+CONFIG_COMEDI_ADDI_APCI_3120=m
+CONFIG_COMEDI_ADDI_APCI_3501=m
+CONFIG_COMEDI_ADDI_APCI_3XXX=m
+CONFIG_COMEDI_ADL_PCI6208=m
+CONFIG_COMEDI_ADL_PCI7X3X=m
+CONFIG_COMEDI_ADL_PCI8164=m
+CONFIG_COMEDI_ADL_PCI9111=m
+CONFIG_COMEDI_ADL_PCI9118=m
+CONFIG_COMEDI_ADV_PCI1710=m
+CONFIG_COMEDI_ADV_PCI1720=m
+CONFIG_COMEDI_ADV_PCI1723=m
+CONFIG_COMEDI_ADV_PCI1724=m
+CONFIG_COMEDI_ADV_PCI1760=m
+CONFIG_COMEDI_ADV_PCI_DIO=m
+CONFIG_COMEDI_AMPLC_DIO200_PCI=m
+CONFIG_COMEDI_AMPLC_PC236_PCI=m
+CONFIG_COMEDI_AMPLC_PC263_PCI=m
+CONFIG_COMEDI_AMPLC_PCI224=m
+CONFIG_COMEDI_AMPLC_PCI230=m
+CONFIG_COMEDI_CONTEC_PCI_DIO=m
+CONFIG_COMEDI_DAS08_PCI=m
+CONFIG_COMEDI_DT3000=m
+CONFIG_COMEDI_DYNA_PCI10XX=m
+CONFIG_COMEDI_GSC_HPDI=m
+CONFIG_COMEDI_MF6X4=m
+CONFIG_COMEDI_ICP_MULTI=m
+CONFIG_COMEDI_DAQBOARD2000=m
+CONFIG_COMEDI_JR3_PCI=m
+CONFIG_COMEDI_KE_COUNTER=m
+CONFIG_COMEDI_CB_PCIDAS64=m
+CONFIG_COMEDI_CB_PCIDAS=m
+CONFIG_COMEDI_CB_PCIDDA=m
+CONFIG_COMEDI_CB_PCIMDAS=m
+CONFIG_COMEDI_CB_PCIMDDA=m
+CONFIG_COMEDI_ME4000=m
+CONFIG_COMEDI_ME_DAQ=m
+CONFIG_COMEDI_NI_6527=m
+CONFIG_COMEDI_NI_65XX=m
+CONFIG_COMEDI_NI_660X=m
+CONFIG_COMEDI_NI_670X=m
+CONFIG_COMEDI_NI_LABPC_PCI=m
+CONFIG_COMEDI_NI_PCIDIO=m
+CONFIG_COMEDI_NI_PCIMIO=m
+CONFIG_COMEDI_RTD520=m
+CONFIG_COMEDI_S626=m
+CONFIG_COMEDI_MITE=m
+CONFIG_COMEDI_NI_TIOCMD=m
+CONFIG_COMEDI_PCMCIA_DRIVERS=m
+CONFIG_COMEDI_CB_DAS16_CS=m
+CONFIG_COMEDI_DAS08_CS=m
+CONFIG_COMEDI_NI_DAQ_700_CS=m
+CONFIG_COMEDI_NI_DAQ_DIO24_CS=m
+CONFIG_COMEDI_NI_LABPC_CS=m
+CONFIG_COMEDI_NI_MIO_CS=m
+CONFIG_COMEDI_QUATECH_DAQP_CS=m
+CONFIG_COMEDI_USB_DRIVERS=m
+CONFIG_COMEDI_DT9812=m
+CONFIG_COMEDI_NI_USB6501=m
+CONFIG_COMEDI_USBDUX=m
+CONFIG_COMEDI_USBDUXFAST=m
+CONFIG_COMEDI_USBDUXSIGMA=m
+CONFIG_COMEDI_VMK80XX=m
+CONFIG_COMEDI_8254=m
+CONFIG_COMEDI_8255=m
+CONFIG_COMEDI_8255_SA=m
+CONFIG_COMEDI_KCOMEDILIB=m
+CONFIG_COMEDI_AMPLC_DIO200=m
+CONFIG_COMEDI_AMPLC_PC236=m
+CONFIG_COMEDI_DAS08=m
+CONFIG_COMEDI_ISADMA=m
+CONFIG_COMEDI_NI_LABPC=m
+CONFIG_COMEDI_NI_LABPC_ISADMA=m
+CONFIG_COMEDI_NI_TIO=m
+CONFIG_COMEDI_NI_ROUTING=m
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+CONFIG_VT6655=m
+CONFIG_VT6656=m
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16203=m
+CONFIG_ADIS16240=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD7816=m
+CONFIG_AD7192=m
+CONFIG_AD7280=m
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+CONFIG_ADT7316=m
+CONFIG_ADT7316_SPI=m
+CONFIG_ADT7316_I2C=m
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+CONFIG_AD7150=m
+CONFIG_AD7746=m
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+CONFIG_AD9832=m
+CONFIG_AD9834=m
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+CONFIG_AD5933=m
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+CONFIG_ADE7854=m
+CONFIG_ADE7854_I2C=m
+CONFIG_ADE7854_SPI=m
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S1210=m
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+CONFIG_FB_SM750=m
+
+#
+# Speakup console speech
+#
+CONFIG_SPEAKUP=m
+CONFIG_SPEAKUP_SYNTH_ACNTSA=m
+CONFIG_SPEAKUP_SYNTH_APOLLO=m
+CONFIG_SPEAKUP_SYNTH_AUDPTR=m
+CONFIG_SPEAKUP_SYNTH_BNS=m
+CONFIG_SPEAKUP_SYNTH_DECTLK=m
+CONFIG_SPEAKUP_SYNTH_DECEXT=m
+CONFIG_SPEAKUP_SYNTH_LTLK=m
+CONFIG_SPEAKUP_SYNTH_SOFT=m
+CONFIG_SPEAKUP_SYNTH_SPKOUT=m
+CONFIG_SPEAKUP_SYNTH_TXPRT=m
+CONFIG_SPEAKUP_SYNTH_DUMMY=m
+# end of Speakup console speech
+
+CONFIG_STAGING_MEDIA=y
+CONFIG_VIDEO_IPU3_IMGU=m
+
+#
+# soc_camera sensor drivers
+#
+
+#
+# Android
+#
+# CONFIG_ASHMEM is not set
+# CONFIG_ANDROID_VSOC is not set
+# CONFIG_ION is not set
+# end of Android
+
+CONFIG_LTE_GDM724X=m
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+CONFIG_GS_FPGABOOT=m
+CONFIG_UNISYSSPAR=y
+CONFIG_UNISYS_VISORNIC=m
+CONFIG_UNISYS_VISORINPUT=m
+CONFIG_UNISYS_VISORHBA=m
+CONFIG_WILC1000=m
+CONFIG_WILC1000_SDIO=m
+CONFIG_WILC1000_SPI=m
+CONFIG_WILC1000_HW_OOB_INTR=y
+CONFIG_MOST=m
+CONFIG_MOST_CDEV=m
+CONFIG_MOST_NET=m
+CONFIG_MOST_SOUND=m
+CONFIG_MOST_VIDEO=m
+CONFIG_MOST_I2C=m
+CONFIG_MOST_USB=m
+CONFIG_KS7010=m
+CONFIG_GREYBUS_AUDIO=m
+CONFIG_GREYBUS_BOOTROM=m
+CONFIG_GREYBUS_FIRMWARE=m
+CONFIG_GREYBUS_HID=m
+CONFIG_GREYBUS_LIGHT=m
+CONFIG_GREYBUS_LOG=m
+CONFIG_GREYBUS_LOOPBACK=m
+CONFIG_GREYBUS_POWER=m
+CONFIG_GREYBUS_RAW=m
+CONFIG_GREYBUS_VIBRATOR=m
+CONFIG_GREYBUS_BRIDGED_PHY=m
+CONFIG_GREYBUS_GPIO=m
+CONFIG_GREYBUS_I2C=m
+CONFIG_GREYBUS_PWM=m
+CONFIG_GREYBUS_SDIO=m
+CONFIG_GREYBUS_SPI=m
+CONFIG_GREYBUS_UART=m
+CONFIG_GREYBUS_USB=m
+CONFIG_PI433=m
+
+#
+# Gasket devices
+#
+CONFIG_STAGING_GASKET_FRAMEWORK=m
+CONFIG_STAGING_APEX_DRIVER=m
+# end of Gasket devices
+
+CONFIG_FIELDBUS_DEV=m
+CONFIG_KPC2000=y
+CONFIG_KPC2000_CORE=m
+CONFIG_KPC2000_SPI=m
+CONFIG_KPC2000_I2C=m
+CONFIG_KPC2000_DMA=m
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+# CONFIG_GIGASET_CAPI is not set
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+CONFIG_EXFAT_FS=m
+CONFIG_EXFAT_DONT_MOUNT_VFAT=y
+CONFIG_EXFAT_DISCARD=y
+# CONFIG_EXFAT_DELAYED_SYNC is not set
+# CONFIG_EXFAT_KERNEL_DEBUG is not set
+# CONFIG_EXFAT_DEBUG_MSG is not set
+CONFIG_EXFAT_DEFAULT_CODEPAGE=437
+CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8"
+CONFIG_QLGE=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_RBU=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WIRELESS=m
+CONFIG_HP_WMI=m
+CONFIG_LG_LAPTOP=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SURFACE3_WMI=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+CONFIG_THINKPAD_ACPI_DEBUGFACILITIES=y
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_PEAQ_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+# CONFIG_TOSHIBA_WMI is not set
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_CHT_INT33FE=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_PMC_CORE=y
+CONFIG_IBM_RTL=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_PMC_IPC=m
+CONFIG_INTEL_BXTWC_PMIC_TMU=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_SURFACE_3_BUTTON=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_TELEMETRY=m
+CONFIG_MLX_PLATFORM=m
+CONFIG_INTEL_TURBO_MAX_3=y
+CONFIG_TOUCHSCREEN_DMI=y
+CONFIG_INTEL_CHTDC_TI_PWRBTN=m
+CONFIG_I2C_MULTI_INSTANTIATE=m
+CONFIG_INTEL_ATOMISP2_PM=m
+CONFIG_HUAWEI_WMI=m
+CONFIG_PCENGINES_APU2=m
+
+#
+# Intel Speed Select Technology interface support
+#
+CONFIG_INTEL_SPEED_SELECT_INTERFACE=m
+# end of Intel Speed Select Technology interface support
+
+CONFIG_PMC_ATOM=y
+CONFIG_MFD_CROS_EC=m
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+CONFIG_CROS_EC=m
+CONFIG_CROS_EC_I2C=m
+CONFIG_CROS_EC_ISHTP=m
+CONFIG_CROS_EC_SPI=m
+CONFIG_CROS_EC_LPC=m
+CONFIG_CROS_EC_PROTO=y
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+CONFIG_CROS_EC_CHARDEV=m
+CONFIG_CROS_EC_LIGHTBAR=m
+CONFIG_CROS_EC_DEBUGFS=m
+CONFIG_CROS_EC_SYSFS=m
+CONFIG_CROS_USBPD_LOGGER=m
+CONFIG_WILCO_EC=m
+CONFIG_WILCO_EC_DEBUGFS=m
+CONFIG_WILCO_EC_EVENTS=m
+CONFIG_WILCO_EC_TELEMETRY=m
+CONFIG_MELLANOX_PLATFORM=y
+CONFIG_MLXREG_HOTPLUG=m
+CONFIG_MLXREG_IO=m
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+CONFIG_COMMON_CLK_WM831X=m
+CONFIG_COMMON_CLK_MAX9485=m
+CONFIG_COMMON_CLK_SI5341=m
+CONFIG_COMMON_CLK_SI5351=m
+CONFIG_COMMON_CLK_SI544=m
+CONFIG_COMMON_CLK_CDCE706=m
+CONFIG_COMMON_CLK_CS2000_CP=m
+CONFIG_COMMON_CLK_S2MPS11=m
+CONFIG_CLK_TWL6040=m
+CONFIG_COMMON_CLK_PALMAS=m
+CONFIG_COMMON_CLK_PWM=m
+# end of Common Clock Framework
+
+CONFIG_HWSPINLOCK=y
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+CONFIG_ALTERA_MBOX=m
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+CONFIG_REMOTEPROC=y
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+CONFIG_RPMSG=m
+CONFIG_RPMSG_CHAR=m
+CONFIG_RPMSG_QCOM_GLINK_NATIVE=m
+CONFIG_RPMSG_QCOM_GLINK_RPM=m
+CONFIG_RPMSG_VIRTIO=m
+# end of Rpmsg drivers
+
+CONFIG_SOUNDWIRE=y
+
+#
+# SoundWire Devices
+#
+CONFIG_SOUNDWIRE_CADENCE=m
+CONFIG_SOUNDWIRE_INTEL=m
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+# end of Qualcomm SoC drivers
+
+CONFIG_SOC_TI=y
+
+#
+# Xilinx SoC drivers
+#
+CONFIG_XILINX_VCU=m
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
+CONFIG_DEVFREQ_GOV_PERFORMANCE=y
+CONFIG_DEVFREQ_GOV_POWERSAVE=y
+CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_GOV_PASSIVE=y
+
+#
+# DEVFREQ Drivers
+#
+CONFIG_PM_DEVFREQ_EVENT=y
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+CONFIG_EXTCON_ADC_JACK=m
+CONFIG_EXTCON_ARIZONA=m
+CONFIG_EXTCON_AXP288=m
+CONFIG_EXTCON_FSA9480=m
+CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_INTEL_INT3496=m
+CONFIG_EXTCON_INTEL_CHT_WC=m
+CONFIG_EXTCON_MAX14577=m
+CONFIG_EXTCON_MAX3355=m
+CONFIG_EXTCON_MAX77693=m
+CONFIG_EXTCON_MAX77843=m
+CONFIG_EXTCON_MAX8997=m
+CONFIG_EXTCON_PALMAS=m
+CONFIG_EXTCON_PTN5150=m
+CONFIG_EXTCON_RT8973A=m
+CONFIG_EXTCON_SM5502=m
+CONFIG_EXTCON_USB_GPIO=m
+CONFIG_EXTCON_USBC_CROS_EC=m
+CONFIG_MEMORY=y
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+CONFIG_IIO_BUFFER_HW_CONSUMER=m
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+CONFIG_IIO_SW_DEVICE=m
+CONFIG_IIO_SW_TRIGGER=m
+CONFIG_IIO_TRIGGERED_EVENT=m
+
+#
+# Accelerometers
+#
+CONFIG_ADIS16201=m
+CONFIG_ADIS16209=m
+CONFIG_ADXL372=m
+CONFIG_ADXL372_SPI=m
+CONFIG_ADXL372_I2C=m
+CONFIG_BMA180=m
+CONFIG_BMA220=m
+CONFIG_BMC150_ACCEL=m
+CONFIG_BMC150_ACCEL_I2C=m
+CONFIG_BMC150_ACCEL_SPI=m
+CONFIG_DA280=m
+CONFIG_DA311=m
+CONFIG_DMARD09=m
+CONFIG_DMARD10=m
+CONFIG_HID_SENSOR_ACCEL_3D=m
+CONFIG_IIO_CROS_EC_ACCEL_LEGACY=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_ACCEL_I2C_3AXIS=m
+CONFIG_IIO_ST_ACCEL_SPI_3AXIS=m
+CONFIG_KXSD9=m
+CONFIG_KXSD9_SPI=m
+CONFIG_KXSD9_I2C=m
+CONFIG_KXCJK1013=m
+CONFIG_MC3230=m
+CONFIG_MMA7455=m
+CONFIG_MMA7455_I2C=m
+CONFIG_MMA7455_SPI=m
+CONFIG_MMA7660=m
+CONFIG_MMA8452=m
+CONFIG_MMA9551_CORE=m
+CONFIG_MMA9551=m
+CONFIG_MMA9553=m
+CONFIG_MXC4005=m
+CONFIG_MXC6255=m
+CONFIG_SCA3000=m
+CONFIG_STK8312=m
+CONFIG_STK8BA50=m
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+CONFIG_AD_SIGMA_DELTA=m
+CONFIG_AD7124=m
+CONFIG_AD7266=m
+CONFIG_AD7291=m
+CONFIG_AD7298=m
+CONFIG_AD7476=m
+CONFIG_AD7606=m
+CONFIG_AD7606_IFACE_PARALLEL=m
+CONFIG_AD7606_IFACE_SPI=m
+CONFIG_AD7766=m
+CONFIG_AD7768_1=m
+CONFIG_AD7780=m
+CONFIG_AD7791=m
+CONFIG_AD7793=m
+CONFIG_AD7887=m
+CONFIG_AD7923=m
+CONFIG_AD7949=m
+CONFIG_AD799X=m
+CONFIG_AXP20X_ADC=m
+CONFIG_AXP288_ADC=m
+CONFIG_CC10001_ADC=m
+CONFIG_DA9150_GPADC=m
+CONFIG_DLN2_ADC=m
+CONFIG_HI8435=m
+CONFIG_HX711=m
+CONFIG_INA2XX_ADC=m
+CONFIG_LP8788_ADC=m
+CONFIG_LTC2471=m
+CONFIG_LTC2485=m
+CONFIG_LTC2497=m
+CONFIG_MAX1027=m
+CONFIG_MAX11100=m
+CONFIG_MAX1118=m
+CONFIG_MAX1363=m
+CONFIG_MAX9611=m
+CONFIG_MCP320X=m
+CONFIG_MCP3422=m
+CONFIG_MCP3911=m
+CONFIG_MEN_Z188_ADC=m
+CONFIG_NAU7802=m
+CONFIG_PALMAS_GPADC=m
+CONFIG_QCOM_VADC_COMMON=m
+CONFIG_QCOM_SPMI_IADC=m
+CONFIG_QCOM_SPMI_VADC=m
+CONFIG_QCOM_SPMI_ADC5=m
+CONFIG_STX104=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_ADC0832=m
+CONFIG_TI_ADC084S021=m
+CONFIG_TI_ADC12138=m
+CONFIG_TI_ADC108S102=m
+CONFIG_TI_ADC128S052=m
+CONFIG_TI_ADC161S626=m
+CONFIG_TI_ADS1015=m
+CONFIG_TI_ADS7950=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_TI_TLC4541=m
+CONFIG_TWL4030_MADC=m
+CONFIG_TWL6030_GPADC=m
+CONFIG_VIPERBOARD_ADC=m
+CONFIG_XILINX_XADC=m
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+CONFIG_AD8366=m
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+CONFIG_ATLAS_PH_SENSOR=m
+CONFIG_BME680=m
+CONFIG_BME680_I2C=m
+CONFIG_BME680_SPI=m
+CONFIG_CCS811=m
+CONFIG_IAQCORE=m
+CONFIG_PMS7003=m
+CONFIG_SENSIRION_SGP30=m
+CONFIG_SPS30=m
+CONFIG_VZ89X=m
+# end of Chemical Sensors
+
+CONFIG_IIO_CROS_EC_SENSORS_CORE=m
+CONFIG_IIO_CROS_EC_SENSORS=m
+CONFIG_IIO_CROS_EC_SENSORS_LID_ANGLE=m
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+CONFIG_IIO_MS_SENSORS_I2C=m
+
+#
+# SSP Sensor Common
+#
+CONFIG_IIO_SSP_SENSORS_COMMONS=m
+CONFIG_IIO_SSP_SENSORHUB=m
+# end of SSP Sensor Common
+
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
+
+#
+# Digital to analog converters
+#
+CONFIG_AD5064=m
+CONFIG_AD5360=m
+CONFIG_AD5380=m
+CONFIG_AD5421=m
+CONFIG_AD5446=m
+CONFIG_AD5449=m
+CONFIG_AD5592R_BASE=m
+CONFIG_AD5592R=m
+CONFIG_AD5593R=m
+CONFIG_AD5504=m
+CONFIG_AD5624R_SPI=m
+CONFIG_LTC1660=m
+CONFIG_LTC2632=m
+CONFIG_AD5686=m
+CONFIG_AD5686_SPI=m
+CONFIG_AD5696_I2C=m
+CONFIG_AD5755=m
+CONFIG_AD5758=m
+CONFIG_AD5761=m
+CONFIG_AD5764=m
+CONFIG_AD5791=m
+CONFIG_AD7303=m
+CONFIG_CIO_DAC=m
+CONFIG_AD8801=m
+CONFIG_DS4424=m
+CONFIG_M62332=m
+CONFIG_MAX517=m
+CONFIG_MCP4725=m
+CONFIG_MCP4922=m
+CONFIG_TI_DAC082S085=m
+CONFIG_TI_DAC5571=m
+CONFIG_TI_DAC7311=m
+CONFIG_TI_DAC7612=m
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+CONFIG_IIO_SIMPLE_DUMMY=m
+# CONFIG_IIO_SIMPLE_DUMMY_EVENTS is not set
+# CONFIG_IIO_SIMPLE_DUMMY_BUFFER is not set
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+CONFIG_AD9523=m
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+CONFIG_ADF4350=m
+CONFIG_ADF4371=m
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+CONFIG_ADIS16080=m
+CONFIG_ADIS16130=m
+CONFIG_ADIS16136=m
+CONFIG_ADIS16260=m
+CONFIG_ADXRS450=m
+CONFIG_BMG160=m
+CONFIG_BMG160_I2C=m
+CONFIG_BMG160_SPI=m
+CONFIG_FXAS21002C=m
+CONFIG_FXAS21002C_I2C=m
+CONFIG_FXAS21002C_SPI=m
+CONFIG_HID_SENSOR_GYRO_3D=m
+CONFIG_MPU3050=m
+CONFIG_MPU3050_I2C=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_ITG3200=m
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+CONFIG_AFE4403=m
+CONFIG_AFE4404=m
+CONFIG_MAX30100=m
+CONFIG_MAX30102=m
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+CONFIG_AM2315=m
+CONFIG_DHT11=m
+CONFIG_HDC100X=m
+CONFIG_HID_SENSOR_HUMIDITY=m
+CONFIG_HTS221=m
+CONFIG_HTS221_I2C=m
+CONFIG_HTS221_SPI=m
+CONFIG_HTU21=m
+CONFIG_SI7005=m
+CONFIG_SI7020=m
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+CONFIG_ADIS16400=m
+CONFIG_ADIS16460=m
+CONFIG_ADIS16480=m
+CONFIG_BMI160=m
+CONFIG_BMI160_I2C=m
+CONFIG_BMI160_SPI=m
+CONFIG_KMX61=m
+CONFIG_INV_MPU6050_IIO=m
+CONFIG_INV_MPU6050_I2C=m
+CONFIG_INV_MPU6050_SPI=m
+CONFIG_IIO_ST_LSM6DSX=m
+CONFIG_IIO_ST_LSM6DSX_I2C=m
+CONFIG_IIO_ST_LSM6DSX_SPI=m
+CONFIG_IIO_ST_LSM6DSX_I3C=m
+# end of Inertial measurement units
+
+CONFIG_IIO_ADIS_LIB=m
+CONFIG_IIO_ADIS_LIB_BUFFER=y
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+CONFIG_ADJD_S311=m
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+CONFIG_APDS9960=m
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+CONFIG_CM32181=m
+CONFIG_CM3232=m
+CONFIG_CM3323=m
+CONFIG_CM36651=m
+CONFIG_IIO_CROS_EC_LIGHT_PROX=m
+CONFIG_GP2AP020A00F=m
+CONFIG_SENSORS_ISL29018=m
+CONFIG_SENSORS_ISL29028=m
+CONFIG_ISL29125=m
+CONFIG_HID_SENSOR_ALS=m
+CONFIG_HID_SENSOR_PROX=m
+CONFIG_JSA1212=m
+CONFIG_RPR0521=m
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+CONFIG_MAX44000=m
+CONFIG_MAX44009=m
+CONFIG_NOA1305=m
+CONFIG_OPT3001=m
+CONFIG_PA12203001=m
+CONFIG_SI1133=m
+CONFIG_SI1145=m
+CONFIG_STK3310=m
+CONFIG_ST_UVIS25=m
+CONFIG_ST_UVIS25_I2C=m
+CONFIG_ST_UVIS25_SPI=m
+CONFIG_TCS3414=m
+CONFIG_TCS3472=m
+CONFIG_SENSORS_TSL2563=m
+CONFIG_TSL2583=m
+CONFIG_TSL2772=m
+CONFIG_TSL4531=m
+CONFIG_US5182D=m
+CONFIG_VCNL4000=m
+CONFIG_VCNL4035=m
+CONFIG_VEML6070=m
+CONFIG_VL6180=m
+CONFIG_ZOPT2201=m
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+CONFIG_AK8975=m
+CONFIG_AK09911=m
+CONFIG_BMC150_MAGN=m
+CONFIG_BMC150_MAGN_I2C=m
+CONFIG_BMC150_MAGN_SPI=m
+CONFIG_MAG3110=m
+CONFIG_HID_SENSOR_MAGNETOMETER_3D=m
+CONFIG_MMC35240=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_SENSORS_HMC5843=m
+CONFIG_SENSORS_HMC5843_I2C=m
+CONFIG_SENSORS_HMC5843_SPI=m
+CONFIG_SENSORS_RM3100=m
+CONFIG_SENSORS_RM3100_I2C=m
+CONFIG_SENSORS_RM3100_SPI=m
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+CONFIG_HID_SENSOR_INCLINOMETER_3D=m
+CONFIG_HID_SENSOR_DEVICE_ROTATION=m
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+CONFIG_IIO_HRTIMER_TRIGGER=m
+CONFIG_IIO_INTERRUPT_TRIGGER=m
+CONFIG_IIO_TIGHTLOOP_TRIGGER=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+CONFIG_AD5272=m
+CONFIG_DS1803=m
+CONFIG_MAX5432=m
+CONFIG_MAX5481=m
+CONFIG_MAX5487=m
+CONFIG_MCP4018=m
+CONFIG_MCP4131=m
+CONFIG_MCP4531=m
+CONFIG_MCP41010=m
+CONFIG_TPL0102=m
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+CONFIG_LMP91000=m
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+CONFIG_ABP060MG=m
+CONFIG_BMP280=m
+CONFIG_BMP280_I2C=m
+CONFIG_BMP280_SPI=m
+CONFIG_IIO_CROS_EC_BARO=m
+CONFIG_DPS310=m
+CONFIG_HID_SENSOR_PRESS=m
+CONFIG_HP03=m
+CONFIG_MPL115=m
+CONFIG_MPL115_I2C=m
+CONFIG_MPL115_SPI=m
+CONFIG_MPL3115=m
+CONFIG_MS5611=m
+CONFIG_MS5611_I2C=m
+CONFIG_MS5611_SPI=m
+CONFIG_MS5637=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_T5403=m
+CONFIG_HP206C=m
+CONFIG_ZPA2326=m
+CONFIG_ZPA2326_I2C=m
+CONFIG_ZPA2326_SPI=m
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+CONFIG_AS3935=m
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+CONFIG_ISL29501=m
+CONFIG_LIDAR_LITE_V2=m
+CONFIG_MB1232=m
+CONFIG_RFD77402=m
+CONFIG_SRF04=m
+CONFIG_SX9500=m
+CONFIG_SRF08=m
+CONFIG_VL53L0X_I2C=m
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+CONFIG_AD2S90=m
+CONFIG_AD2S1200=m
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+CONFIG_MAXIM_THERMOCOUPLE=m
+CONFIG_HID_SENSOR_TEMP=m
+CONFIG_MLX90614=m
+CONFIG_MLX90632=m
+CONFIG_TMP006=m
+CONFIG_TMP007=m
+CONFIG_TSYS01=m
+CONFIG_TSYS02D=m
+CONFIG_MAX31856=m
+# end of Temperature sensors
+
+CONFIG_NTB=m
+CONFIG_NTB_MSI=y
+# CONFIG_NTB_AMD is not set
+CONFIG_NTB_IDT=m
+CONFIG_NTB_INTEL=m
+CONFIG_NTB_SWITCHTEC=m
+CONFIG_NTB_PINGPONG=m
+CONFIG_NTB_TOOL=m
+CONFIG_NTB_PERF=m
+# CONFIG_NTB_MSI_TEST is not set
+CONFIG_NTB_TRANSPORT=m
+CONFIG_VME_BUS=y
+
+#
+# VME Bridge Drivers
+#
+CONFIG_VME_CA91CX42=m
+CONFIG_VME_TSI148=m
+CONFIG_VME_FAKE=m
+
+#
+# VME Board Drivers
+#
+CONFIG_VMIVME_7805=m
+
+#
+# VME Device Drivers
+#
+CONFIG_VME_USER=m
+CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+CONFIG_PWM_CRC=y
+CONFIG_PWM_CROS_EC=m
+CONFIG_PWM_LP3943=m
+CONFIG_PWM_LPSS=y
+CONFIG_PWM_LPSS_PCI=y
+CONFIG_PWM_LPSS_PLATFORM=y
+CONFIG_PWM_PCA9685=m
+CONFIG_PWM_TWL=m
+CONFIG_PWM_TWL_LED=m
+
+#
+# IRQ chip support
+#
+CONFIG_MADERA_IRQ=m
+# end of IRQ chip support
+
+CONFIG_IPACK_BUS=m
+CONFIG_BOARD_TPCI200=m
+CONFIG_SERIAL_IPOCTAL=m
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_TI_SYSCON=m
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+CONFIG_PHY_CPCAP_USB=m
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_SAMSUNG_USB2=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+CONFIG_POWERCAP=y
+CONFIG_INTEL_RAPL_CORE=m
+CONFIG_INTEL_RAPL=m
+CONFIG_IDLE_INJECT=y
+CONFIG_MCB=m
+CONFIG_MCB_PCI=m
+CONFIG_MCB_LPC=m
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+CONFIG_RAS_CEC=y
+# CONFIG_RAS_CEC_DEBUG is not set
+CONFIG_THUNDERBOLT=m
+
+#
+# Android
+#
+CONFIG_ANDROID=y
+# CONFIG_ANDROID_BINDER_IPC is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+CONFIG_RAVE_SP_EEPROM=m
+
+#
+# HW tracing support
+#
+CONFIG_STM=m
+CONFIG_STM_PROTO_BASIC=m
+CONFIG_STM_PROTO_SYS_T=m
+CONFIG_STM_DUMMY=m
+CONFIG_STM_SOURCE_CONSOLE=m
+CONFIG_STM_SOURCE_HEARTBEAT=m
+CONFIG_STM_SOURCE_FTRACE=m
+CONFIG_INTEL_TH=m
+CONFIG_INTEL_TH_PCI=m
+CONFIG_INTEL_TH_ACPI=m
+CONFIG_INTEL_TH_GTH=m
+CONFIG_INTEL_TH_STH=m
+CONFIG_INTEL_TH_MSU=m
+CONFIG_INTEL_TH_PTI=m
+# CONFIG_INTEL_TH_DEBUG is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+CONFIG_ALTERA_FREEZE_BRIDGE=m
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_PM_OPP=y
+CONFIG_UNISYS_VISORBUS=m
+CONFIG_SIOX=m
+CONFIG_SIOX_BUS_GPIO=m
+CONFIG_SLIMBUS=m
+CONFIG_SLIM_QCOM_CTRL=m
+CONFIG_INTERCONNECT=m
+CONFIG_COUNTER=m
+CONFIG_104_QUAD_8=m
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=y
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=y
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=y
+CONFIG_REISERFS_FS=m
+# CONFIG_REISERFS_CHECK is not set
+# CONFIG_REISERFS_PROC_INFO is not set
+CONFIG_REISERFS_FS_XATTR=y
+CONFIG_REISERFS_FS_POSIX_ACL=y
+CONFIG_REISERFS_FS_SECURITY=y
+CONFIG_JFS_FS=m
+CONFIG_JFS_POSIX_ACL=y
+CONFIG_JFS_SECURITY=y
+# CONFIG_JFS_DEBUG is not set
+CONFIG_JFS_STATISTICS=y
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+CONFIG_OCFS2_FS=m
+CONFIG_OCFS2_FS_O2CB=m
+CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m
+CONFIG_OCFS2_FS_STATS=y
+CONFIG_OCFS2_DEBUG_MASKLOG=y
+# CONFIG_OCFS2_DEBUG_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+CONFIG_NILFS2_FS=m
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+CONFIG_F2FS_FS_SECURITY=y
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+CONFIG_EXPORTFS_BLOCK_OPS=y
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+CONFIG_FS_ENCRYPTION=y
+CONFIG_FS_VERITY=y
+# CONFIG_FS_VERITY_DEBUG is not set
+CONFIG_FS_VERITY_BUILTIN_SIGNATURES=y
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+# CONFIG_PRINT_QUOTA_WARNING is not set
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=m
+CONFIG_QFMT_V1=m
+CONFIG_QFMT_V2=m
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=m
+CONFIG_AUTOFS_FS=m
+CONFIG_FUSE_FS=y
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+CONFIG_OVERLAY_FS_XINO_AUTO=y
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=y
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=y
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+CONFIG_NTFS_FS=m
+# CONFIG_NTFS_DEBUG is not set
+# CONFIG_NTFS_RW is not set
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+CONFIG_PROC_VMCORE_DEVICE_DUMP=y
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+CONFIG_ADFS_FS=m
+# CONFIG_ADFS_FS_RW is not set
+CONFIG_AFFS_FS=m
+CONFIG_ECRYPT_FS=y
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+CONFIG_BEFS_FS=m
+# CONFIG_BEFS_DEBUG is not set
+CONFIG_BFS_FS=m
+CONFIG_EFS_FS=m
+CONFIG_JFFS2_FS=m
+CONFIG_JFFS2_FS_DEBUG=0
+CONFIG_JFFS2_FS_WRITEBUFFER=y
+# CONFIG_JFFS2_FS_WBUF_VERIFY is not set
+# CONFIG_JFFS2_SUMMARY is not set
+CONFIG_JFFS2_FS_XATTR=y
+CONFIG_JFFS2_FS_POSIX_ACL=y
+CONFIG_JFFS2_FS_SECURITY=y
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+CONFIG_JFFS2_ZLIB=y
+CONFIG_JFFS2_LZO=y
+CONFIG_JFFS2_RTIME=y
+# CONFIG_JFFS2_RUBIN is not set
+# CONFIG_JFFS2_CMODE_NONE is not set
+# CONFIG_JFFS2_CMODE_PRIORITY is not set
+# CONFIG_JFFS2_CMODE_SIZE is not set
+CONFIG_JFFS2_CMODE_FAVOURLZO=y
+CONFIG_UBIFS_FS=m
+# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set
+CONFIG_UBIFS_FS_LZO=y
+CONFIG_UBIFS_FS_ZLIB=y
+CONFIG_UBIFS_FS_ZSTD=y
+# CONFIG_UBIFS_ATIME_SUPPORT is not set
+CONFIG_UBIFS_FS_XATTR=y
+CONFIG_UBIFS_FS_SECURITY=y
+CONFIG_UBIFS_FS_AUTHENTICATION=y
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+CONFIG_CRAMFS_MTD=y
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_FILE_CACHE is not set
+CONFIG_SQUASHFS_FILE_DIRECT=y
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+CONFIG_MINIX_FS=m
+CONFIG_OMFS_FS=m
+CONFIG_HPFS_FS=m
+CONFIG_QNX4FS_FS=m
+CONFIG_QNX6FS_FS=m
+# CONFIG_QNX6FS_DEBUG is not set
+CONFIG_ROMFS_FS=m
+CONFIG_ROMFS_BACKED_BY_BLOCK=y
+# CONFIG_ROMFS_BACKED_BY_MTD is not set
+# CONFIG_ROMFS_BACKED_BY_BOTH is not set
+CONFIG_ROMFS_ON_BLOCK=y
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=y
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+CONFIG_SYSV_FS=m
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+CONFIG_EROFS_FS=m
+# CONFIG_EROFS_FS_DEBUG is not set
+CONFIG_EROFS_FS_XATTR=y
+CONFIG_EROFS_FS_POSIX_ACL=y
+CONFIG_EROFS_FS_SECURITY=y
+# CONFIG_EROFS_FS_ZIP is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+CONFIG_NFS_V2=m
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+CONFIG_NFS_SWAP=y
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+CONFIG_NFS_V4_1_MIGRATION=y
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+CONFIG_NFSD_PNFS=y
+CONFIG_NFSD_BLOCKLAYOUT=y
+CONFIG_NFSD_SCSILAYOUT=y
+CONFIG_NFSD_FLEXFILELAYOUT=y
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_SUNRPC_SWAP=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+CONFIG_CEPH_FS_SECURITY_LABEL=y
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+CONFIG_CIFS_FSCACHE=y
+CONFIG_CODA_FS=m
+CONFIG_AFS_FS=m
+# CONFIG_AFS_DEBUG is not set
+CONFIG_AFS_FSCACHE=y
+# CONFIG_AFS_DEBUG_CURSOR is not set
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+CONFIG_9P_FS_SECURITY=y
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=m
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+# CONFIG_DLM_DEBUG is not set
+CONFIG_UNICODE=y
+# CONFIG_UNICODE_NORMALIZATION_SELFTEST is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
+CONFIG_TRUSTED_KEYS=y
+CONFIG_ENCRYPTED_KEYS=y
+CONFIG_KEY_DH_OPERATIONS=y
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+CONFIG_SECURITY_INFINIBAND=y
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=0
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+CONFIG_FORTIFY_SOURCE=y
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+# CONFIG_SECURITY_SELINUX_DISABLE is not set
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+CONFIG_SECURITY_SMACK=y
+# CONFIG_SECURITY_SMACK_BRINGUP is not set
+CONFIG_SECURITY_SMACK_NETFILTER=y
+CONFIG_SECURITY_SMACK_APPEND_SIGNALS=y
+CONFIG_SECURITY_TOMOYO=y
+CONFIG_SECURITY_TOMOYO_MAX_ACCEPT_ENTRY=2048
+CONFIG_SECURITY_TOMOYO_MAX_AUDIT_LOG=1024
+# CONFIG_SECURITY_TOMOYO_OMIT_USERSPACE_LOADER is not set
+CONFIG_SECURITY_TOMOYO_POLICY_LOADER="/sbin/tomoyo-init"
+CONFIG_SECURITY_TOMOYO_ACTIVATION_TRIGGER="/sbin/init"
+# CONFIG_SECURITY_TOMOYO_INSECURE_BUILTIN_SETTING is not set
+CONFIG_SECURITY_APPARMOR=y
+CONFIG_SECURITY_APPARMOR_HASH=y
+CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y
+# CONFIG_SECURITY_APPARMOR_DEBUG is not set
+# CONFIG_SECURITY_LOADPIN is not set
+CONFIG_SECURITY_YAMA=y
+CONFIG_SECURITY_SAFESETID=y
+CONFIG_SECURITY_LOCKDOWN_LSM=y
+CONFIG_SECURITY_LOCKDOWN_LSM_EARLY=y
+CONFIG_LOCK_DOWN_KERNEL_FORCE_NONE=y
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_INTEGRITY is not set
+# CONFIG_LOCK_DOWN_KERNEL_FORCE_CONFIDENTIALITY is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_PLATFORM_KEYRING=y
+CONFIG_LOAD_UEFI_KEYS=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+# CONFIG_IMA_TEMPLATE is not set
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
+# CONFIG_IMA_DEFAULT_HASH_SHA512 is not set
+CONFIG_IMA_DEFAULT_HASH="sha1"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+CONFIG_IMA_APPRAISE_MODSIG=y
+CONFIG_IMA_TRUSTED_KEYRING=y
+# CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY is not set
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_EVM=y
+CONFIG_EVM_ATTR_FSUUID=y
+CONFIG_EVM_EXTRA_SMACK_XATTRS=y
+CONFIG_EVM_ADD_XATTRS=y
+# CONFIG_EVM_LOAD_X509 is not set
+# CONFIG_DEFAULT_SECURITY_SELINUX is not set
+# CONFIG_DEFAULT_SECURITY_SMACK is not set
+# CONFIG_DEFAULT_SECURITY_TOMOYO is not set
+CONFIG_DEFAULT_SECURITY_APPARMOR=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="lockdown,yama,integrity,apparmor"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+CONFIG_INIT_ON_ALLOC_DEFAULT_ON=y
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=y
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+CONFIG_CRYPTO_MANAGER_DISABLE_TESTS=y
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=y
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=y
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=y
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=y
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=y
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=y
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=m
+CONFIG_CRYPTO_USER_API_HASH=m
+CONFIG_CRYPTO_USER_API_SKCIPHER=m
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+CONFIG_CRYPTO_STATS=y
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=y
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+# CONFIG_CRYPTO_DEV_QAT_C3XXX is not set
+# CONFIG_CRYPTO_DEV_QAT_C62X is not set
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+# CONFIG_CRYPTO_DEV_QAT_C3XXXVF is not set
+# CONFIG_CRYPTO_DEV_QAT_C62XVF is not set
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+CONFIG_CHELSIO_IPSEC_INLINE=y
+CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+CONFIG_PKCS7_TEST_KEY=m
+CONFIG_SIGNED_PE_FILE_VERIFICATION=y
+
+#
+# Certificates for signature checking
+#
+CONFIG_MODULE_SIG_KEY="certs/signing_key.pem"
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+CONFIG_SYSTEM_EXTRA_CERTIFICATE=y
+CONFIG_SYSTEM_EXTRA_CERTIFICATE_SIZE=4096
+CONFIG_SECONDARY_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_KEYRING=y
+CONFIG_SYSTEM_BLACKLIST_HASH_LIST=""
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+CONFIG_RAID6_PQ_BENCHMARK=y
+CONFIG_PACKING=y
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=y
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+CONFIG_XZ_DEC_TEST=m
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_REED_SOLOMON_DEC16=y
+CONFIG_BCH=m
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_ARCH_HAS_FORCE_DMA_UNENCRYPTED=y
+CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_CMA is not set
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPUMASK_OFFSTACK=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_FONT_SUPPORT=y
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+# CONFIG_FONT_6x11 is not set
+# CONFIG_FONT_7x14 is not set
+# CONFIG_FONT_PEARL_8x8 is not set
+CONFIG_FONT_ACORN_8x8=y
+# CONFIG_FONT_MINI_4x6 is not set
+CONFIG_FONT_6x10=y
+# CONFIG_FONT_10x18 is not set
+# CONFIG_FONT_SUN8x16 is not set
+# CONFIG_FONT_SUN12x22 is not set
+CONFIG_FONT_TER16x32=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+CONFIG_PARMAN=m
+CONFIG_OBJAGG=m
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+CONFIG_DEBUG_INFO_DWARF4=y
+# CONFIG_DEBUG_INFO_BTF is not set
+CONFIG_GDB_SCRIPTS=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_FRAME_WARN=1024
+# CONFIG_STRIP_ASM_SYMS is not set
+# CONFIG_READABLE_ASM is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+# CONFIG_DEBUG_SECTION_MISMATCH is not set
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x01b6
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
+CONFIG_PAGE_POISONING=y
+CONFIG_PAGE_POISONING_NO_SANITY=y
+CONFIG_PAGE_POISONING_ZERO=y
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+# CONFIG_DEBUG_MEMORY_INIT is not set
+CONFIG_MEMORY_NOTIFIER_ERROR_INJECT=m
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_CC_HAS_KASAN_GENERIC=y
+# CONFIG_KASAN is not set
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_CC_HAS_SANCOV_TRACE_PC=y
+# CONFIG_KCOV is not set
+# CONFIG_DEBUG_SHIRQ is not set
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_HARDLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=0
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+# CONFIG_PANIC_ON_OOPS is not set
+CONFIG_PANIC_ON_OOPS_VALUE=0
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+CONFIG_SCHED_STACK_END_CHECK=y
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+# CONFIG_DEBUG_LIST is not set
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+CONFIG_TORTURE_TEST=m
+CONFIG_RCU_PERF_TEST=m
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+CONFIG_NOTIFIER_ERROR_INJECTION=m
+CONFIG_PM_NOTIFIER_ERROR_INJECT=m
+# CONFIG_NETDEV_NOTIFIER_ERROR_INJECT is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+CONFIG_HWLAT_TRACER=y
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+CONFIG_BPF_KPROBE_OVERRIDE=y
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+CONFIG_MMIOTRACE=y
+CONFIG_TRACING_MAP=y
+CONFIG_HIST_TRIGGERS=y
+# CONFIG_MMIOTRACE_TEST is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+# CONFIG_RING_BUFFER_BENCHMARK is not set
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+# CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set
+CONFIG_RUNTIME_TESTING_MENU=y
+# CONFIG_LKDTM is not set
+# CONFIG_TEST_LIST_SORT is not set
+# CONFIG_TEST_SORT is not set
+# CONFIG_KPROBES_SANITY_TEST is not set
+# CONFIG_BACKTRACE_SELF_TEST is not set
+# CONFIG_RBTREE_TEST is not set
+# CONFIG_REED_SOLOMON_TEST is not set
+# CONFIG_INTERVAL_TREE_TEST is not set
+# CONFIG_PERCPU_TEST is not set
+# CONFIG_ATOMIC64_SELFTEST is not set
+# CONFIG_ASYNC_RAID6_TEST is not set
+# CONFIG_TEST_HEXDUMP is not set
+# CONFIG_TEST_STRING_HELPERS is not set
+# CONFIG_TEST_STRSCPY is not set
+# CONFIG_TEST_KSTRTOX is not set
+# CONFIG_TEST_PRINTF is not set
+# CONFIG_TEST_BITMAP is not set
+# CONFIG_TEST_BITFIELD is not set
+# CONFIG_TEST_UUID is not set
+# CONFIG_TEST_XARRAY is not set
+# CONFIG_TEST_OVERFLOW is not set
+# CONFIG_TEST_RHASHTABLE is not set
+# CONFIG_TEST_HASH is not set
+# CONFIG_TEST_IDA is not set
+# CONFIG_TEST_PARMAN is not set
+# CONFIG_TEST_LKM is not set
+# CONFIG_TEST_VMALLOC is not set
+# CONFIG_TEST_USER_COPY is not set
+CONFIG_TEST_BPF=m
+CONFIG_TEST_BLACKHOLE_DEV=m
+# CONFIG_FIND_BIT_BENCHMARK is not set
+# CONFIG_TEST_FIRMWARE is not set
+# CONFIG_TEST_SYSCTL is not set
+# CONFIG_TEST_UDELAY is not set
+# CONFIG_TEST_STATIC_KEYS is not set
+# CONFIG_TEST_KMOD is not set
+# CONFIG_TEST_MEMCAT_P is not set
+# CONFIG_TEST_LIVEPATCH is not set
+# CONFIG_TEST_OBJAGG is not set
+# CONFIG_TEST_STACKINIT is not set
+# CONFIG_TEST_MEMINIT is not set
+CONFIG_MEMTEST=y
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+CONFIG_SAMPLES=y
+# CONFIG_SAMPLE_TRACE_EVENTS is not set
+CONFIG_SAMPLE_TRACE_PRINTK=m
+# CONFIG_SAMPLE_KOBJECT is not set
+# CONFIG_SAMPLE_KPROBES is not set
+# CONFIG_SAMPLE_HW_BREAKPOINT is not set
+# CONFIG_SAMPLE_KFIFO is not set
+# CONFIG_SAMPLE_KDB is not set
+# CONFIG_SAMPLE_RPMSG_CLIENT is not set
+# CONFIG_SAMPLE_LIVEPATCH is not set
+# CONFIG_SAMPLE_CONFIGFS is not set
+# CONFIG_SAMPLE_VFIO_MDEV_MTTY is not set
+# CONFIG_SAMPLE_VFIO_MDEV_MDPY is not set
+# CONFIG_SAMPLE_VFIO_MDEV_MDPY_FB is not set
+# CONFIG_SAMPLE_VFIO_MDEV_MBOCHS is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+# CONFIG_KGDB_TESTS is not set
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_IO_STRICT_DEVMEM is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_EARLY_PRINTK_USB=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+CONFIG_EARLY_PRINTK_USB_XDBC=y
+CONFIG_X86_PTDUMP_CORE=y
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+CONFIG_DEBUG_WX=y
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+# CONFIG_X86_DECODER_SELFTEST is not set
+# CONFIG_IO_DELAY_0X80 is not set
+CONFIG_IO_DELAY_0XED=y
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+# CONFIG_DEBUG_BOOT_PARAMS is not set
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+CONFIG_X86_DEBUG_FPU=y
+CONFIG_PUNIT_ATOM_DEBUG=m
+# CONFIG_UNWINDER_ORC is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/lt-qcom-linux/aic100/config-5.4.1-1.el7.elrepo.x86_64 b/lt-qcom-linux/aic100/config-5.4.1-1.el7.elrepo.x86_64
new file mode 100644
index 0000000000..7dedb40d61
--- /dev/null
+++ b/lt-qcom-linux/aic100/config-5.4.1-1.el7.elrepo.x86_64
@@ -0,0 +1,8912 @@
+#
+# Automatically generated file; DO NOT EDIT.
+# Linux/x86_64 5.4.1-1.el7.elrepo.x86_64 Kernel Configuration
+#
+
+#
+# Compiler: gcc (GCC) 4.8.5 20150623 (Red Hat 4.8.5-39)
+#
+CONFIG_CC_IS_GCC=y
+CONFIG_GCC_VERSION=40805
+CONFIG_CLANG_VERSION=0
+CONFIG_CC_CAN_LINK=y
+CONFIG_CC_HAS_ASM_GOTO=y
+CONFIG_CC_HAS_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_CC_DISABLE_WARN_MAYBE_UNINITIALIZED=y
+CONFIG_IRQ_WORK=y
+CONFIG_BUILDTIME_EXTABLE_SORT=y
+CONFIG_THREAD_INFO_IN_TASK=y
+
+#
+# General setup
+#
+CONFIG_INIT_ENV_ARG_LIMIT=32
+# CONFIG_COMPILE_TEST is not set
+# CONFIG_HEADER_TEST is not set
+CONFIG_LOCALVERSION=""
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_BUILD_SALT=""
+CONFIG_HAVE_KERNEL_GZIP=y
+CONFIG_HAVE_KERNEL_BZIP2=y
+CONFIG_HAVE_KERNEL_LZMA=y
+CONFIG_HAVE_KERNEL_XZ=y
+CONFIG_HAVE_KERNEL_LZO=y
+CONFIG_HAVE_KERNEL_LZ4=y
+CONFIG_KERNEL_GZIP=y
+# CONFIG_KERNEL_BZIP2 is not set
+# CONFIG_KERNEL_LZMA is not set
+# CONFIG_KERNEL_XZ is not set
+# CONFIG_KERNEL_LZO is not set
+# CONFIG_KERNEL_LZ4 is not set
+CONFIG_DEFAULT_HOSTNAME="(none)"
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+CONFIG_SYSVIPC_SYSCTL=y
+CONFIG_POSIX_MQUEUE=y
+CONFIG_POSIX_MQUEUE_SYSCTL=y
+CONFIG_CROSS_MEMORY_ATTACH=y
+CONFIG_USELIB=y
+CONFIG_AUDIT=y
+CONFIG_HAVE_ARCH_AUDITSYSCALL=y
+CONFIG_AUDITSYSCALL=y
+
+#
+# IRQ subsystem
+#
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_GENERIC_IRQ_SHOW=y
+CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
+CONFIG_GENERIC_PENDING_IRQ=y
+CONFIG_GENERIC_IRQ_MIGRATION=y
+CONFIG_GENERIC_IRQ_CHIP=y
+CONFIG_IRQ_DOMAIN=y
+CONFIG_IRQ_DOMAIN_HIERARCHY=y
+CONFIG_GENERIC_MSI_IRQ=y
+CONFIG_GENERIC_MSI_IRQ_DOMAIN=y
+CONFIG_GENERIC_IRQ_MATRIX_ALLOCATOR=y
+CONFIG_GENERIC_IRQ_RESERVATION_MODE=y
+CONFIG_IRQ_FORCED_THREADING=y
+CONFIG_SPARSE_IRQ=y
+# CONFIG_GENERIC_IRQ_DEBUGFS is not set
+# end of IRQ subsystem
+
+CONFIG_CLOCKSOURCE_WATCHDOG=y
+CONFIG_ARCH_CLOCKSOURCE_DATA=y
+CONFIG_ARCH_CLOCKSOURCE_INIT=y
+CONFIG_CLOCKSOURCE_VALIDATE_LAST_CYCLE=y
+CONFIG_GENERIC_TIME_VSYSCALL=y
+CONFIG_GENERIC_CLOCKEVENTS=y
+CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
+CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y
+CONFIG_GENERIC_CMOS_UPDATE=y
+
+#
+# Timers subsystem
+#
+CONFIG_TICK_ONESHOT=y
+CONFIG_NO_HZ_COMMON=y
+# CONFIG_HZ_PERIODIC is not set
+# CONFIG_NO_HZ_IDLE is not set
+CONFIG_NO_HZ_FULL=y
+CONFIG_CONTEXT_TRACKING=y
+# CONFIG_CONTEXT_TRACKING_FORCE is not set
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
+# end of Timers subsystem
+
+# CONFIG_PREEMPT_NONE is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+# CONFIG_PREEMPT is not set
+
+#
+# CPU/Task time and stats accounting
+#
+CONFIG_VIRT_CPU_ACCOUNTING=y
+CONFIG_VIRT_CPU_ACCOUNTING_GEN=y
+# CONFIG_IRQ_TIME_ACCOUNTING is not set
+CONFIG_HAVE_SCHED_AVG_IRQ=y
+CONFIG_BSD_PROCESS_ACCT=y
+CONFIG_BSD_PROCESS_ACCT_V3=y
+CONFIG_TASKSTATS=y
+CONFIG_TASK_DELAY_ACCT=y
+CONFIG_TASK_XACCT=y
+CONFIG_TASK_IO_ACCOUNTING=y
+CONFIG_PSI=y
+CONFIG_PSI_DEFAULT_DISABLED=y
+# end of CPU/Task time and stats accounting
+
+CONFIG_CPU_ISOLATION=y
+
+#
+# RCU Subsystem
+#
+CONFIG_TREE_RCU=y
+# CONFIG_RCU_EXPERT is not set
+CONFIG_SRCU=y
+CONFIG_TREE_SRCU=y
+CONFIG_RCU_STALL_COMMON=y
+CONFIG_RCU_NEED_SEGCBLIST=y
+CONFIG_RCU_NOCB_CPU=y
+# end of RCU Subsystem
+
+# CONFIG_IKCONFIG is not set
+# CONFIG_IKHEADERS is not set
+CONFIG_LOG_BUF_SHIFT=19
+CONFIG_LOG_CPU_MAX_BUF_SHIFT=12
+CONFIG_PRINTK_SAFE_LOG_BUF_SHIFT=13
+CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y
+
+#
+# Scheduler features
+#
+# CONFIG_UCLAMP_TASK is not set
+# end of Scheduler features
+
+CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y
+CONFIG_ARCH_WANT_BATCHED_UNMAP_TLB_FLUSH=y
+CONFIG_ARCH_SUPPORTS_INT128=y
+CONFIG_NUMA_BALANCING=y
+CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y
+CONFIG_CGROUPS=y
+CONFIG_PAGE_COUNTER=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_SWAP_ENABLED=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_WRITEBACK=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_CFS_BANDWIDTH=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CGROUP_PIDS=y
+CONFIG_CGROUP_RDMA=y
+CONFIG_CGROUP_FREEZER=y
+CONFIG_CGROUP_HUGETLB=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CGROUP_CPUACCT=y
+CONFIG_CGROUP_PERF=y
+CONFIG_CGROUP_BPF=y
+# CONFIG_CGROUP_DEBUG is not set
+CONFIG_SOCK_CGROUP_DATA=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_SCHED_AUTOGROUP=y
+# CONFIG_SYSFS_DEPRECATED is not set
+CONFIG_RELAY=y
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_RD_GZIP=y
+CONFIG_RD_BZIP2=y
+CONFIG_RD_LZMA=y
+CONFIG_RD_XZ=y
+CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
+CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
+CONFIG_SYSCTL_EXCEPTION_TRACE=y
+CONFIG_HAVE_PCSPKR_PLATFORM=y
+CONFIG_BPF=y
+CONFIG_EXPERT=y
+CONFIG_UID16=y
+CONFIG_MULTIUSER=y
+CONFIG_SGETMASK_SYSCALL=y
+CONFIG_SYSFS_SYSCALL=y
+# CONFIG_SYSCTL_SYSCALL is not set
+CONFIG_FHANDLE=y
+CONFIG_POSIX_TIMERS=y
+CONFIG_PRINTK=y
+CONFIG_PRINTK_NMI=y
+CONFIG_BUG=y
+CONFIG_ELF_CORE=y
+CONFIG_PCSPKR_PLATFORM=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_FUTEX_PI=y
+CONFIG_EPOLL=y
+CONFIG_SIGNALFD=y
+CONFIG_TIMERFD=y
+CONFIG_EVENTFD=y
+CONFIG_SHMEM=y
+CONFIG_AIO=y
+CONFIG_IO_URING=y
+CONFIG_ADVISE_SYSCALLS=y
+CONFIG_MEMBARRIER=y
+CONFIG_KALLSYMS=y
+CONFIG_KALLSYMS_ALL=y
+CONFIG_KALLSYMS_ABSOLUTE_PERCPU=y
+CONFIG_KALLSYMS_BASE_RELATIVE=y
+CONFIG_BPF_SYSCALL=y
+# CONFIG_BPF_JIT_ALWAYS_ON is not set
+CONFIG_USERFAULTFD=y
+CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y
+CONFIG_RSEQ=y
+# CONFIG_DEBUG_RSEQ is not set
+# CONFIG_EMBEDDED is not set
+CONFIG_HAVE_PERF_EVENTS=y
+# CONFIG_PC104 is not set
+
+#
+# Kernel Performance Events And Counters
+#
+CONFIG_PERF_EVENTS=y
+# CONFIG_DEBUG_PERF_USE_VMALLOC is not set
+# end of Kernel Performance Events And Counters
+
+CONFIG_VM_EVENT_COUNTERS=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_MEMCG_SYSFS_ON is not set
+# CONFIG_COMPAT_BRK is not set
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+# CONFIG_SLOB is not set
+CONFIG_SLAB_MERGE_DEFAULT=y
+# CONFIG_SLAB_FREELIST_RANDOM is not set
+# CONFIG_SLAB_FREELIST_HARDENED is not set
+# CONFIG_SHUFFLE_PAGE_ALLOCATOR is not set
+CONFIG_SLUB_CPU_PARTIAL=y
+CONFIG_SYSTEM_DATA_VERIFICATION=y
+CONFIG_PROFILING=y
+CONFIG_TRACEPOINTS=y
+# end of General setup
+
+CONFIG_64BIT=y
+CONFIG_X86_64=y
+CONFIG_X86=y
+CONFIG_INSTRUCTION_DECODER=y
+CONFIG_OUTPUT_FORMAT="elf64-x86-64"
+CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig"
+CONFIG_LOCKDEP_SUPPORT=y
+CONFIG_STACKTRACE_SUPPORT=y
+CONFIG_MMU=y
+CONFIG_ARCH_MMAP_RND_BITS_MIN=28
+CONFIG_ARCH_MMAP_RND_BITS_MAX=32
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=8
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=16
+CONFIG_GENERIC_ISA_DMA=y
+CONFIG_GENERIC_BUG=y
+CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ARCH_HAS_CPU_RELAX=y
+CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y
+CONFIG_ARCH_HAS_FILTER_PGPROT=y
+CONFIG_HAVE_SETUP_PER_CPU_AREA=y
+CONFIG_NEED_PER_CPU_EMBED_FIRST_CHUNK=y
+CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK=y
+CONFIG_ARCH_HIBERNATION_POSSIBLE=y
+CONFIG_ARCH_SUSPEND_POSSIBLE=y
+CONFIG_ARCH_WANT_GENERAL_HUGETLB=y
+CONFIG_ZONE_DMA32=y
+CONFIG_AUDIT_ARCH=y
+CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
+CONFIG_HAVE_INTEL_TXT=y
+CONFIG_X86_64_SMP=y
+CONFIG_ARCH_SUPPORTS_UPROBES=y
+CONFIG_FIX_EARLYCON_MEM=y
+CONFIG_PGTABLE_LEVELS=4
+CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
+
+#
+# Processor type and features
+#
+CONFIG_ZONE_DMA=y
+CONFIG_SMP=y
+CONFIG_X86_FEATURE_NAMES=y
+CONFIG_X86_X2APIC=y
+CONFIG_X86_MPPARSE=y
+# CONFIG_GOLDFISH is not set
+CONFIG_RETPOLINE=y
+# CONFIG_X86_CPU_RESCTRL is not set
+CONFIG_X86_EXTENDED_PLATFORM=y
+# CONFIG_X86_NUMACHIP is not set
+# CONFIG_X86_VSMP is not set
+CONFIG_X86_UV=y
+# CONFIG_X86_GOLDFISH is not set
+# CONFIG_X86_INTEL_MID is not set
+CONFIG_X86_INTEL_LPSS=y
+# CONFIG_X86_AMD_PLATFORM_DEVICE is not set
+CONFIG_IOSF_MBI=y
+# CONFIG_IOSF_MBI_DEBUG is not set
+CONFIG_X86_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_SCHED_OMIT_FRAME_POINTER=y
+CONFIG_HYPERVISOR_GUEST=y
+CONFIG_PARAVIRT=y
+CONFIG_PARAVIRT_XXL=y
+# CONFIG_PARAVIRT_DEBUG is not set
+CONFIG_PARAVIRT_SPINLOCKS=y
+CONFIG_X86_HV_CALLBACK_VECTOR=y
+CONFIG_XEN=y
+CONFIG_XEN_PV=y
+CONFIG_XEN_PV_SMP=y
+CONFIG_XEN_DOM0=y
+CONFIG_XEN_PVHVM=y
+CONFIG_XEN_PVHVM_SMP=y
+CONFIG_XEN_512GB=y
+CONFIG_XEN_SAVE_RESTORE=y
+# CONFIG_XEN_DEBUG_FS is not set
+CONFIG_XEN_PVH=y
+CONFIG_KVM_GUEST=y
+CONFIG_ARCH_CPUIDLE_HALTPOLL=y
+CONFIG_PVH=y
+# CONFIG_KVM_DEBUG_FS is not set
+CONFIG_PARAVIRT_TIME_ACCOUNTING=y
+CONFIG_PARAVIRT_CLOCK=y
+# CONFIG_JAILHOUSE_GUEST is not set
+# CONFIG_ACRN_GUEST is not set
+# CONFIG_MK8 is not set
+# CONFIG_MPSC is not set
+# CONFIG_MCORE2 is not set
+# CONFIG_MATOM is not set
+CONFIG_GENERIC_CPU=y
+CONFIG_X86_INTERNODE_CACHE_SHIFT=6
+CONFIG_X86_L1_CACHE_SHIFT=6
+CONFIG_X86_TSC=y
+CONFIG_X86_CMPXCHG64=y
+CONFIG_X86_CMOV=y
+CONFIG_X86_MINIMUM_CPU_FAMILY=64
+CONFIG_X86_DEBUGCTLMSR=y
+# CONFIG_PROCESSOR_SELECT is not set
+CONFIG_CPU_SUP_INTEL=y
+CONFIG_CPU_SUP_AMD=y
+CONFIG_CPU_SUP_HYGON=y
+CONFIG_CPU_SUP_CENTAUR=y
+CONFIG_CPU_SUP_ZHAOXIN=y
+CONFIG_HPET_TIMER=y
+CONFIG_HPET_EMULATE_RTC=y
+CONFIG_DMI=y
+CONFIG_GART_IOMMU=y
+# CONFIG_CALGARY_IOMMU is not set
+CONFIG_MAXSMP=y
+CONFIG_NR_CPUS_RANGE_BEGIN=8192
+CONFIG_NR_CPUS_RANGE_END=8192
+CONFIG_NR_CPUS_DEFAULT=8192
+CONFIG_NR_CPUS=8192
+CONFIG_SCHED_SMT=y
+CONFIG_SCHED_MC=y
+CONFIG_SCHED_MC_PRIO=y
+CONFIG_X86_LOCAL_APIC=y
+CONFIG_X86_IO_APIC=y
+CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y
+CONFIG_X86_MCE=y
+CONFIG_X86_MCELOG_LEGACY=y
+CONFIG_X86_MCE_INTEL=y
+CONFIG_X86_MCE_AMD=y
+CONFIG_X86_MCE_THRESHOLD=y
+# CONFIG_X86_MCE_INJECT is not set
+CONFIG_X86_THERMAL_VECTOR=y
+
+#
+# Performance monitoring
+#
+CONFIG_PERF_EVENTS_INTEL_UNCORE=y
+CONFIG_PERF_EVENTS_INTEL_RAPL=m
+CONFIG_PERF_EVENTS_INTEL_CSTATE=m
+CONFIG_PERF_EVENTS_AMD_POWER=m
+# end of Performance monitoring
+
+CONFIG_X86_16BIT=y
+CONFIG_X86_ESPFIX64=y
+CONFIG_X86_VSYSCALL_EMULATION=y
+CONFIG_I8K=m
+CONFIG_MICROCODE=y
+CONFIG_MICROCODE_INTEL=y
+CONFIG_MICROCODE_AMD=y
+CONFIG_MICROCODE_OLD_INTERFACE=y
+CONFIG_X86_MSR=y
+CONFIG_X86_CPUID=y
+# CONFIG_X86_5LEVEL is not set
+CONFIG_X86_DIRECT_GBPAGES=y
+# CONFIG_X86_CPA_STATISTICS is not set
+# CONFIG_AMD_MEM_ENCRYPT is not set
+CONFIG_NUMA=y
+CONFIG_AMD_NUMA=y
+CONFIG_X86_64_ACPI_NUMA=y
+CONFIG_NODES_SPAN_OTHER_NODES=y
+# CONFIG_NUMA_EMU is not set
+CONFIG_NODES_SHIFT=10
+CONFIG_ARCH_SPARSEMEM_ENABLE=y
+CONFIG_ARCH_SPARSEMEM_DEFAULT=y
+CONFIG_ARCH_SELECT_MEMORY_MODEL=y
+CONFIG_ARCH_MEMORY_PROBE=y
+CONFIG_ARCH_PROC_KCORE_TEXT=y
+CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
+CONFIG_X86_PMEM_LEGACY_DEVICE=y
+CONFIG_X86_PMEM_LEGACY=y
+CONFIG_X86_CHECK_BIOS_CORRUPTION=y
+# CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK is not set
+CONFIG_X86_RESERVE_LOW=64
+CONFIG_MTRR=y
+CONFIG_MTRR_SANITIZER=y
+CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=1
+CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
+CONFIG_X86_PAT=y
+CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
+CONFIG_X86_SMAP=y
+CONFIG_X86_INTEL_UMIP=y
+# CONFIG_X86_INTEL_MPX is not set
+CONFIG_X86_INTEL_MEMORY_PROTECTION_KEYS=y
+CONFIG_X86_INTEL_TSX_MODE_OFF=y
+# CONFIG_X86_INTEL_TSX_MODE_ON is not set
+# CONFIG_X86_INTEL_TSX_MODE_AUTO is not set
+CONFIG_EFI=y
+CONFIG_EFI_STUB=y
+CONFIG_EFI_MIXED=y
+CONFIG_SECCOMP=y
+# CONFIG_HZ_100 is not set
+# CONFIG_HZ_250 is not set
+# CONFIG_HZ_300 is not set
+CONFIG_HZ_1000=y
+CONFIG_HZ=1000
+CONFIG_SCHED_HRTICK=y
+CONFIG_KEXEC=y
+# CONFIG_KEXEC_FILE is not set
+CONFIG_CRASH_DUMP=y
+CONFIG_KEXEC_JUMP=y
+CONFIG_PHYSICAL_START=0x1000000
+CONFIG_RELOCATABLE=y
+# CONFIG_RANDOMIZE_BASE is not set
+CONFIG_PHYSICAL_ALIGN=0x1000000
+CONFIG_HOTPLUG_CPU=y
+# CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
+# CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
+CONFIG_LEGACY_VSYSCALL_EMULATE=y
+# CONFIG_LEGACY_VSYSCALL_XONLY is not set
+# CONFIG_LEGACY_VSYSCALL_NONE is not set
+# CONFIG_CMDLINE_BOOL is not set
+CONFIG_MODIFY_LDT_SYSCALL=y
+CONFIG_HAVE_LIVEPATCH=y
+# CONFIG_LIVEPATCH is not set
+# end of Processor type and features
+
+CONFIG_ARCH_HAS_ADD_PAGES=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
+CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
+CONFIG_USE_PERCPU_NUMA_NODE_ID=y
+CONFIG_ARCH_ENABLE_SPLIT_PMD_PTLOCK=y
+CONFIG_ARCH_ENABLE_HUGEPAGE_MIGRATION=y
+CONFIG_ARCH_ENABLE_THP_MIGRATION=y
+
+#
+# Power management and ACPI options
+#
+CONFIG_ARCH_HIBERNATION_HEADER=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_SUSPEND_SKIP_SYNC is not set
+CONFIG_HIBERNATE_CALLBACKS=y
+CONFIG_HIBERNATION=y
+CONFIG_PM_STD_PARTITION=""
+CONFIG_PM_SLEEP=y
+CONFIG_PM_SLEEP_SMP=y
+# CONFIG_PM_AUTOSLEEP is not set
+# CONFIG_PM_WAKELOCKS is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_CLK=y
+# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
+# CONFIG_ENERGY_MODEL is not set
+CONFIG_ARCH_SUPPORTS_ACPI=y
+CONFIG_ACPI=y
+CONFIG_ACPI_LEGACY_TABLES_LOOKUP=y
+CONFIG_ARCH_MIGHT_HAVE_ACPI_PDC=y
+CONFIG_ACPI_SYSTEM_POWER_STATES_SUPPORT=y
+# CONFIG_ACPI_DEBUGGER is not set
+CONFIG_ACPI_SPCR_TABLE=y
+CONFIG_ACPI_LPIT=y
+CONFIG_ACPI_SLEEP=y
+# CONFIG_ACPI_PROCFS_POWER is not set
+CONFIG_ACPI_REV_OVERRIDE_POSSIBLE=y
+# CONFIG_ACPI_EC_DEBUGFS is not set
+CONFIG_ACPI_AC=y
+CONFIG_ACPI_BATTERY=y
+CONFIG_ACPI_BUTTON=y
+CONFIG_ACPI_VIDEO=m
+CONFIG_ACPI_FAN=y
+# CONFIG_ACPI_TAD is not set
+CONFIG_ACPI_DOCK=y
+CONFIG_ACPI_CPU_FREQ_PSS=y
+CONFIG_ACPI_PROCESSOR_CSTATE=y
+CONFIG_ACPI_PROCESSOR_IDLE=y
+CONFIG_ACPI_CPPC_LIB=y
+CONFIG_ACPI_PROCESSOR=y
+CONFIG_ACPI_IPMI=m
+CONFIG_ACPI_HOTPLUG_CPU=y
+CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
+CONFIG_ACPI_THERMAL=y
+CONFIG_ACPI_NUMA=y
+CONFIG_ARCH_HAS_ACPI_TABLE_UPGRADE=y
+CONFIG_ACPI_TABLE_UPGRADE=y
+# CONFIG_ACPI_DEBUG is not set
+CONFIG_ACPI_PCI_SLOT=y
+CONFIG_ACPI_CONTAINER=y
+CONFIG_ACPI_HOTPLUG_MEMORY=y
+CONFIG_ACPI_HOTPLUG_IOAPIC=y
+CONFIG_ACPI_SBS=m
+CONFIG_ACPI_HED=y
+# CONFIG_ACPI_CUSTOM_METHOD is not set
+CONFIG_ACPI_BGRT=y
+# CONFIG_ACPI_REDUCED_HARDWARE_ONLY is not set
+CONFIG_ACPI_NFIT=m
+# CONFIG_NFIT_SECURITY_DEBUG is not set
+# CONFIG_ACPI_HMAT is not set
+CONFIG_HAVE_ACPI_APEI=y
+CONFIG_HAVE_ACPI_APEI_NMI=y
+CONFIG_ACPI_APEI=y
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_PCIEAER=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
+# CONFIG_ACPI_APEI_EINJ is not set
+# CONFIG_ACPI_APEI_ERST_DEBUG is not set
+CONFIG_DPTF_POWER=m
+CONFIG_ACPI_WATCHDOG=y
+# CONFIG_ACPI_EXTLOG is not set
+CONFIG_ACPI_ADXL=y
+# CONFIG_PMIC_OPREGION is not set
+# CONFIG_ACPI_CONFIGFS is not set
+CONFIG_X86_PM_TIMER=y
+CONFIG_SFI=y
+
+#
+# CPU Frequency scaling
+#
+CONFIG_CPU_FREQ=y
+CONFIG_CPU_FREQ_GOV_ATTR_SET=y
+CONFIG_CPU_FREQ_GOV_COMMON=y
+CONFIG_CPU_FREQ_STAT=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set
+CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
+# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set
+# CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL is not set
+CONFIG_CPU_FREQ_GOV_PERFORMANCE=y
+CONFIG_CPU_FREQ_GOV_POWERSAVE=y
+CONFIG_CPU_FREQ_GOV_USERSPACE=y
+CONFIG_CPU_FREQ_GOV_ONDEMAND=y
+CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
+CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
+
+#
+# CPU frequency scaling drivers
+#
+CONFIG_X86_INTEL_PSTATE=y
+CONFIG_X86_PCC_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ=m
+CONFIG_X86_ACPI_CPUFREQ_CPB=y
+CONFIG_X86_POWERNOW_K8=m
+CONFIG_X86_AMD_FREQ_SENSITIVITY=m
+# CONFIG_X86_SPEEDSTEP_CENTRINO is not set
+CONFIG_X86_P4_CLOCKMOD=m
+
+#
+# shared options
+#
+CONFIG_X86_SPEEDSTEP_LIB=m
+# end of CPU Frequency scaling
+
+#
+# CPU Idle
+#
+CONFIG_CPU_IDLE=y
+# CONFIG_CPU_IDLE_GOV_LADDER is not set
+CONFIG_CPU_IDLE_GOV_MENU=y
+# CONFIG_CPU_IDLE_GOV_TEO is not set
+# CONFIG_CPU_IDLE_GOV_HALTPOLL is not set
+CONFIG_HALTPOLL_CPUIDLE=y
+# end of CPU Idle
+
+CONFIG_INTEL_IDLE=y
+# end of Power management and ACPI options
+
+#
+# Bus options (PCI etc.)
+#
+CONFIG_PCI_DIRECT=y
+CONFIG_PCI_MMCONFIG=y
+CONFIG_PCI_XEN=y
+CONFIG_MMCONF_FAM10H=y
+# CONFIG_PCI_CNB20LE_QUIRK is not set
+# CONFIG_ISA_BUS is not set
+CONFIG_ISA_DMA_API=y
+CONFIG_AMD_NB=y
+CONFIG_X86_SYSFB=y
+# end of Bus options (PCI etc.)
+
+#
+# Binary Emulations
+#
+CONFIG_IA32_EMULATION=y
+# CONFIG_X86_X32 is not set
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
+# end of Binary Emulations
+
+CONFIG_X86_DEV_DMA_OPS=y
+
+#
+# Firmware Drivers
+#
+CONFIG_EDD=m
+# CONFIG_EDD_OFF is not set
+CONFIG_FIRMWARE_MEMMAP=y
+CONFIG_DMIID=y
+CONFIG_DMI_SYSFS=y
+CONFIG_DMI_SCAN_MACHINE_NON_EFI_FALLBACK=y
+CONFIG_ISCSI_IBFT_FIND=y
+CONFIG_ISCSI_IBFT=m
+CONFIG_FW_CFG_SYSFS=m
+# CONFIG_FW_CFG_SYSFS_CMDLINE is not set
+# CONFIG_GOOGLE_FIRMWARE is not set
+
+#
+# EFI (Extensible Firmware Interface) Support
+#
+CONFIG_EFI_VARS=y
+CONFIG_EFI_ESRT=y
+CONFIG_EFI_VARS_PSTORE=y
+CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
+CONFIG_EFI_RUNTIME_MAP=y
+# CONFIG_EFI_FAKE_MEMMAP is not set
+CONFIG_EFI_RUNTIME_WRAPPERS=y
+# CONFIG_EFI_BOOTLOADER_CONTROL is not set
+# CONFIG_EFI_CAPSULE_LOADER is not set
+# CONFIG_EFI_TEST is not set
+CONFIG_APPLE_PROPERTIES=y
+# CONFIG_RESET_ATTACK_MITIGATION is not set
+# CONFIG_EFI_RCI2_TABLE is not set
+# end of EFI (Extensible Firmware Interface) Support
+
+CONFIG_UEFI_CPER=y
+CONFIG_UEFI_CPER_X86=y
+CONFIG_EFI_DEV_PATH_PARSER=y
+CONFIG_EFI_EARLYCON=y
+
+#
+# Tegra firmware driver
+#
+# end of Tegra firmware driver
+# end of Firmware Drivers
+
+CONFIG_HAVE_KVM=y
+CONFIG_HAVE_KVM_IRQCHIP=y
+CONFIG_HAVE_KVM_IRQFD=y
+CONFIG_HAVE_KVM_IRQ_ROUTING=y
+CONFIG_HAVE_KVM_EVENTFD=y
+CONFIG_KVM_MMIO=y
+CONFIG_KVM_ASYNC_PF=y
+CONFIG_HAVE_KVM_MSI=y
+CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
+CONFIG_KVM_VFIO=y
+CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
+CONFIG_HAVE_KVM_IRQ_BYPASS=y
+CONFIG_HAVE_KVM_NO_POLL=y
+CONFIG_VIRTUALIZATION=y
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
+CONFIG_KVM_AMD_SEV=y
+CONFIG_KVM_MMU_AUDIT=y
+CONFIG_VHOST_NET=m
+CONFIG_VHOST_SCSI=m
+CONFIG_VHOST_VSOCK=m
+CONFIG_VHOST=m
+# CONFIG_VHOST_CROSS_ENDIAN_LEGACY is not set
+
+#
+# General architecture-dependent options
+#
+CONFIG_CRASH_CORE=y
+CONFIG_KEXEC_CORE=y
+CONFIG_HOTPLUG_SMT=y
+CONFIG_OPROFILE=m
+CONFIG_OPROFILE_EVENT_MULTIPLEX=y
+CONFIG_HAVE_OPROFILE=y
+CONFIG_OPROFILE_NMI_TIMER=y
+CONFIG_KPROBES=y
+CONFIG_JUMP_LABEL=y
+# CONFIG_STATIC_KEYS_SELFTEST is not set
+CONFIG_OPTPROBES=y
+CONFIG_KPROBES_ON_FTRACE=y
+CONFIG_UPROBES=y
+CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y
+CONFIG_ARCH_USE_BUILTIN_BSWAP=y
+CONFIG_KRETPROBES=y
+CONFIG_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_IOREMAP_PROT=y
+CONFIG_HAVE_KPROBES=y
+CONFIG_HAVE_KRETPROBES=y
+CONFIG_HAVE_OPTPROBES=y
+CONFIG_HAVE_KPROBES_ON_FTRACE=y
+CONFIG_HAVE_FUNCTION_ERROR_INJECTION=y
+CONFIG_HAVE_NMI=y
+CONFIG_HAVE_ARCH_TRACEHOOK=y
+CONFIG_HAVE_DMA_CONTIGUOUS=y
+CONFIG_GENERIC_SMP_IDLE_THREAD=y
+CONFIG_ARCH_HAS_FORTIFY_SOURCE=y
+CONFIG_ARCH_HAS_SET_MEMORY=y
+CONFIG_ARCH_HAS_SET_DIRECT_MAP=y
+CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y
+CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT=y
+CONFIG_HAVE_ASM_MODVERSIONS=y
+CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y
+CONFIG_HAVE_RSEQ=y
+CONFIG_HAVE_FUNCTION_ARG_ACCESS_API=y
+CONFIG_HAVE_CLK=y
+CONFIG_HAVE_HW_BREAKPOINT=y
+CONFIG_HAVE_MIXED_BREAKPOINTS_REGS=y
+CONFIG_HAVE_USER_RETURN_NOTIFIER=y
+CONFIG_HAVE_PERF_EVENTS_NMI=y
+CONFIG_HAVE_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HAVE_PERF_REGS=y
+CONFIG_HAVE_PERF_USER_STACK_DUMP=y
+CONFIG_HAVE_ARCH_JUMP_LABEL=y
+CONFIG_HAVE_ARCH_JUMP_LABEL_RELATIVE=y
+CONFIG_HAVE_RCU_TABLE_FREE=y
+CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
+CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
+CONFIG_HAVE_CMPXCHG_LOCAL=y
+CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
+CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
+CONFIG_SECCOMP_FILTER=y
+CONFIG_HAVE_ARCH_STACKLEAK=y
+CONFIG_HAVE_STACKPROTECTOR=y
+CONFIG_CC_HAS_STACKPROTECTOR_NONE=y
+CONFIG_STACKPROTECTOR=y
+CONFIG_STACKPROTECTOR_STRONG=y
+CONFIG_HAVE_ARCH_WITHIN_STACK_FRAMES=y
+CONFIG_HAVE_CONTEXT_TRACKING=y
+CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y
+CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y
+CONFIG_HAVE_MOVE_PMD=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y
+CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE_PUD=y
+CONFIG_HAVE_ARCH_HUGE_VMAP=y
+CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y
+CONFIG_HAVE_ARCH_SOFT_DIRTY=y
+CONFIG_HAVE_MOD_ARCH_SPECIFIC=y
+CONFIG_MODULES_USE_ELF_RELA=y
+CONFIG_HAVE_IRQ_EXIT_ON_IRQ_STACK=y
+CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
+CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
+CONFIG_HAVE_EXIT_THREAD=y
+CONFIG_ARCH_MMAP_RND_BITS=28
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
+CONFIG_HAVE_COPY_THREAD_TLS=y
+CONFIG_HAVE_STACK_VALIDATION=y
+CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_ISA_BUS_API=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
+CONFIG_64BIT_TIME=y
+CONFIG_COMPAT_32BIT_TIME=y
+CONFIG_HAVE_ARCH_VMAP_STACK=y
+CONFIG_VMAP_STACK=y
+CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y
+CONFIG_STRICT_KERNEL_RWX=y
+CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y
+CONFIG_STRICT_MODULE_RWX=y
+CONFIG_ARCH_HAS_REFCOUNT=y
+# CONFIG_REFCOUNT_FULL is not set
+CONFIG_HAVE_ARCH_PREL32_RELOCATIONS=y
+CONFIG_ARCH_USE_MEMREMAP_PROT=y
+# CONFIG_LOCK_EVENT_COUNTS is not set
+CONFIG_ARCH_HAS_MEM_ENCRYPT=y
+
+#
+# GCOV-based kernel profiling
+#
+# CONFIG_GCOV_KERNEL is not set
+CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y
+# end of GCOV-based kernel profiling
+
+CONFIG_PLUGIN_HOSTCC=""
+CONFIG_HAVE_GCC_PLUGINS=y
+# end of General architecture-dependent options
+
+CONFIG_RT_MUTEXES=y
+CONFIG_BASE_SMALL=0
+CONFIG_MODULES=y
+# CONFIG_MODULE_FORCE_LOAD is not set
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_MODVERSIONS=y
+CONFIG_ASM_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+# CONFIG_MODULE_SIG is not set
+# CONFIG_MODULE_COMPRESS is not set
+# CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set
+# CONFIG_UNUSED_SYMBOLS is not set
+# CONFIG_TRIM_UNUSED_KSYMS is not set
+CONFIG_MODULES_TREE_LOOKUP=y
+CONFIG_BLOCK=y
+CONFIG_BLK_SCSI_REQUEST=y
+CONFIG_BLK_DEV_BSG=y
+CONFIG_BLK_DEV_BSGLIB=y
+CONFIG_BLK_DEV_INTEGRITY=y
+CONFIG_BLK_DEV_ZONED=y
+CONFIG_BLK_DEV_THROTTLING=y
+# CONFIG_BLK_DEV_THROTTLING_LOW is not set
+# CONFIG_BLK_CMDLINE_PARSER is not set
+CONFIG_BLK_WBT=y
+# CONFIG_BLK_CGROUP_IOLATENCY is not set
+# CONFIG_BLK_CGROUP_IOCOST is not set
+CONFIG_BLK_WBT_MQ=y
+CONFIG_BLK_DEBUG_FS=y
+CONFIG_BLK_DEBUG_FS_ZONED=y
+# CONFIG_BLK_SED_OPAL is not set
+
+#
+# Partition Types
+#
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_ACORN_PARTITION is not set
+# CONFIG_AIX_PARTITION is not set
+CONFIG_OSF_PARTITION=y
+CONFIG_AMIGA_PARTITION=y
+# CONFIG_ATARI_PARTITION is not set
+CONFIG_MAC_PARTITION=y
+CONFIG_MSDOS_PARTITION=y
+CONFIG_BSD_DISKLABEL=y
+CONFIG_MINIX_SUBPARTITION=y
+CONFIG_SOLARIS_X86_PARTITION=y
+CONFIG_UNIXWARE_DISKLABEL=y
+# CONFIG_LDM_PARTITION is not set
+CONFIG_SGI_PARTITION=y
+# CONFIG_ULTRIX_PARTITION is not set
+CONFIG_SUN_PARTITION=y
+CONFIG_KARMA_PARTITION=y
+CONFIG_EFI_PARTITION=y
+# CONFIG_SYSV68_PARTITION is not set
+# CONFIG_CMDLINE_PARTITION is not set
+# end of Partition Types
+
+CONFIG_BLOCK_COMPAT=y
+CONFIG_BLK_MQ_PCI=y
+CONFIG_BLK_MQ_VIRTIO=y
+CONFIG_BLK_MQ_RDMA=y
+CONFIG_BLK_PM=y
+
+#
+# IO Schedulers
+#
+CONFIG_MQ_IOSCHED_DEADLINE=y
+CONFIG_MQ_IOSCHED_KYBER=y
+CONFIG_IOSCHED_BFQ=y
+CONFIG_BFQ_GROUP_IOSCHED=y
+# CONFIG_BFQ_CGROUP_DEBUG is not set
+# end of IO Schedulers
+
+CONFIG_PREEMPT_NOTIFIERS=y
+CONFIG_PADATA=y
+CONFIG_ASN1=y
+CONFIG_INLINE_SPIN_UNLOCK_IRQ=y
+CONFIG_INLINE_READ_UNLOCK=y
+CONFIG_INLINE_READ_UNLOCK_IRQ=y
+CONFIG_INLINE_WRITE_UNLOCK=y
+CONFIG_INLINE_WRITE_UNLOCK_IRQ=y
+CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y
+CONFIG_MUTEX_SPIN_ON_OWNER=y
+CONFIG_RWSEM_SPIN_ON_OWNER=y
+CONFIG_LOCK_SPIN_ON_OWNER=y
+CONFIG_ARCH_USE_QUEUED_SPINLOCKS=y
+CONFIG_QUEUED_SPINLOCKS=y
+CONFIG_ARCH_USE_QUEUED_RWLOCKS=y
+CONFIG_QUEUED_RWLOCKS=y
+CONFIG_ARCH_HAS_SYNC_CORE_BEFORE_USERMODE=y
+CONFIG_ARCH_HAS_SYSCALL_WRAPPER=y
+CONFIG_FREEZER=y
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
+CONFIG_ELFCORE=y
+CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
+CONFIG_BINFMT_SCRIPT=y
+CONFIG_BINFMT_MISC=m
+CONFIG_COREDUMP=y
+# end of Executable file formats
+
+#
+# Memory Management options
+#
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_SPARSEMEM_MANUAL=y
+CONFIG_SPARSEMEM=y
+CONFIG_NEED_MULTIPLE_NODES=y
+CONFIG_HAVE_MEMORY_PRESENT=y
+CONFIG_SPARSEMEM_EXTREME=y
+CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
+CONFIG_SPARSEMEM_VMEMMAP=y
+CONFIG_HAVE_MEMBLOCK_NODE_MAP=y
+CONFIG_HAVE_FAST_GUP=y
+CONFIG_MEMORY_ISOLATION=y
+CONFIG_HAVE_BOOTMEM_INFO_NODE=y
+CONFIG_MEMORY_HOTPLUG=y
+CONFIG_MEMORY_HOTPLUG_SPARSE=y
+CONFIG_MEMORY_HOTPLUG_DEFAULT_ONLINE=y
+CONFIG_MEMORY_HOTREMOVE=y
+CONFIG_SPLIT_PTLOCK_CPUS=4
+CONFIG_MEMORY_BALLOON=y
+CONFIG_BALLOON_COMPACTION=y
+CONFIG_COMPACTION=y
+CONFIG_MIGRATION=y
+CONFIG_CONTIG_ALLOC=y
+CONFIG_PHYS_ADDR_T_64BIT=y
+CONFIG_BOUNCE=y
+CONFIG_VIRT_TO_BUS=y
+CONFIG_MMU_NOTIFIER=y
+CONFIG_KSM=y
+CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
+CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
+CONFIG_MEMORY_FAILURE=y
+CONFIG_HWPOISON_INJECT=m
+CONFIG_TRANSPARENT_HUGEPAGE=y
+CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
+# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
+CONFIG_ARCH_WANTS_THP_SWAP=y
+CONFIG_THP_SWAP=y
+CONFIG_TRANSPARENT_HUGE_PAGECACHE=y
+CONFIG_CLEANCACHE=y
+CONFIG_FRONTSWAP=y
+# CONFIG_CMA is not set
+# CONFIG_MEM_SOFT_DIRTY is not set
+CONFIG_ZSWAP=y
+CONFIG_ZPOOL=y
+CONFIG_ZBUD=y
+# CONFIG_Z3FOLD is not set
+CONFIG_ZSMALLOC=y
+# CONFIG_PGTABLE_MAPPING is not set
+# CONFIG_ZSMALLOC_STAT is not set
+CONFIG_GENERIC_EARLY_IOREMAP=y
+# CONFIG_DEFERRED_STRUCT_PAGE_INIT is not set
+# CONFIG_IDLE_PAGE_TRACKING is not set
+CONFIG_ARCH_HAS_PTE_DEVMAP=y
+CONFIG_ZONE_DEVICE=y
+CONFIG_DEV_PAGEMAP_OPS=y
+CONFIG_HMM_MIRROR=y
+# CONFIG_DEVICE_PRIVATE is not set
+CONFIG_FRAME_VECTOR=y
+CONFIG_ARCH_USES_HIGH_VMA_FLAGS=y
+CONFIG_ARCH_HAS_PKEYS=y
+# CONFIG_PERCPU_STATS is not set
+# CONFIG_GUP_BENCHMARK is not set
+# CONFIG_READ_ONLY_THP_FOR_FS is not set
+CONFIG_ARCH_HAS_PTE_SPECIAL=y
+# end of Memory Management options
+
+CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
+CONFIG_NET_INGRESS=y
+CONFIG_NET_EGRESS=y
+CONFIG_SKB_EXTENSIONS=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=m
+CONFIG_UNIX=y
+CONFIG_UNIX_SCM=y
+CONFIG_UNIX_DIAG=m
+CONFIG_TLS=m
+# CONFIG_TLS_DEVICE is not set
+CONFIG_XFRM=y
+CONFIG_XFRM_OFFLOAD=y
+CONFIG_XFRM_ALGO=y
+CONFIG_XFRM_USER=y
+CONFIG_XFRM_INTERFACE=m
+CONFIG_XFRM_SUB_POLICY=y
+CONFIG_XFRM_MIGRATE=y
+CONFIG_XFRM_STATISTICS=y
+CONFIG_XFRM_IPCOMP=m
+CONFIG_NET_KEY=m
+CONFIG_NET_KEY_MIGRATE=y
+# CONFIG_SMC is not set
+# CONFIG_XDP_SOCKETS is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_FIB_TRIE_STATS=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_ROUTE_CLASSID=y
+# CONFIG_IP_PNP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE_DEMUX=m
+CONFIG_NET_IP_TUNNEL=m
+CONFIG_NET_IPGRE=m
+CONFIG_NET_IPGRE_BROADCAST=y
+CONFIG_IP_MROUTE_COMMON=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IP_PIMSM_V1=y
+CONFIG_IP_PIMSM_V2=y
+CONFIG_SYN_COOKIES=y
+CONFIG_NET_IPVTI=m
+CONFIG_NET_UDP_TUNNEL=m
+CONFIG_NET_FOU=m
+CONFIG_NET_FOU_IP_TUNNELS=y
+CONFIG_INET_AH=m
+CONFIG_INET_ESP=m
+CONFIG_INET_ESP_OFFLOAD=m
+CONFIG_INET_IPCOMP=m
+CONFIG_INET_XFRM_TUNNEL=m
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=m
+CONFIG_INET_TCP_DIAG=m
+CONFIG_INET_UDP_DIAG=m
+CONFIG_INET_RAW_DIAG=m
+# CONFIG_INET_DIAG_DESTROY is not set
+CONFIG_TCP_CONG_ADVANCED=y
+CONFIG_TCP_CONG_BIC=m
+CONFIG_TCP_CONG_CUBIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+CONFIG_TCP_CONG_HSTCP=m
+CONFIG_TCP_CONG_HYBLA=m
+CONFIG_TCP_CONG_VEGAS=m
+CONFIG_TCP_CONG_NV=m
+CONFIG_TCP_CONG_SCALABLE=m
+CONFIG_TCP_CONG_LP=m
+CONFIG_TCP_CONG_VENO=m
+CONFIG_TCP_CONG_YEAH=m
+CONFIG_TCP_CONG_ILLINOIS=m
+CONFIG_TCP_CONG_DCTCP=m
+CONFIG_TCP_CONG_CDG=m
+CONFIG_TCP_CONG_BBR=m
+CONFIG_DEFAULT_CUBIC=y
+# CONFIG_DEFAULT_RENO is not set
+CONFIG_DEFAULT_TCP_CONG="cubic"
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
+CONFIG_IPV6_ROUTER_PREF=y
+CONFIG_IPV6_ROUTE_INFO=y
+CONFIG_IPV6_OPTIMISTIC_DAD=y
+CONFIG_INET6_AH=m
+CONFIG_INET6_ESP=m
+CONFIG_INET6_ESP_OFFLOAD=m
+CONFIG_INET6_IPCOMP=m
+CONFIG_IPV6_MIP6=m
+CONFIG_IPV6_ILA=m
+CONFIG_INET6_XFRM_TUNNEL=m
+CONFIG_INET6_TUNNEL=m
+CONFIG_IPV6_VTI=m
+CONFIG_IPV6_SIT=m
+CONFIG_IPV6_SIT_6RD=y
+CONFIG_IPV6_NDISC_NODETYPE=y
+CONFIG_IPV6_TUNNEL=m
+CONFIG_IPV6_GRE=m
+CONFIG_IPV6_FOU=m
+CONFIG_IPV6_FOU_TUNNEL=m
+CONFIG_IPV6_MULTIPLE_TABLES=y
+CONFIG_IPV6_SUBTREES=y
+CONFIG_IPV6_MROUTE=y
+CONFIG_IPV6_MROUTE_MULTIPLE_TABLES=y
+CONFIG_IPV6_PIMSM_V2=y
+# CONFIG_IPV6_SEG6_LWTUNNEL is not set
+# CONFIG_IPV6_SEG6_HMAC is not set
+CONFIG_NETLABEL=y
+CONFIG_NETWORK_SECMARK=y
+CONFIG_NET_PTP_CLASSIFY=y
+CONFIG_NETWORK_PHY_TIMESTAMPING=y
+CONFIG_NETFILTER=y
+CONFIG_NETFILTER_ADVANCED=y
+CONFIG_BRIDGE_NETFILTER=y
+
+#
+# Core Netfilter Configuration
+#
+CONFIG_NETFILTER_INGRESS=y
+CONFIG_NETFILTER_NETLINK=m
+CONFIG_NETFILTER_FAMILY_BRIDGE=y
+CONFIG_NETFILTER_FAMILY_ARP=y
+CONFIG_NETFILTER_NETLINK_ACCT=m
+CONFIG_NETFILTER_NETLINK_QUEUE=m
+CONFIG_NETFILTER_NETLINK_LOG=m
+CONFIG_NETFILTER_NETLINK_OSF=m
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_LOG_COMMON=m
+CONFIG_NF_LOG_NETDEV=m
+CONFIG_NETFILTER_CONNCOUNT=m
+CONFIG_NF_CONNTRACK_MARK=y
+CONFIG_NF_CONNTRACK_SECMARK=y
+CONFIG_NF_CONNTRACK_ZONES=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_CONNTRACK_EVENTS=y
+CONFIG_NF_CONNTRACK_TIMEOUT=y
+CONFIG_NF_CONNTRACK_TIMESTAMP=y
+CONFIG_NF_CONNTRACK_LABELS=y
+CONFIG_NF_CT_PROTO_DCCP=y
+CONFIG_NF_CT_PROTO_GRE=y
+CONFIG_NF_CT_PROTO_SCTP=y
+CONFIG_NF_CT_PROTO_UDPLITE=y
+CONFIG_NF_CONNTRACK_AMANDA=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_H323=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NF_CONNTRACK_BROADCAST=m
+CONFIG_NF_CONNTRACK_NETBIOS_NS=m
+CONFIG_NF_CONNTRACK_SNMP=m
+CONFIG_NF_CONNTRACK_PPTP=m
+CONFIG_NF_CONNTRACK_SANE=m
+CONFIG_NF_CONNTRACK_SIP=m
+CONFIG_NF_CONNTRACK_TFTP=m
+CONFIG_NF_CT_NETLINK=m
+CONFIG_NF_CT_NETLINK_TIMEOUT=m
+CONFIG_NF_CT_NETLINK_HELPER=m
+CONFIG_NETFILTER_NETLINK_GLUE_CT=y
+CONFIG_NF_NAT=m
+CONFIG_NF_NAT_AMANDA=m
+CONFIG_NF_NAT_FTP=m
+CONFIG_NF_NAT_IRC=m
+CONFIG_NF_NAT_SIP=m
+CONFIG_NF_NAT_TFTP=m
+CONFIG_NF_NAT_REDIRECT=y
+CONFIG_NF_NAT_MASQUERADE=y
+CONFIG_NETFILTER_SYNPROXY=m
+CONFIG_NF_TABLES=m
+CONFIG_NF_TABLES_SET=m
+CONFIG_NF_TABLES_INET=y
+CONFIG_NF_TABLES_NETDEV=y
+CONFIG_NFT_NUMGEN=m
+CONFIG_NFT_CT=m
+CONFIG_NFT_FLOW_OFFLOAD=m
+CONFIG_NFT_COUNTER=m
+CONFIG_NFT_CONNLIMIT=m
+CONFIG_NFT_LOG=m
+CONFIG_NFT_LIMIT=m
+CONFIG_NFT_MASQ=m
+CONFIG_NFT_REDIR=m
+CONFIG_NFT_NAT=m
+CONFIG_NFT_TUNNEL=m
+CONFIG_NFT_OBJREF=m
+CONFIG_NFT_QUEUE=m
+CONFIG_NFT_QUOTA=m
+CONFIG_NFT_REJECT=m
+CONFIG_NFT_REJECT_INET=m
+CONFIG_NFT_COMPAT=m
+CONFIG_NFT_HASH=m
+CONFIG_NFT_FIB=m
+CONFIG_NFT_FIB_INET=m
+CONFIG_NFT_XFRM=m
+CONFIG_NFT_SOCKET=m
+CONFIG_NFT_OSF=m
+CONFIG_NFT_TPROXY=m
+CONFIG_NFT_SYNPROXY=m
+CONFIG_NF_DUP_NETDEV=m
+CONFIG_NFT_DUP_NETDEV=m
+CONFIG_NFT_FWD_NETDEV=m
+CONFIG_NFT_FIB_NETDEV=m
+CONFIG_NF_FLOW_TABLE_INET=m
+CONFIG_NF_FLOW_TABLE=m
+CONFIG_NETFILTER_XTABLES=y
+
+#
+# Xtables combined modules
+#
+CONFIG_NETFILTER_XT_MARK=m
+CONFIG_NETFILTER_XT_CONNMARK=m
+CONFIG_NETFILTER_XT_SET=m
+
+#
+# Xtables targets
+#
+CONFIG_NETFILTER_XT_TARGET_AUDIT=m
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
+CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
+CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
+CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_DSCP=m
+CONFIG_NETFILTER_XT_TARGET_HL=m
+CONFIG_NETFILTER_XT_TARGET_HMARK=m
+CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
+CONFIG_NETFILTER_XT_TARGET_LED=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_MARK=m
+CONFIG_NETFILTER_XT_NAT=m
+CONFIG_NETFILTER_XT_TARGET_NETMAP=m
+CONFIG_NETFILTER_XT_TARGET_NFLOG=m
+CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
+CONFIG_NETFILTER_XT_TARGET_RATEEST=m
+CONFIG_NETFILTER_XT_TARGET_REDIRECT=m
+CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m
+CONFIG_NETFILTER_XT_TARGET_TEE=m
+CONFIG_NETFILTER_XT_TARGET_TPROXY=m
+CONFIG_NETFILTER_XT_TARGET_TRACE=m
+CONFIG_NETFILTER_XT_TARGET_SECMARK=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
+
+#
+# Xtables matches
+#
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_NETFILTER_XT_MATCH_BPF=m
+CONFIG_NETFILTER_XT_MATCH_CGROUP=m
+CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
+CONFIG_NETFILTER_XT_MATCH_CONNLABEL=m
+CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_CPU=m
+CONFIG_NETFILTER_XT_MATCH_DCCP=m
+CONFIG_NETFILTER_XT_MATCH_DEVGROUP=m
+CONFIG_NETFILTER_XT_MATCH_DSCP=m
+CONFIG_NETFILTER_XT_MATCH_ECN=m
+CONFIG_NETFILTER_XT_MATCH_ESP=m
+CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
+CONFIG_NETFILTER_XT_MATCH_HELPER=m
+CONFIG_NETFILTER_XT_MATCH_HL=m
+CONFIG_NETFILTER_XT_MATCH_IPCOMP=m
+CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
+CONFIG_NETFILTER_XT_MATCH_IPVS=m
+CONFIG_NETFILTER_XT_MATCH_L2TP=m
+CONFIG_NETFILTER_XT_MATCH_LENGTH=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MARK=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_NFACCT=m
+CONFIG_NETFILTER_XT_MATCH_OSF=m
+CONFIG_NETFILTER_XT_MATCH_OWNER=m
+CONFIG_NETFILTER_XT_MATCH_POLICY=m
+CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
+CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
+CONFIG_NETFILTER_XT_MATCH_QUOTA=m
+CONFIG_NETFILTER_XT_MATCH_RATEEST=m
+CONFIG_NETFILTER_XT_MATCH_REALM=m
+CONFIG_NETFILTER_XT_MATCH_RECENT=m
+CONFIG_NETFILTER_XT_MATCH_SCTP=m
+CONFIG_NETFILTER_XT_MATCH_SOCKET=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
+CONFIG_NETFILTER_XT_MATCH_STRING=m
+CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_TIME=m
+CONFIG_NETFILTER_XT_MATCH_U32=m
+# end of Core Netfilter Configuration
+
+CONFIG_IP_SET=m
+CONFIG_IP_SET_MAX=256
+CONFIG_IP_SET_BITMAP_IP=m
+CONFIG_IP_SET_BITMAP_IPMAC=m
+CONFIG_IP_SET_BITMAP_PORT=m
+CONFIG_IP_SET_HASH_IP=m
+CONFIG_IP_SET_HASH_IPMARK=m
+CONFIG_IP_SET_HASH_IPPORT=m
+CONFIG_IP_SET_HASH_IPPORTIP=m
+CONFIG_IP_SET_HASH_IPPORTNET=m
+CONFIG_IP_SET_HASH_IPMAC=m
+CONFIG_IP_SET_HASH_MAC=m
+CONFIG_IP_SET_HASH_NETPORTNET=m
+CONFIG_IP_SET_HASH_NET=m
+CONFIG_IP_SET_HASH_NETNET=m
+CONFIG_IP_SET_HASH_NETPORT=m
+CONFIG_IP_SET_HASH_NETIFACE=m
+CONFIG_IP_SET_LIST_SET=m
+CONFIG_IP_VS=m
+CONFIG_IP_VS_IPV6=y
+# CONFIG_IP_VS_DEBUG is not set
+CONFIG_IP_VS_TAB_BITS=12
+
+#
+# IPVS transport protocol load balancing support
+#
+CONFIG_IP_VS_PROTO_TCP=y
+CONFIG_IP_VS_PROTO_UDP=y
+CONFIG_IP_VS_PROTO_AH_ESP=y
+CONFIG_IP_VS_PROTO_ESP=y
+CONFIG_IP_VS_PROTO_AH=y
+CONFIG_IP_VS_PROTO_SCTP=y
+
+#
+# IPVS scheduler
+#
+CONFIG_IP_VS_RR=m
+CONFIG_IP_VS_WRR=m
+CONFIG_IP_VS_LC=m
+CONFIG_IP_VS_WLC=m
+CONFIG_IP_VS_FO=m
+CONFIG_IP_VS_OVF=m
+CONFIG_IP_VS_LBLC=m
+CONFIG_IP_VS_LBLCR=m
+CONFIG_IP_VS_DH=m
+CONFIG_IP_VS_SH=m
+CONFIG_IP_VS_MH=m
+CONFIG_IP_VS_SED=m
+CONFIG_IP_VS_NQ=m
+
+#
+# IPVS SH scheduler
+#
+CONFIG_IP_VS_SH_TAB_BITS=8
+
+#
+# IPVS MH scheduler
+#
+CONFIG_IP_VS_MH_TAB_INDEX=12
+
+#
+# IPVS application helper
+#
+CONFIG_IP_VS_FTP=m
+CONFIG_IP_VS_NFCT=y
+CONFIG_IP_VS_PE_SIP=m
+
+#
+# IP: Netfilter Configuration
+#
+CONFIG_NF_DEFRAG_IPV4=m
+CONFIG_NF_SOCKET_IPV4=m
+CONFIG_NF_TPROXY_IPV4=m
+CONFIG_NF_TABLES_IPV4=y
+CONFIG_NFT_REJECT_IPV4=m
+CONFIG_NFT_DUP_IPV4=m
+CONFIG_NFT_FIB_IPV4=m
+CONFIG_NF_TABLES_ARP=y
+CONFIG_NF_FLOW_TABLE_IPV4=m
+CONFIG_NF_DUP_IPV4=m
+CONFIG_NF_LOG_ARP=m
+CONFIG_NF_LOG_IPV4=m
+CONFIG_NF_REJECT_IPV4=m
+CONFIG_NF_NAT_SNMP_BASIC=m
+CONFIG_NF_NAT_PPTP=m
+CONFIG_NF_NAT_H323=m
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_MATCH_AH=m
+CONFIG_IP_NF_MATCH_ECN=m
+CONFIG_IP_NF_MATCH_RPFILTER=m
+CONFIG_IP_NF_MATCH_TTL=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_TARGET_SYNPROXY=m
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+CONFIG_IP_NF_TARGET_NETMAP=m
+CONFIG_IP_NF_TARGET_REDIRECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_TARGET_CLUSTERIP=m
+CONFIG_IP_NF_TARGET_ECN=m
+CONFIG_IP_NF_TARGET_TTL=m
+CONFIG_IP_NF_RAW=m
+CONFIG_IP_NF_SECURITY=m
+CONFIG_IP_NF_ARPTABLES=m
+CONFIG_IP_NF_ARPFILTER=m
+CONFIG_IP_NF_ARP_MANGLE=m
+# end of IP: Netfilter Configuration
+
+#
+# IPv6: Netfilter Configuration
+#
+CONFIG_NF_SOCKET_IPV6=m
+CONFIG_NF_TPROXY_IPV6=m
+CONFIG_NF_TABLES_IPV6=y
+CONFIG_NFT_REJECT_IPV6=m
+CONFIG_NFT_DUP_IPV6=m
+CONFIG_NFT_FIB_IPV6=m
+CONFIG_NF_FLOW_TABLE_IPV6=m
+CONFIG_NF_DUP_IPV6=m
+CONFIG_NF_REJECT_IPV6=m
+CONFIG_NF_LOG_IPV6=m
+CONFIG_IP6_NF_IPTABLES=m
+CONFIG_IP6_NF_MATCH_AH=m
+CONFIG_IP6_NF_MATCH_EUI64=m
+CONFIG_IP6_NF_MATCH_FRAG=m
+CONFIG_IP6_NF_MATCH_OPTS=m
+CONFIG_IP6_NF_MATCH_HL=m
+CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+CONFIG_IP6_NF_MATCH_MH=m
+CONFIG_IP6_NF_MATCH_RPFILTER=m
+CONFIG_IP6_NF_MATCH_RT=m
+CONFIG_IP6_NF_MATCH_SRH=m
+CONFIG_IP6_NF_TARGET_HL=m
+CONFIG_IP6_NF_FILTER=m
+CONFIG_IP6_NF_TARGET_REJECT=m
+CONFIG_IP6_NF_TARGET_SYNPROXY=m
+CONFIG_IP6_NF_MANGLE=m
+CONFIG_IP6_NF_RAW=m
+CONFIG_IP6_NF_SECURITY=m
+CONFIG_IP6_NF_NAT=m
+CONFIG_IP6_NF_TARGET_MASQUERADE=m
+CONFIG_IP6_NF_TARGET_NPT=m
+# end of IPv6: Netfilter Configuration
+
+CONFIG_NF_DEFRAG_IPV6=m
+CONFIG_NF_TABLES_BRIDGE=m
+CONFIG_NFT_BRIDGE_META=m
+CONFIG_NFT_BRIDGE_REJECT=m
+CONFIG_NF_LOG_BRIDGE=m
+CONFIG_NF_CONNTRACK_BRIDGE=m
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_BROUTE=m
+CONFIG_BRIDGE_EBT_T_FILTER=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+CONFIG_BRIDGE_EBT_802_3=m
+CONFIG_BRIDGE_EBT_AMONG=m
+CONFIG_BRIDGE_EBT_ARP=m
+CONFIG_BRIDGE_EBT_IP=m
+CONFIG_BRIDGE_EBT_IP6=m
+CONFIG_BRIDGE_EBT_LIMIT=m
+CONFIG_BRIDGE_EBT_MARK=m
+CONFIG_BRIDGE_EBT_PKTTYPE=m
+CONFIG_BRIDGE_EBT_STP=m
+CONFIG_BRIDGE_EBT_VLAN=m
+CONFIG_BRIDGE_EBT_ARPREPLY=m
+CONFIG_BRIDGE_EBT_DNAT=m
+CONFIG_BRIDGE_EBT_MARK_T=m
+CONFIG_BRIDGE_EBT_REDIRECT=m
+CONFIG_BRIDGE_EBT_SNAT=m
+CONFIG_BRIDGE_EBT_LOG=m
+CONFIG_BRIDGE_EBT_NFLOG=m
+# CONFIG_BPFILTER is not set
+CONFIG_IP_DCCP=m
+CONFIG_INET_DCCP_DIAG=m
+
+#
+# DCCP CCIDs Configuration
+#
+# CONFIG_IP_DCCP_CCID2_DEBUG is not set
+CONFIG_IP_DCCP_CCID3=y
+# CONFIG_IP_DCCP_CCID3_DEBUG is not set
+CONFIG_IP_DCCP_TFRC_LIB=y
+# end of DCCP CCIDs Configuration
+
+#
+# DCCP Kernel Hacking
+#
+# CONFIG_IP_DCCP_DEBUG is not set
+# end of DCCP Kernel Hacking
+
+CONFIG_IP_SCTP=m
+# CONFIG_SCTP_DBG_OBJCNT is not set
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_MD5 is not set
+CONFIG_SCTP_DEFAULT_COOKIE_HMAC_SHA1=y
+# CONFIG_SCTP_DEFAULT_COOKIE_HMAC_NONE is not set
+CONFIG_SCTP_COOKIE_HMAC_MD5=y
+CONFIG_SCTP_COOKIE_HMAC_SHA1=y
+CONFIG_INET_SCTP_DIAG=m
+# CONFIG_RDS is not set
+# CONFIG_TIPC is not set
+CONFIG_ATM=m
+CONFIG_ATM_CLIP=m
+# CONFIG_ATM_CLIP_NO_ICMP is not set
+CONFIG_ATM_LANE=m
+# CONFIG_ATM_MPOA is not set
+CONFIG_ATM_BR2684=m
+# CONFIG_ATM_BR2684_IPFILTER is not set
+CONFIG_L2TP=m
+# CONFIG_L2TP_DEBUGFS is not set
+CONFIG_L2TP_V3=y
+CONFIG_L2TP_IP=m
+CONFIG_L2TP_ETH=m
+CONFIG_STP=y
+CONFIG_GARP=m
+CONFIG_MRP=m
+CONFIG_BRIDGE=y
+CONFIG_BRIDGE_IGMP_SNOOPING=y
+CONFIG_BRIDGE_VLAN_FILTERING=y
+CONFIG_HAVE_NET_DSA=y
+# CONFIG_NET_DSA is not set
+CONFIG_VLAN_8021Q=m
+CONFIG_VLAN_8021Q_GVRP=y
+CONFIG_VLAN_8021Q_MVRP=y
+# CONFIG_DECNET is not set
+CONFIG_LLC=y
+# CONFIG_LLC2 is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_PHONET is not set
+# CONFIG_6LOWPAN is not set
+CONFIG_IEEE802154=m
+# CONFIG_IEEE802154_NL802154_EXPERIMENTAL is not set
+CONFIG_IEEE802154_SOCKET=m
+CONFIG_MAC802154=m
+CONFIG_NET_SCHED=y
+
+#
+# Queueing/Scheduling
+#
+CONFIG_NET_SCH_CBQ=m
+CONFIG_NET_SCH_HTB=m
+CONFIG_NET_SCH_HFSC=m
+CONFIG_NET_SCH_ATM=m
+CONFIG_NET_SCH_PRIO=m
+CONFIG_NET_SCH_MULTIQ=m
+CONFIG_NET_SCH_RED=m
+CONFIG_NET_SCH_SFB=m
+CONFIG_NET_SCH_SFQ=m
+CONFIG_NET_SCH_TEQL=m
+CONFIG_NET_SCH_TBF=m
+CONFIG_NET_SCH_CBS=m
+CONFIG_NET_SCH_ETF=m
+CONFIG_NET_SCH_TAPRIO=m
+CONFIG_NET_SCH_GRED=m
+CONFIG_NET_SCH_DSMARK=m
+CONFIG_NET_SCH_NETEM=m
+CONFIG_NET_SCH_DRR=m
+CONFIG_NET_SCH_MQPRIO=m
+CONFIG_NET_SCH_SKBPRIO=m
+CONFIG_NET_SCH_CHOKE=m
+CONFIG_NET_SCH_QFQ=m
+CONFIG_NET_SCH_CODEL=m
+CONFIG_NET_SCH_FQ_CODEL=m
+CONFIG_NET_SCH_CAKE=m
+CONFIG_NET_SCH_FQ=m
+CONFIG_NET_SCH_HHF=m
+CONFIG_NET_SCH_PIE=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_SCH_PLUG=m
+# CONFIG_NET_SCH_DEFAULT is not set
+
+#
+# Classification
+#
+CONFIG_NET_CLS=y
+CONFIG_NET_CLS_BASIC=m
+CONFIG_NET_CLS_TCINDEX=m
+CONFIG_NET_CLS_ROUTE4=m
+CONFIG_NET_CLS_FW=m
+CONFIG_NET_CLS_U32=m
+CONFIG_CLS_U32_PERF=y
+CONFIG_CLS_U32_MARK=y
+CONFIG_NET_CLS_RSVP=m
+CONFIG_NET_CLS_RSVP6=m
+CONFIG_NET_CLS_FLOW=m
+CONFIG_NET_CLS_CGROUP=y
+CONFIG_NET_CLS_BPF=m
+CONFIG_NET_CLS_FLOWER=m
+CONFIG_NET_CLS_MATCHALL=m
+CONFIG_NET_EMATCH=y
+CONFIG_NET_EMATCH_STACK=32
+CONFIG_NET_EMATCH_CMP=m
+CONFIG_NET_EMATCH_NBYTE=m
+CONFIG_NET_EMATCH_U32=m
+CONFIG_NET_EMATCH_META=m
+CONFIG_NET_EMATCH_TEXT=m
+CONFIG_NET_EMATCH_CANID=m
+CONFIG_NET_EMATCH_IPSET=m
+CONFIG_NET_EMATCH_IPT=m
+CONFIG_NET_CLS_ACT=y
+CONFIG_NET_ACT_POLICE=m
+CONFIG_NET_ACT_GACT=m
+CONFIG_GACT_PROB=y
+CONFIG_NET_ACT_MIRRED=m
+CONFIG_NET_ACT_SAMPLE=m
+CONFIG_NET_ACT_IPT=m
+CONFIG_NET_ACT_NAT=m
+CONFIG_NET_ACT_PEDIT=m
+CONFIG_NET_ACT_SIMP=m
+CONFIG_NET_ACT_SKBEDIT=m
+CONFIG_NET_ACT_CSUM=m
+CONFIG_NET_ACT_MPLS=m
+CONFIG_NET_ACT_VLAN=m
+CONFIG_NET_ACT_BPF=m
+CONFIG_NET_ACT_CONNMARK=m
+CONFIG_NET_ACT_CTINFO=m
+CONFIG_NET_ACT_SKBMOD=m
+CONFIG_NET_ACT_IFE=m
+CONFIG_NET_ACT_TUNNEL_KEY=m
+CONFIG_NET_ACT_CT=m
+CONFIG_NET_IFE_SKBMARK=m
+CONFIG_NET_IFE_SKBPRIO=m
+CONFIG_NET_IFE_SKBTCINDEX=m
+CONFIG_NET_TC_SKB_EXT=y
+CONFIG_NET_SCH_FIFO=y
+CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=m
+# CONFIG_BATMAN_ADV is not set
+CONFIG_OPENVSWITCH=m
+CONFIG_OPENVSWITCH_GRE=m
+CONFIG_OPENVSWITCH_VXLAN=m
+CONFIG_OPENVSWITCH_GENEVE=m
+CONFIG_VSOCKETS=m
+CONFIG_VSOCKETS_DIAG=m
+CONFIG_VMWARE_VMCI_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS=m
+CONFIG_VIRTIO_VSOCKETS_COMMON=m
+# CONFIG_HYPERV_VSOCKETS is not set
+CONFIG_NETLINK_DIAG=m
+CONFIG_MPLS=y
+CONFIG_NET_MPLS_GSO=m
+CONFIG_MPLS_ROUTING=m
+CONFIG_MPLS_IPTUNNEL=m
+CONFIG_NET_NSH=m
+CONFIG_HSR=m
+# CONFIG_NET_SWITCHDEV is not set
+CONFIG_NET_L3_MASTER_DEV=y
+# CONFIG_NET_NCSI is not set
+CONFIG_RPS=y
+CONFIG_RFS_ACCEL=y
+CONFIG_XPS=y
+CONFIG_CGROUP_NET_PRIO=y
+CONFIG_CGROUP_NET_CLASSID=y
+CONFIG_NET_RX_BUSY_POLL=y
+CONFIG_BQL=y
+CONFIG_BPF_JIT=y
+# CONFIG_BPF_STREAM_PARSER is not set
+CONFIG_NET_FLOW_LIMIT=y
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+CONFIG_NET_DROP_MONITOR=y
+# end of Network testing
+# end of Networking options
+
+CONFIG_HAMRADIO=y
+
+#
+# Packet Radio protocols
+#
+CONFIG_AX25=m
+CONFIG_AX25_DAMA_SLAVE=y
+CONFIG_NETROM=m
+CONFIG_ROSE=m
+
+#
+# AX.25 network device drivers
+#
+CONFIG_MKISS=m
+CONFIG_6PACK=m
+CONFIG_BPQETHER=m
+CONFIG_BAYCOM_SER_FDX=m
+CONFIG_BAYCOM_SER_HDX=m
+CONFIG_BAYCOM_PAR=m
+CONFIG_YAM=m
+# end of AX.25 network device drivers
+
+CONFIG_CAN=m
+CONFIG_CAN_RAW=m
+CONFIG_CAN_BCM=m
+CONFIG_CAN_GW=m
+CONFIG_CAN_J1939=m
+
+#
+# CAN Device Drivers
+#
+CONFIG_CAN_VCAN=m
+CONFIG_CAN_VXCAN=m
+CONFIG_CAN_SLCAN=m
+CONFIG_CAN_DEV=m
+CONFIG_CAN_CALC_BITTIMING=y
+CONFIG_CAN_JANZ_ICAN3=m
+CONFIG_CAN_KVASER_PCIEFD=m
+CONFIG_CAN_C_CAN=m
+CONFIG_CAN_C_CAN_PLATFORM=m
+CONFIG_CAN_C_CAN_PCI=m
+CONFIG_CAN_CC770=m
+CONFIG_CAN_CC770_ISA=m
+CONFIG_CAN_CC770_PLATFORM=m
+CONFIG_CAN_IFI_CANFD=m
+CONFIG_CAN_M_CAN=m
+CONFIG_CAN_M_CAN_PLATFORM=m
+CONFIG_CAN_M_CAN_TCAN4X5X=m
+CONFIG_CAN_PEAK_PCIEFD=m
+CONFIG_CAN_SJA1000=m
+CONFIG_CAN_EMS_PCI=m
+CONFIG_CAN_EMS_PCMCIA=m
+CONFIG_CAN_F81601=m
+CONFIG_CAN_KVASER_PCI=m
+CONFIG_CAN_PEAK_PCI=m
+CONFIG_CAN_PEAK_PCIEC=y
+CONFIG_CAN_PEAK_PCMCIA=m
+CONFIG_CAN_PLX_PCI=m
+CONFIG_CAN_SJA1000_ISA=m
+CONFIG_CAN_SJA1000_PLATFORM=m
+CONFIG_CAN_SOFTING=m
+CONFIG_CAN_SOFTING_CS=m
+
+#
+# CAN SPI interfaces
+#
+CONFIG_CAN_HI311X=m
+CONFIG_CAN_MCP251X=m
+# end of CAN SPI interfaces
+
+#
+# CAN USB interfaces
+#
+CONFIG_CAN_8DEV_USB=m
+CONFIG_CAN_EMS_USB=m
+CONFIG_CAN_ESD_USB2=m
+CONFIG_CAN_GS_USB=m
+CONFIG_CAN_KVASER_USB=m
+CONFIG_CAN_MCBA_USB=m
+CONFIG_CAN_PEAK_USB=m
+CONFIG_CAN_UCAN=m
+# end of CAN USB interfaces
+
+# CONFIG_CAN_DEBUG_DEVICES is not set
+# end of CAN Device Drivers
+
+CONFIG_BT=m
+CONFIG_BT_BREDR=y
+CONFIG_BT_RFCOMM=m
+CONFIG_BT_RFCOMM_TTY=y
+CONFIG_BT_BNEP=m
+CONFIG_BT_BNEP_MC_FILTER=y
+CONFIG_BT_BNEP_PROTO_FILTER=y
+CONFIG_BT_CMTP=m
+CONFIG_BT_HIDP=m
+CONFIG_BT_HS=y
+CONFIG_BT_LE=y
+CONFIG_BT_LEDS=y
+# CONFIG_BT_SELFTEST is not set
+# CONFIG_BT_DEBUGFS is not set
+
+#
+# Bluetooth device drivers
+#
+CONFIG_BT_INTEL=m
+CONFIG_BT_BCM=m
+CONFIG_BT_RTL=m
+CONFIG_BT_HCIBTUSB=m
+# CONFIG_BT_HCIBTUSB_AUTOSUSPEND is not set
+CONFIG_BT_HCIBTUSB_BCM=y
+CONFIG_BT_HCIBTUSB_MTK=y
+CONFIG_BT_HCIBTUSB_RTL=y
+CONFIG_BT_HCIBTSDIO=m
+CONFIG_BT_HCIUART=m
+CONFIG_BT_HCIUART_H4=y
+CONFIG_BT_HCIUART_BCSP=y
+CONFIG_BT_HCIUART_ATH3K=y
+CONFIG_BT_HCIUART_INTEL=y
+CONFIG_BT_HCIUART_AG6XX=y
+CONFIG_BT_HCIBCM203X=m
+CONFIG_BT_HCIBPA10X=m
+CONFIG_BT_HCIBFUSB=m
+CONFIG_BT_HCIDTL1=m
+CONFIG_BT_HCIBT3C=m
+CONFIG_BT_HCIBLUECARD=m
+CONFIG_BT_HCIVHCI=m
+CONFIG_BT_MRVL=m
+CONFIG_BT_MRVL_SDIO=m
+CONFIG_BT_ATH3K=m
+CONFIG_BT_MTKSDIO=m
+CONFIG_BT_HCIRSI=m
+# end of Bluetooth device drivers
+
+CONFIG_AF_RXRPC=m
+CONFIG_AF_RXRPC_IPV6=y
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
+CONFIG_AF_RXRPC_DEBUG=y
+CONFIG_RXKAD=y
+# CONFIG_AF_KCM is not set
+CONFIG_STREAM_PARSER=y
+CONFIG_FIB_RULES=y
+CONFIG_WIRELESS=y
+CONFIG_WIRELESS_EXT=y
+CONFIG_WEXT_CORE=y
+CONFIG_WEXT_PROC=y
+CONFIG_WEXT_SPY=y
+CONFIG_WEXT_PRIV=y
+CONFIG_CFG80211=m
+# CONFIG_NL80211_TESTMODE is not set
+# CONFIG_CFG80211_DEVELOPER_WARNINGS is not set
+# CONFIG_CFG80211_CERTIFICATION_ONUS is not set
+CONFIG_CFG80211_REQUIRE_SIGNED_REGDB=y
+CONFIG_CFG80211_USE_KERNEL_REGDB_KEYS=y
+CONFIG_CFG80211_DEFAULT_PS=y
+# CONFIG_CFG80211_DEBUGFS is not set
+CONFIG_CFG80211_CRDA_SUPPORT=y
+CONFIG_CFG80211_WEXT=y
+CONFIG_CFG80211_WEXT_EXPORT=y
+CONFIG_LIB80211=m
+CONFIG_LIB80211_CRYPT_WEP=m
+CONFIG_LIB80211_CRYPT_CCMP=m
+CONFIG_LIB80211_CRYPT_TKIP=m
+# CONFIG_LIB80211_DEBUG is not set
+CONFIG_MAC80211=m
+CONFIG_MAC80211_HAS_RC=y
+CONFIG_MAC80211_RC_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y
+CONFIG_MAC80211_RC_DEFAULT="minstrel_ht"
+CONFIG_MAC80211_MESH=y
+CONFIG_MAC80211_LEDS=y
+CONFIG_MAC80211_DEBUGFS=y
+# CONFIG_MAC80211_MESSAGE_TRACING is not set
+# CONFIG_MAC80211_DEBUG_MENU is not set
+CONFIG_MAC80211_STA_HASH_MAX_SIZE=0
+# CONFIG_WIMAX is not set
+CONFIG_RFKILL=m
+CONFIG_RFKILL_LEDS=y
+CONFIG_RFKILL_INPUT=y
+# CONFIG_RFKILL_GPIO is not set
+CONFIG_NET_9P=m
+CONFIG_NET_9P_VIRTIO=m
+CONFIG_NET_9P_XEN=m
+CONFIG_NET_9P_RDMA=m
+# CONFIG_NET_9P_DEBUG is not set
+# CONFIG_CAIF is not set
+CONFIG_CEPH_LIB=m
+# CONFIG_CEPH_LIB_PRETTYDEBUG is not set
+# CONFIG_CEPH_LIB_USE_DNS_RESOLVER is not set
+# CONFIG_NFC is not set
+CONFIG_PSAMPLE=m
+CONFIG_NET_IFE=m
+CONFIG_LWTUNNEL=y
+CONFIG_LWTUNNEL_BPF=y
+CONFIG_DST_CACHE=y
+CONFIG_GRO_CELLS=y
+CONFIG_NET_SOCK_MSG=y
+CONFIG_NET_DEVLINK=y
+CONFIG_PAGE_POOL=y
+CONFIG_FAILOVER=m
+CONFIG_HAVE_EBPF_JIT=y
+
+#
+# Device Drivers
+#
+CONFIG_HAVE_EISA=y
+# CONFIG_EISA is not set
+CONFIG_HAVE_PCI=y
+CONFIG_PCI=y
+CONFIG_PCI_DOMAINS=y
+CONFIG_PCIEPORTBUS=y
+CONFIG_HOTPLUG_PCI_PCIE=y
+CONFIG_PCIEAER=y
+# CONFIG_PCIEAER_INJECT is not set
+CONFIG_PCIE_ECRC=y
+CONFIG_PCIEASPM=y
+# CONFIG_PCIEASPM_DEBUG is not set
+CONFIG_PCIEASPM_DEFAULT=y
+# CONFIG_PCIEASPM_POWERSAVE is not set
+# CONFIG_PCIEASPM_POWER_SUPERSAVE is not set
+# CONFIG_PCIEASPM_PERFORMANCE is not set
+CONFIG_PCIE_PME=y
+# CONFIG_PCIE_DPC is not set
+# CONFIG_PCIE_PTM is not set
+# CONFIG_PCIE_BW is not set
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MSI_IRQ_DOMAIN=y
+CONFIG_PCI_QUIRKS=y
+# CONFIG_PCI_DEBUG is not set
+# CONFIG_PCI_REALLOC_ENABLE_AUTO is not set
+CONFIG_PCI_STUB=y
+# CONFIG_PCI_PF_STUB is not set
+CONFIG_XEN_PCIDEV_FRONTEND=m
+CONFIG_PCI_ATS=y
+CONFIG_PCI_LOCKLESS_CONFIG=y
+CONFIG_PCI_IOV=y
+CONFIG_PCI_PRI=y
+CONFIG_PCI_PASID=y
+# CONFIG_PCI_P2PDMA is not set
+CONFIG_PCI_LABEL=y
+CONFIG_PCI_HYPERV=m
+CONFIG_HOTPLUG_PCI=y
+CONFIG_HOTPLUG_PCI_ACPI=y
+CONFIG_HOTPLUG_PCI_ACPI_IBM=m
+# CONFIG_HOTPLUG_PCI_CPCI is not set
+# CONFIG_HOTPLUG_PCI_SHPC is not set
+
+#
+# PCI controller drivers
+#
+
+#
+# Cadence PCIe controllers support
+#
+# end of Cadence PCIe controllers support
+
+CONFIG_VMD=m
+CONFIG_PCI_HYPERV_INTERFACE=m
+
+#
+# DesignWare PCI Core Support
+#
+CONFIG_PCIE_DW=y
+CONFIG_PCIE_DW_HOST=y
+CONFIG_PCIE_DW_PLAT=y
+CONFIG_PCIE_DW_PLAT_HOST=y
+# CONFIG_PCI_MESON is not set
+# end of DesignWare PCI Core Support
+# end of PCI controller drivers
+
+#
+# PCI Endpoint
+#
+# CONFIG_PCI_ENDPOINT is not set
+# end of PCI Endpoint
+
+#
+# PCI switch controller drivers
+#
+CONFIG_PCI_SW_SWITCHTEC=m
+# end of PCI switch controller drivers
+
+CONFIG_PCCARD=y
+CONFIG_PCMCIA=m
+CONFIG_PCMCIA_LOAD_CIS=y
+CONFIG_CARDBUS=y
+
+#
+# PC-card bridges
+#
+CONFIG_YENTA=m
+CONFIG_YENTA_O2=y
+CONFIG_YENTA_RICOH=y
+CONFIG_YENTA_TI=y
+CONFIG_YENTA_ENE_TUNE=y
+CONFIG_YENTA_TOSHIBA=y
+CONFIG_PD6729=m
+CONFIG_I82092=m
+CONFIG_PCCARD_NONSTATIC=y
+# CONFIG_RAPIDIO is not set
+
+#
+# Generic Driver Options
+#
+CONFIG_UEVENT_HELPER=y
+CONFIG_UEVENT_HELPER_PATH=""
+CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+
+#
+# Firmware loader
+#
+CONFIG_FW_LOADER=y
+CONFIG_FW_LOADER_PAGED_BUF=y
+CONFIG_EXTRA_FIRMWARE=""
+CONFIG_FW_LOADER_USER_HELPER=y
+# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set
+# CONFIG_FW_LOADER_COMPRESS is not set
+# end of Firmware loader
+
+CONFIG_WANT_DEV_COREDUMP=y
+CONFIG_ALLOW_DEV_COREDUMP=y
+CONFIG_DEV_COREDUMP=y
+# CONFIG_DEBUG_DRIVER is not set
+# CONFIG_DEBUG_DEVRES is not set
+# CONFIG_DEBUG_TEST_DRIVER_REMOVE is not set
+# CONFIG_TEST_ASYNC_DRIVER_PROBE is not set
+CONFIG_SYS_HYPERVISOR=y
+CONFIG_GENERIC_CPU_AUTOPROBE=y
+CONFIG_GENERIC_CPU_VULNERABILITIES=y
+CONFIG_REGMAP=y
+CONFIG_REGMAP_I2C=y
+CONFIG_REGMAP_SPI=y
+CONFIG_REGMAP_MMIO=y
+CONFIG_REGMAP_IRQ=y
+CONFIG_DMA_SHARED_BUFFER=y
+# CONFIG_DMA_FENCE_TRACE is not set
+# end of Generic Driver Options
+
+#
+# Bus devices
+#
+# end of Bus devices
+
+CONFIG_CONNECTOR=y
+CONFIG_PROC_EVENTS=y
+# CONFIG_GNSS is not set
+CONFIG_MTD=m
+# CONFIG_MTD_TESTS is not set
+
+#
+# Partition parsers
+#
+# CONFIG_MTD_AR7_PARTS is not set
+# CONFIG_MTD_CMDLINE_PARTS is not set
+# CONFIG_MTD_REDBOOT_PARTS is not set
+# end of Partition parsers
+
+#
+# User Modules And Translation Layers
+#
+CONFIG_MTD_BLKDEVS=m
+CONFIG_MTD_BLOCK=m
+# CONFIG_MTD_BLOCK_RO is not set
+# CONFIG_FTL is not set
+# CONFIG_NFTL is not set
+# CONFIG_INFTL is not set
+# CONFIG_RFD_FTL is not set
+# CONFIG_SSFDC is not set
+# CONFIG_SM_FTL is not set
+# CONFIG_MTD_OOPS is not set
+# CONFIG_MTD_SWAP is not set
+# CONFIG_MTD_PARTITIONED_MASTER is not set
+
+#
+# RAM/ROM/Flash chip drivers
+#
+# CONFIG_MTD_CFI is not set
+# CONFIG_MTD_JEDECPROBE is not set
+CONFIG_MTD_MAP_BANK_WIDTH_1=y
+CONFIG_MTD_MAP_BANK_WIDTH_2=y
+CONFIG_MTD_MAP_BANK_WIDTH_4=y
+CONFIG_MTD_CFI_I1=y
+CONFIG_MTD_CFI_I2=y
+# CONFIG_MTD_RAM is not set
+# CONFIG_MTD_ROM is not set
+# CONFIG_MTD_ABSENT is not set
+# end of RAM/ROM/Flash chip drivers
+
+#
+# Mapping drivers for chip access
+#
+# CONFIG_MTD_COMPLEX_MAPPINGS is not set
+# CONFIG_MTD_INTEL_VR_NOR is not set
+# CONFIG_MTD_PLATRAM is not set
+# end of Mapping drivers for chip access
+
+#
+# Self-contained MTD device drivers
+#
+# CONFIG_MTD_PMC551 is not set
+# CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_MCHP23K256 is not set
+# CONFIG_MTD_SST25L is not set
+# CONFIG_MTD_SLRAM is not set
+# CONFIG_MTD_PHRAM is not set
+# CONFIG_MTD_MTDRAM is not set
+# CONFIG_MTD_BLOCK2MTD is not set
+
+#
+# Disk-On-Chip Device Drivers
+#
+# CONFIG_MTD_DOCG3 is not set
+# end of Self-contained MTD device drivers
+
+# CONFIG_MTD_ONENAND is not set
+# CONFIG_MTD_RAW_NAND is not set
+# CONFIG_MTD_SPI_NAND is not set
+
+#
+# LPDDR & LPDDR2 PCM memory drivers
+#
+# CONFIG_MTD_LPDDR is not set
+# end of LPDDR & LPDDR2 PCM memory drivers
+
+CONFIG_MTD_SPI_NOR=m
+CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y
+# CONFIG_SPI_MTK_QUADSPI is not set
+# CONFIG_SPI_INTEL_SPI_PCI is not set
+# CONFIG_SPI_INTEL_SPI_PLATFORM is not set
+CONFIG_MTD_UBI=m
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+# CONFIG_MTD_UBI_GLUEBI is not set
+# CONFIG_MTD_UBI_BLOCK is not set
+# CONFIG_MTD_HYPERBUS is not set
+# CONFIG_OF is not set
+CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_PARPORT=m
+CONFIG_PARPORT_PC=m
+CONFIG_PARPORT_SERIAL=m
+# CONFIG_PARPORT_PC_FIFO is not set
+# CONFIG_PARPORT_PC_SUPERIO is not set
+# CONFIG_PARPORT_PC_PCMCIA is not set
+# CONFIG_PARPORT_AX88796 is not set
+CONFIG_PARPORT_1284=y
+CONFIG_PARPORT_NOT_PC=y
+CONFIG_PNP=y
+# CONFIG_PNP_DEBUG_MESSAGES is not set
+
+#
+# Protocols
+#
+CONFIG_PNPACPI=y
+CONFIG_BLK_DEV=y
+CONFIG_BLK_DEV_NULL_BLK=m
+CONFIG_BLK_DEV_FD=m
+CONFIG_CDROM=m
+# CONFIG_PARIDE is not set
+CONFIG_BLK_DEV_PCIESSD_MTIP32XX=m
+CONFIG_ZRAM=m
+# CONFIG_ZRAM_WRITEBACK is not set
+# CONFIG_ZRAM_MEMORY_TRACKING is not set
+CONFIG_BLK_DEV_UMEM=m
+CONFIG_BLK_DEV_LOOP=m
+CONFIG_BLK_DEV_LOOP_MIN_COUNT=0
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_DRBD=m
+# CONFIG_DRBD_FAULT_INJECTION is not set
+CONFIG_BLK_DEV_NBD=m
+CONFIG_BLK_DEV_SKD=m
+CONFIG_BLK_DEV_SX8=m
+CONFIG_BLK_DEV_RAM=m
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=16384
+CONFIG_CDROM_PKTCDVD=m
+CONFIG_CDROM_PKTCDVD_BUFFERS=8
+# CONFIG_CDROM_PKTCDVD_WCACHE is not set
+CONFIG_ATA_OVER_ETH=m
+CONFIG_XEN_BLKDEV_FRONTEND=m
+CONFIG_XEN_BLKDEV_BACKEND=m
+CONFIG_VIRTIO_BLK=m
+# CONFIG_VIRTIO_BLK_SCSI is not set
+CONFIG_BLK_DEV_RBD=m
+CONFIG_BLK_DEV_RSXX=m
+
+#
+# NVME Support
+#
+CONFIG_NVME_CORE=m
+CONFIG_BLK_DEV_NVME=m
+CONFIG_NVME_MULTIPATH=y
+CONFIG_NVME_FABRICS=m
+CONFIG_NVME_RDMA=m
+CONFIG_NVME_FC=m
+CONFIG_NVME_TCP=m
+CONFIG_NVME_TARGET=m
+CONFIG_NVME_TARGET_LOOP=m
+CONFIG_NVME_TARGET_RDMA=m
+CONFIG_NVME_TARGET_FC=m
+CONFIG_NVME_TARGET_FCLOOP=m
+CONFIG_NVME_TARGET_TCP=m
+# end of NVME Support
+
+#
+# Misc devices
+#
+CONFIG_SENSORS_LIS3LV02D=m
+# CONFIG_AD525X_DPOT is not set
+# CONFIG_DUMMY_IRQ is not set
+# CONFIG_IBM_ASM is not set
+# CONFIG_PHANTOM is not set
+CONFIG_TIFM_CORE=m
+CONFIG_TIFM_7XX1=m
+# CONFIG_ICS932S401 is not set
+CONFIG_ENCLOSURE_SERVICES=m
+CONFIG_SGI_XP=m
+CONFIG_HP_ILO=m
+CONFIG_SGI_GRU=m
+# CONFIG_SGI_GRU_DEBUG is not set
+CONFIG_APDS9802ALS=m
+CONFIG_ISL29003=m
+CONFIG_ISL29020=m
+CONFIG_SENSORS_TSL2550=m
+CONFIG_SENSORS_BH1770=m
+CONFIG_SENSORS_APDS990X=m
+# CONFIG_HMC6352 is not set
+# CONFIG_DS1682 is not set
+CONFIG_VMWARE_BALLOON=m
+# CONFIG_LATTICE_ECP3_CONFIG is not set
+# CONFIG_SRAM is not set
+# CONFIG_PCI_ENDPOINT_TEST is not set
+# CONFIG_XILINX_SDFEC is not set
+CONFIG_MISC_RTSX=m
+CONFIG_PVPANIC=y
+# CONFIG_C2PORT is not set
+
+#
+# EEPROM support
+#
+CONFIG_EEPROM_AT24=m
+CONFIG_EEPROM_AT25=m
+CONFIG_EEPROM_LEGACY=m
+CONFIG_EEPROM_MAX6875=m
+CONFIG_EEPROM_93CX6=m
+CONFIG_EEPROM_93XX46=m
+CONFIG_EEPROM_IDT_89HPESX=m
+CONFIG_EEPROM_EE1004=m
+# end of EEPROM support
+
+CONFIG_CB710_CORE=m
+# CONFIG_CB710_DEBUG is not set
+CONFIG_CB710_DEBUG_ASSUMPTIONS=y
+
+#
+# Texas Instruments shared transport line discipline
+#
+# CONFIG_TI_ST is not set
+# end of Texas Instruments shared transport line discipline
+
+CONFIG_SENSORS_LIS3_I2C=m
+CONFIG_ALTERA_STAPL=m
+CONFIG_INTEL_MEI=m
+CONFIG_INTEL_MEI_ME=m
+# CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MEI_HDCP is not set
+CONFIG_VMWARE_VMCI=m
+
+#
+# Intel MIC & related support
+#
+
+#
+# Intel MIC Bus Driver
+#
+# CONFIG_INTEL_MIC_BUS is not set
+
+#
+# SCIF Bus Driver
+#
+# CONFIG_SCIF_BUS is not set
+
+#
+# VOP Bus Driver
+#
+# CONFIG_VOP_BUS is not set
+
+#
+# Intel MIC Host Driver
+#
+
+#
+# Intel MIC Card Driver
+#
+
+#
+# SCIF Driver
+#
+
+#
+# Intel MIC Coprocessor State Management (COSM) Drivers
+#
+
+#
+# VOP Driver
+#
+# end of Intel MIC & related support
+
+# CONFIG_GENWQE is not set
+# CONFIG_ECHO is not set
+# CONFIG_MISC_ALCOR_PCI is not set
+CONFIG_MISC_RTSX_PCI=m
+CONFIG_MISC_RTSX_USB=m
+# CONFIG_HABANA_AI is not set
+# end of Misc devices
+
+CONFIG_HAVE_IDE=y
+# CONFIG_IDE is not set
+
+#
+# SCSI device support
+#
+CONFIG_SCSI_MOD=y
+CONFIG_RAID_ATTRS=m
+CONFIG_SCSI=y
+CONFIG_SCSI_DMA=y
+CONFIG_SCSI_NETLINK=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=m
+CONFIG_CHR_DEV_ST=m
+CONFIG_BLK_DEV_SR=m
+CONFIG_BLK_DEV_SR_VENDOR=y
+CONFIG_CHR_DEV_SG=m
+CONFIG_CHR_DEV_SCH=m
+CONFIG_SCSI_ENCLOSURE=m
+CONFIG_SCSI_CONSTANTS=y
+CONFIG_SCSI_LOGGING=y
+# CONFIG_SCSI_SCAN_ASYNC is not set
+
+#
+# SCSI Transports
+#
+CONFIG_SCSI_SPI_ATTRS=m
+CONFIG_SCSI_FC_ATTRS=m
+CONFIG_SCSI_ISCSI_ATTRS=m
+CONFIG_SCSI_SAS_ATTRS=m
+CONFIG_SCSI_SAS_LIBSAS=m
+CONFIG_SCSI_SAS_ATA=y
+CONFIG_SCSI_SAS_HOST_SMP=y
+CONFIG_SCSI_SRP_ATTRS=m
+# end of SCSI Transports
+
+CONFIG_SCSI_LOWLEVEL=y
+CONFIG_ISCSI_TCP=m
+CONFIG_ISCSI_BOOT_SYSFS=m
+CONFIG_SCSI_CXGB3_ISCSI=m
+CONFIG_SCSI_CXGB4_ISCSI=m
+CONFIG_SCSI_BNX2_ISCSI=m
+CONFIG_SCSI_BNX2X_FCOE=m
+CONFIG_BE2ISCSI=m
+CONFIG_BLK_DEV_3W_XXXX_RAID=m
+CONFIG_SCSI_HPSA=m
+CONFIG_SCSI_3W_9XXX=m
+CONFIG_SCSI_3W_SAS=m
+CONFIG_SCSI_ACARD=m
+CONFIG_SCSI_AACRAID=m
+CONFIG_SCSI_AIC7XXX=m
+CONFIG_AIC7XXX_CMDS_PER_DEVICE=32
+CONFIG_AIC7XXX_RESET_DELAY_MS=5000
+# CONFIG_AIC7XXX_DEBUG_ENABLE is not set
+CONFIG_AIC7XXX_DEBUG_MASK=0
+# CONFIG_AIC7XXX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC79XX=m
+CONFIG_AIC79XX_CMDS_PER_DEVICE=4
+CONFIG_AIC79XX_RESET_DELAY_MS=15000
+# CONFIG_AIC79XX_DEBUG_ENABLE is not set
+CONFIG_AIC79XX_DEBUG_MASK=0
+# CONFIG_AIC79XX_REG_PRETTY_PRINT is not set
+CONFIG_SCSI_AIC94XX=m
+# CONFIG_AIC94XX_DEBUG is not set
+CONFIG_SCSI_MVSAS=m
+# CONFIG_SCSI_MVSAS_DEBUG is not set
+CONFIG_SCSI_MVSAS_TASKLET=y
+CONFIG_SCSI_MVUMI=m
+CONFIG_SCSI_DPT_I2O=m
+CONFIG_SCSI_ADVANSYS=m
+CONFIG_SCSI_ARCMSR=m
+CONFIG_SCSI_ESAS2R=m
+CONFIG_MEGARAID_NEWGEN=y
+CONFIG_MEGARAID_MM=m
+CONFIG_MEGARAID_MAILBOX=m
+CONFIG_MEGARAID_LEGACY=m
+CONFIG_MEGARAID_SAS=m
+CONFIG_SCSI_MPT3SAS=m
+CONFIG_SCSI_MPT2SAS_MAX_SGE=128
+CONFIG_SCSI_MPT3SAS_MAX_SGE=128
+CONFIG_SCSI_MPT2SAS=m
+CONFIG_SCSI_SMARTPQI=m
+CONFIG_SCSI_UFSHCD=m
+CONFIG_SCSI_UFSHCD_PCI=m
+# CONFIG_SCSI_UFS_DWC_TC_PCI is not set
+# CONFIG_SCSI_UFSHCD_PLATFORM is not set
+# CONFIG_SCSI_UFS_BSG is not set
+CONFIG_SCSI_HPTIOP=m
+CONFIG_SCSI_BUSLOGIC=m
+# CONFIG_SCSI_FLASHPOINT is not set
+CONFIG_SCSI_MYRB=m
+CONFIG_SCSI_MYRS=m
+CONFIG_VMWARE_PVSCSI=m
+CONFIG_XEN_SCSI_FRONTEND=m
+CONFIG_HYPERV_STORAGE=m
+CONFIG_LIBFC=m
+CONFIG_LIBFCOE=m
+CONFIG_FCOE=m
+CONFIG_FCOE_FNIC=m
+CONFIG_SCSI_SNIC=m
+# CONFIG_SCSI_SNIC_DEBUG_FS is not set
+CONFIG_SCSI_DMX3191D=m
+# CONFIG_SCSI_FDOMAIN_PCI is not set
+CONFIG_SCSI_GDTH=m
+CONFIG_SCSI_ISCI=m
+CONFIG_SCSI_IPS=m
+CONFIG_SCSI_INITIO=m
+CONFIG_SCSI_INIA100=m
+# CONFIG_SCSI_PPA is not set
+# CONFIG_SCSI_IMM is not set
+CONFIG_SCSI_STEX=m
+CONFIG_SCSI_SYM53C8XX_2=m
+CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1
+CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
+CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
+CONFIG_SCSI_SYM53C8XX_MMIO=y
+CONFIG_SCSI_IPR=m
+CONFIG_SCSI_IPR_TRACE=y
+CONFIG_SCSI_IPR_DUMP=y
+CONFIG_SCSI_QLOGIC_1280=m
+CONFIG_SCSI_QLA_FC=m
+CONFIG_TCM_QLA2XXX=m
+# CONFIG_TCM_QLA2XXX_DEBUG is not set
+CONFIG_SCSI_QLA_ISCSI=m
+# CONFIG_QEDI is not set
+# CONFIG_QEDF is not set
+CONFIG_SCSI_LPFC=m
+# CONFIG_SCSI_LPFC_DEBUG_FS is not set
+CONFIG_SCSI_DC395x=m
+CONFIG_SCSI_AM53C974=m
+CONFIG_SCSI_WD719X=m
+CONFIG_SCSI_DEBUG=m
+CONFIG_SCSI_PMCRAID=m
+CONFIG_SCSI_PM8001=m
+CONFIG_SCSI_BFA_FC=m
+CONFIG_SCSI_VIRTIO=m
+CONFIG_SCSI_CHELSIO_FCOE=m
+# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
+CONFIG_SCSI_DH=y
+CONFIG_SCSI_DH_RDAC=y
+CONFIG_SCSI_DH_HP_SW=y
+CONFIG_SCSI_DH_EMC=y
+CONFIG_SCSI_DH_ALUA=y
+# end of SCSI device support
+
+CONFIG_ATA=m
+CONFIG_ATA_VERBOSE_ERROR=y
+CONFIG_ATA_ACPI=y
+# CONFIG_SATA_ZPODD is not set
+CONFIG_SATA_PMP=y
+
+#
+# Controllers with non-SFF native interface
+#
+CONFIG_SATA_AHCI=m
+CONFIG_SATA_MOBILE_LPM_POLICY=0
+CONFIG_SATA_AHCI_PLATFORM=m
+CONFIG_SATA_INIC162X=m
+CONFIG_SATA_ACARD_AHCI=m
+CONFIG_SATA_SIL24=m
+CONFIG_ATA_SFF=y
+
+#
+# SFF controllers with custom DMA interface
+#
+CONFIG_PDC_ADMA=m
+CONFIG_SATA_QSTOR=m
+CONFIG_SATA_SX4=m
+CONFIG_ATA_BMDMA=y
+
+#
+# SATA SFF controllers with BMDMA
+#
+CONFIG_ATA_PIIX=m
+CONFIG_SATA_DWC=m
+# CONFIG_SATA_DWC_OLD_DMA is not set
+# CONFIG_SATA_DWC_DEBUG is not set
+CONFIG_SATA_MV=m
+CONFIG_SATA_NV=m
+CONFIG_SATA_PROMISE=m
+CONFIG_SATA_SIL=m
+CONFIG_SATA_SIS=m
+CONFIG_SATA_SVW=m
+CONFIG_SATA_ULI=m
+CONFIG_SATA_VIA=m
+CONFIG_SATA_VITESSE=m
+
+#
+# PATA SFF controllers with BMDMA
+#
+CONFIG_PATA_ALI=m
+CONFIG_PATA_AMD=m
+CONFIG_PATA_ARTOP=m
+CONFIG_PATA_ATIIXP=m
+CONFIG_PATA_ATP867X=m
+CONFIG_PATA_CMD64X=m
+CONFIG_PATA_CYPRESS=m
+CONFIG_PATA_EFAR=m
+CONFIG_PATA_HPT366=m
+CONFIG_PATA_HPT37X=m
+CONFIG_PATA_HPT3X2N=m
+CONFIG_PATA_HPT3X3=m
+# CONFIG_PATA_HPT3X3_DMA is not set
+CONFIG_PATA_IT8213=m
+CONFIG_PATA_IT821X=m
+CONFIG_PATA_JMICRON=m
+CONFIG_PATA_MARVELL=m
+CONFIG_PATA_NETCELL=m
+CONFIG_PATA_NINJA32=m
+CONFIG_PATA_NS87415=m
+CONFIG_PATA_OLDPIIX=m
+CONFIG_PATA_OPTIDMA=m
+CONFIG_PATA_PDC2027X=m
+CONFIG_PATA_PDC_OLD=m
+CONFIG_PATA_RADISYS=m
+CONFIG_PATA_RDC=m
+CONFIG_PATA_SCH=m
+CONFIG_PATA_SERVERWORKS=m
+CONFIG_PATA_SIL680=m
+CONFIG_PATA_SIS=m
+CONFIG_PATA_TOSHIBA=m
+CONFIG_PATA_TRIFLEX=m
+CONFIG_PATA_VIA=m
+CONFIG_PATA_WINBOND=m
+
+#
+# PIO-only SFF controllers
+#
+CONFIG_PATA_CMD640_PCI=m
+CONFIG_PATA_MPIIX=m
+CONFIG_PATA_NS87410=m
+CONFIG_PATA_OPTI=m
+CONFIG_PATA_PCMCIA=m
+# CONFIG_PATA_PLATFORM is not set
+CONFIG_PATA_RZ1000=m
+
+#
+# Generic fallback / legacy drivers
+#
+CONFIG_PATA_ACPI=m
+CONFIG_ATA_GENERIC=m
+CONFIG_PATA_LEGACY=m
+CONFIG_MD=y
+CONFIG_BLK_DEV_MD=y
+CONFIG_MD_AUTODETECT=y
+CONFIG_MD_LINEAR=m
+CONFIG_MD_RAID0=m
+CONFIG_MD_RAID1=m
+CONFIG_MD_RAID10=m
+CONFIG_MD_RAID456=m
+# CONFIG_MD_MULTIPATH is not set
+# CONFIG_MD_FAULTY is not set
+CONFIG_MD_CLUSTER=m
+CONFIG_BCACHE=m
+# CONFIG_BCACHE_DEBUG is not set
+# CONFIG_BCACHE_CLOSURES_DEBUG is not set
+CONFIG_BLK_DEV_DM_BUILTIN=y
+CONFIG_BLK_DEV_DM=m
+CONFIG_DM_DEBUG=y
+CONFIG_DM_BUFIO=m
+# CONFIG_DM_DEBUG_BLOCK_MANAGER_LOCKING is not set
+CONFIG_DM_BIO_PRISON=m
+CONFIG_DM_PERSISTENT_DATA=m
+CONFIG_DM_UNSTRIPED=m
+CONFIG_DM_CRYPT=m
+CONFIG_DM_SNAPSHOT=m
+CONFIG_DM_THIN_PROVISIONING=m
+CONFIG_DM_CACHE=m
+CONFIG_DM_CACHE_SMQ=m
+CONFIG_DM_WRITECACHE=m
+CONFIG_DM_ERA=m
+CONFIG_DM_CLONE=m
+CONFIG_DM_MIRROR=m
+CONFIG_DM_LOG_USERSPACE=m
+CONFIG_DM_RAID=m
+CONFIG_DM_ZERO=m
+CONFIG_DM_MULTIPATH=m
+CONFIG_DM_MULTIPATH_QL=m
+CONFIG_DM_MULTIPATH_ST=m
+CONFIG_DM_DELAY=m
+# CONFIG_DM_DUST is not set
+CONFIG_DM_UEVENT=y
+# CONFIG_DM_FLAKEY is not set
+CONFIG_DM_VERITY=m
+# CONFIG_DM_VERITY_VERIFY_ROOTHASH_SIG is not set
+CONFIG_DM_VERITY_FEC=y
+CONFIG_DM_SWITCH=m
+# CONFIG_DM_LOG_WRITES is not set
+CONFIG_DM_INTEGRITY=m
+CONFIG_DM_ZONED=m
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_TCM_USER2=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_TCM_FC=m
+CONFIG_ISCSI_TARGET=m
+CONFIG_ISCSI_TARGET_CXGB4=m
+CONFIG_SBP_TARGET=m
+CONFIG_FUSION=y
+CONFIG_FUSION_SPI=m
+CONFIG_FUSION_FC=m
+CONFIG_FUSION_SAS=m
+CONFIG_FUSION_MAX_SGE=128
+CONFIG_FUSION_CTL=m
+CONFIG_FUSION_LAN=m
+CONFIG_FUSION_LOGGING=y
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_FIREWIRE=m
+CONFIG_FIREWIRE_OHCI=m
+CONFIG_FIREWIRE_SBP2=m
+CONFIG_FIREWIRE_NET=m
+# CONFIG_FIREWIRE_NOSY is not set
+# end of IEEE 1394 (FireWire) support
+
+CONFIG_MACINTOSH_DRIVERS=y
+CONFIG_MAC_EMUMOUSEBTN=y
+CONFIG_NETDEVICES=y
+CONFIG_MII=m
+CONFIG_NET_CORE=y
+CONFIG_BONDING=m
+CONFIG_DUMMY=m
+# CONFIG_EQUALIZER is not set
+CONFIG_NET_FC=y
+CONFIG_IFB=m
+CONFIG_NET_TEAM=m
+CONFIG_NET_TEAM_MODE_BROADCAST=m
+CONFIG_NET_TEAM_MODE_ROUNDROBIN=m
+CONFIG_NET_TEAM_MODE_RANDOM=m
+CONFIG_NET_TEAM_MODE_ACTIVEBACKUP=m
+CONFIG_NET_TEAM_MODE_LOADBALANCE=m
+CONFIG_MACVLAN=m
+CONFIG_MACVTAP=m
+CONFIG_IPVLAN_L3S=y
+CONFIG_IPVLAN=m
+CONFIG_IPVTAP=m
+CONFIG_VXLAN=m
+CONFIG_GENEVE=m
+CONFIG_GTP=m
+CONFIG_MACSEC=m
+CONFIG_NETCONSOLE=m
+CONFIG_NETCONSOLE_DYNAMIC=y
+CONFIG_NETPOLL=y
+CONFIG_NET_POLL_CONTROLLER=y
+CONFIG_NTB_NETDEV=m
+CONFIG_TUN=m
+CONFIG_TAP=m
+# CONFIG_TUN_VNET_CROSS_LE is not set
+CONFIG_VETH=m
+CONFIG_VIRTIO_NET=m
+CONFIG_NLMON=m
+CONFIG_NET_VRF=m
+CONFIG_VSOCKMON=m
+CONFIG_SUNGEM_PHY=m
+# CONFIG_ARCNET is not set
+# CONFIG_ATM_DRIVERS is not set
+
+#
+# CAIF transport drivers
+#
+
+#
+# Distributed Switch Architecture drivers
+#
+# end of Distributed Switch Architecture drivers
+
+CONFIG_ETHERNET=y
+CONFIG_MDIO=m
+CONFIG_NET_VENDOR_3COM=y
+CONFIG_PCMCIA_3C574=m
+CONFIG_PCMCIA_3C589=m
+CONFIG_VORTEX=m
+CONFIG_TYPHOON=m
+CONFIG_NET_VENDOR_ADAPTEC=y
+CONFIG_ADAPTEC_STARFIRE=m
+CONFIG_NET_VENDOR_AGERE=y
+CONFIG_ET131X=m
+CONFIG_NET_VENDOR_ALACRITECH=y
+CONFIG_SLICOSS=m
+CONFIG_NET_VENDOR_ALTEON=y
+CONFIG_ACENIC=m
+# CONFIG_ACENIC_OMIT_TIGON_I is not set
+CONFIG_ALTERA_TSE=m
+CONFIG_NET_VENDOR_AMAZON=y
+CONFIG_ENA_ETHERNET=m
+CONFIG_NET_VENDOR_AMD=y
+CONFIG_AMD8111_ETH=m
+CONFIG_PCNET32=m
+CONFIG_PCMCIA_NMCLAN=m
+CONFIG_AMD_XGBE=m
+# CONFIG_AMD_XGBE_DCB is not set
+CONFIG_AMD_XGBE_HAVE_ECC=y
+CONFIG_NET_VENDOR_AQUANTIA=y
+CONFIG_AQTION=m
+CONFIG_NET_VENDOR_ARC=y
+CONFIG_NET_VENDOR_ATHEROS=y
+CONFIG_ATL2=m
+CONFIG_ATL1=m
+CONFIG_ATL1E=m
+CONFIG_ATL1C=m
+CONFIG_ALX=m
+CONFIG_NET_VENDOR_AURORA=y
+CONFIG_AURORA_NB8800=m
+CONFIG_NET_VENDOR_BROADCOM=y
+CONFIG_B44=m
+CONFIG_B44_PCI_AUTOSELECT=y
+CONFIG_B44_PCICORE_AUTOSELECT=y
+CONFIG_B44_PCI=y
+CONFIG_BCMGENET=m
+CONFIG_BNX2=m
+CONFIG_CNIC=m
+CONFIG_TIGON3=m
+CONFIG_TIGON3_HWMON=y
+CONFIG_BNX2X=m
+CONFIG_BNX2X_SRIOV=y
+CONFIG_SYSTEMPORT=m
+CONFIG_BNXT=m
+CONFIG_BNXT_SRIOV=y
+CONFIG_BNXT_FLOWER_OFFLOAD=y
+# CONFIG_BNXT_DCB is not set
+# CONFIG_BNXT_HWMON is not set
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
+CONFIG_NET_VENDOR_CADENCE=y
+CONFIG_MACB=m
+CONFIG_MACB_USE_HWSTAMP=y
+CONFIG_MACB_PCI=m
+CONFIG_NET_VENDOR_CAVIUM=y
+CONFIG_THUNDER_NIC_PF=m
+CONFIG_THUNDER_NIC_VF=m
+CONFIG_THUNDER_NIC_BGX=m
+CONFIG_THUNDER_NIC_RGX=m
+CONFIG_CAVIUM_PTP=m
+CONFIG_LIQUIDIO=m
+CONFIG_LIQUIDIO_VF=m
+CONFIG_NET_VENDOR_CHELSIO=y
+CONFIG_CHELSIO_T1=m
+CONFIG_CHELSIO_T1_1G=y
+CONFIG_CHELSIO_T3=m
+CONFIG_CHELSIO_T4=m
+# CONFIG_CHELSIO_T4_DCB is not set
+CONFIG_CHELSIO_T4VF=m
+CONFIG_CHELSIO_LIB=m
+CONFIG_NET_VENDOR_CISCO=y
+CONFIG_ENIC=m
+CONFIG_NET_VENDOR_CORTINA=y
+CONFIG_CX_ECAT=m
+CONFIG_DNET=m
+CONFIG_NET_VENDOR_DEC=y
+CONFIG_NET_TULIP=y
+CONFIG_DE2104X=m
+CONFIG_DE2104X_DSL=0
+CONFIG_TULIP=m
+# CONFIG_TULIP_MWI is not set
+CONFIG_TULIP_MMIO=y
+CONFIG_TULIP_NAPI=y
+CONFIG_TULIP_NAPI_HW_MITIGATION=y
+CONFIG_DE4X5=m
+CONFIG_WINBOND_840=m
+CONFIG_DM9102=m
+CONFIG_ULI526X=m
+CONFIG_PCMCIA_XIRCOM=m
+CONFIG_NET_VENDOR_DLINK=y
+CONFIG_DL2K=m
+CONFIG_SUNDANCE=m
+# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_NET_VENDOR_EMULEX=y
+CONFIG_BE2NET=m
+CONFIG_BE2NET_HWMON=y
+CONFIG_BE2NET_BE2=y
+CONFIG_BE2NET_BE3=y
+CONFIG_BE2NET_LANCER=y
+CONFIG_BE2NET_SKYHAWK=y
+CONFIG_NET_VENDOR_EZCHIP=y
+CONFIG_NET_VENDOR_FUJITSU=y
+CONFIG_PCMCIA_FMVJ18X=m
+CONFIG_NET_VENDOR_GOOGLE=y
+CONFIG_GVE=m
+CONFIG_NET_VENDOR_HP=y
+CONFIG_HP100=m
+CONFIG_NET_VENDOR_HUAWEI=y
+CONFIG_HINIC=m
+CONFIG_NET_VENDOR_I825XX=y
+CONFIG_NET_VENDOR_INTEL=y
+CONFIG_E100=m
+CONFIG_E1000=m
+CONFIG_E1000E=m
+CONFIG_E1000E_HWTS=y
+CONFIG_IGB=m
+CONFIG_IGB_HWMON=y
+CONFIG_IGB_DCA=y
+CONFIG_IGBVF=m
+CONFIG_IXGB=m
+CONFIG_IXGBE=m
+CONFIG_IXGBE_HWMON=y
+CONFIG_IXGBE_DCA=y
+CONFIG_IXGBE_DCB=y
+CONFIG_IXGBE_IPSEC=y
+CONFIG_IXGBEVF=m
+CONFIG_IXGBEVF_IPSEC=y
+CONFIG_I40E=m
+CONFIG_I40E_DCB=y
+CONFIG_IAVF=m
+CONFIG_I40EVF=m
+CONFIG_ICE=m
+CONFIG_FM10K=m
+CONFIG_IGC=m
+CONFIG_JME=m
+CONFIG_NET_VENDOR_MARVELL=y
+CONFIG_MVMDIO=m
+CONFIG_SKGE=m
+# CONFIG_SKGE_DEBUG is not set
+CONFIG_SKGE_GENESIS=y
+CONFIG_SKY2=m
+# CONFIG_SKY2_DEBUG is not set
+CONFIG_NET_VENDOR_MELLANOX=y
+CONFIG_MLX4_EN=m
+CONFIG_MLX4_EN_DCB=y
+CONFIG_MLX4_CORE=m
+CONFIG_MLX4_DEBUG=y
+CONFIG_MLX4_CORE_GEN2=y
+CONFIG_MLX5_CORE=m
+CONFIG_MLX5_ACCEL=y
+CONFIG_MLX5_FPGA=y
+CONFIG_MLX5_CORE_EN=y
+CONFIG_MLX5_EN_ARFS=y
+CONFIG_MLX5_EN_RXNFC=y
+CONFIG_MLX5_MPFS=y
+CONFIG_MLX5_CORE_EN_DCB=y
+CONFIG_MLX5_CORE_IPOIB=y
+# CONFIG_MLX5_FPGA_IPSEC is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_CORE_THERMAL=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_I2C=m
+CONFIG_MLXSW_MINIMAL=m
+CONFIG_MLXFW=m
+CONFIG_NET_VENDOR_MICREL=y
+CONFIG_KS8842=m
+CONFIG_KS8851=m
+CONFIG_KS8851_MLL=m
+CONFIG_KSZ884X_PCI=m
+CONFIG_NET_VENDOR_MICROCHIP=y
+CONFIG_ENC28J60=m
+# CONFIG_ENC28J60_WRITEVERIFY is not set
+CONFIG_ENCX24J600=m
+CONFIG_LAN743X=m
+CONFIG_NET_VENDOR_MICROSEMI=y
+CONFIG_NET_VENDOR_MYRI=y
+CONFIG_MYRI10GE=m
+CONFIG_MYRI10GE_DCA=y
+CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NATSEMI=y
+CONFIG_NATSEMI=m
+CONFIG_NS83820=m
+CONFIG_NET_VENDOR_NETERION=y
+CONFIG_S2IO=m
+CONFIG_VXGE=m
+# CONFIG_VXGE_DEBUG_TRACE_ALL is not set
+CONFIG_NET_VENDOR_NETRONOME=y
+CONFIG_NFP=m
+# CONFIG_NFP_DEBUG is not set
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
+CONFIG_NET_VENDOR_8390=y
+CONFIG_PCMCIA_AXNET=m
+CONFIG_NE2K_PCI=m
+CONFIG_PCMCIA_PCNET=m
+CONFIG_NET_VENDOR_NVIDIA=y
+CONFIG_FORCEDETH=m
+CONFIG_NET_VENDOR_OKI=y
+CONFIG_ETHOC=m
+CONFIG_NET_VENDOR_PACKET_ENGINES=y
+CONFIG_HAMACHI=m
+CONFIG_YELLOWFIN=m
+CONFIG_NET_VENDOR_PENSANDO=y
+CONFIG_IONIC=m
+CONFIG_NET_VENDOR_QLOGIC=y
+CONFIG_QLA3XXX=m
+CONFIG_QLCNIC=m
+CONFIG_QLCNIC_SRIOV=y
+CONFIG_QLCNIC_DCB=y
+CONFIG_QLCNIC_HWMON=y
+CONFIG_NETXEN_NIC=m
+CONFIG_QED=m
+CONFIG_QED_LL2=y
+CONFIG_QED_SRIOV=y
+CONFIG_QEDE=m
+CONFIG_QED_RDMA=y
+CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_QUALCOMM=y
+CONFIG_QCOM_EMAC=m
+CONFIG_RMNET=m
+CONFIG_NET_VENDOR_RDC=y
+CONFIG_R6040=m
+CONFIG_NET_VENDOR_REALTEK=y
+# CONFIG_ATP is not set
+CONFIG_8139CP=m
+CONFIG_8139TOO=m
+# CONFIG_8139TOO_PIO is not set
+# CONFIG_8139TOO_TUNE_TWISTER is not set
+CONFIG_8139TOO_8129=y
+# CONFIG_8139_OLD_RX_RESET is not set
+CONFIG_R8169=m
+CONFIG_NET_VENDOR_RENESAS=y
+CONFIG_NET_VENDOR_ROCKER=y
+CONFIG_NET_VENDOR_SAMSUNG=y
+CONFIG_SXGBE_ETH=m
+CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SOLARFLARE=y
+CONFIG_SFC=m
+CONFIG_SFC_MTD=y
+CONFIG_SFC_MCDI_MON=y
+CONFIG_SFC_SRIOV=y
+CONFIG_SFC_MCDI_LOGGING=y
+CONFIG_SFC_FALCON=m
+CONFIG_SFC_FALCON_MTD=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
+CONFIG_NET_VENDOR_SMSC=y
+CONFIG_PCMCIA_SMC91C92=m
+CONFIG_EPIC100=m
+CONFIG_SMSC911X=m
+CONFIG_SMSC9420=m
+CONFIG_NET_VENDOR_SOCIONEXT=y
+CONFIG_NET_VENDOR_STMICRO=y
+CONFIG_STMMAC_ETH=m
+# CONFIG_STMMAC_SELFTESTS is not set
+# CONFIG_STMMAC_PLATFORM is not set
+CONFIG_STMMAC_PCI=m
+CONFIG_NET_VENDOR_SUN=y
+CONFIG_HAPPYMEAL=m
+CONFIG_SUNGEM=m
+CONFIG_CASSINI=m
+CONFIG_NIU=m
+CONFIG_NET_VENDOR_SYNOPSYS=y
+CONFIG_DWC_XLGMAC=m
+CONFIG_DWC_XLGMAC_PCI=m
+CONFIG_NET_VENDOR_TEHUTI=y
+CONFIG_TEHUTI=m
+CONFIG_NET_VENDOR_TI=y
+# CONFIG_TI_CPSW_PHY_SEL is not set
+CONFIG_TLAN=m
+CONFIG_NET_VENDOR_VIA=y
+CONFIG_VIA_RHINE=m
+CONFIG_VIA_RHINE_MMIO=y
+CONFIG_VIA_VELOCITY=m
+CONFIG_NET_VENDOR_WIZNET=y
+CONFIG_WIZNET_W5100=m
+CONFIG_WIZNET_W5300=m
+# CONFIG_WIZNET_BUS_DIRECT is not set
+# CONFIG_WIZNET_BUS_INDIRECT is not set
+CONFIG_WIZNET_BUS_ANY=y
+CONFIG_WIZNET_W5100_SPI=m
+CONFIG_NET_VENDOR_XILINX=y
+CONFIG_XILINX_AXI_EMAC=m
+CONFIG_XILINX_LL_TEMAC=m
+CONFIG_NET_VENDOR_XIRCOM=y
+CONFIG_PCMCIA_XIRC2PS=m
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_NET_SB1000 is not set
+CONFIG_MDIO_DEVICE=y
+CONFIG_MDIO_BUS=y
+CONFIG_MDIO_BCM_UNIMAC=m
+CONFIG_MDIO_BITBANG=m
+CONFIG_MDIO_CAVIUM=m
+CONFIG_MDIO_GPIO=m
+CONFIG_MDIO_I2C=m
+# CONFIG_MDIO_MSCC_MIIM is not set
+CONFIG_MDIO_THUNDER=m
+CONFIG_PHYLINK=m
+CONFIG_PHYLIB=y
+CONFIG_SWPHY=y
+# CONFIG_LED_TRIGGER_PHY is not set
+
+#
+# MII PHY device drivers
+#
+CONFIG_SFP=m
+CONFIG_ADIN_PHY=m
+CONFIG_AMD_PHY=m
+CONFIG_AQUANTIA_PHY=m
+CONFIG_AX88796B_PHY=m
+CONFIG_AT803X_PHY=m
+CONFIG_BCM7XXX_PHY=m
+CONFIG_BCM87XX_PHY=m
+CONFIG_BCM_NET_PHYLIB=m
+CONFIG_BROADCOM_PHY=m
+CONFIG_CICADA_PHY=m
+CONFIG_CORTINA_PHY=m
+CONFIG_DAVICOM_PHY=m
+CONFIG_DP83822_PHY=m
+CONFIG_DP83TC811_PHY=m
+CONFIG_DP83848_PHY=m
+CONFIG_DP83867_PHY=m
+CONFIG_FIXED_PHY=y
+CONFIG_ICPLUS_PHY=m
+CONFIG_INTEL_XWAY_PHY=m
+CONFIG_LSI_ET1011C_PHY=m
+CONFIG_LXT_PHY=m
+CONFIG_MARVELL_PHY=m
+CONFIG_MARVELL_10G_PHY=m
+CONFIG_MICREL_PHY=m
+CONFIG_MICROCHIP_PHY=m
+CONFIG_MICROCHIP_T1_PHY=m
+CONFIG_MICROSEMI_PHY=m
+CONFIG_NATIONAL_PHY=m
+CONFIG_NXP_TJA11XX_PHY=m
+CONFIG_QSEMI_PHY=m
+CONFIG_REALTEK_PHY=m
+CONFIG_RENESAS_PHY=m
+CONFIG_ROCKCHIP_PHY=m
+CONFIG_SMSC_PHY=m
+CONFIG_STE10XP=m
+CONFIG_TERANETICS_PHY=m
+CONFIG_VITESSE_PHY=m
+CONFIG_XILINX_GMII2RGMII=m
+CONFIG_MICREL_KS8995MA=m
+# CONFIG_PLIP is not set
+CONFIG_PPP=m
+CONFIG_PPP_BSDCOMP=m
+CONFIG_PPP_DEFLATE=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MPPE=m
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOATM=m
+CONFIG_PPPOE=m
+CONFIG_PPTP=m
+CONFIG_PPPOL2TP=m
+CONFIG_PPP_ASYNC=m
+CONFIG_PPP_SYNC_TTY=m
+CONFIG_SLIP=m
+CONFIG_SLHC=m
+CONFIG_SLIP_COMPRESSED=y
+CONFIG_SLIP_SMART=y
+# CONFIG_SLIP_MODE_SLIP6 is not set
+CONFIG_USB_NET_DRIVERS=y
+CONFIG_USB_CATC=m
+CONFIG_USB_KAWETH=m
+CONFIG_USB_PEGASUS=m
+CONFIG_USB_RTL8150=m
+CONFIG_USB_RTL8152=m
+CONFIG_USB_LAN78XX=m
+CONFIG_USB_USBNET=m
+CONFIG_USB_NET_AX8817X=m
+CONFIG_USB_NET_AX88179_178A=m
+CONFIG_USB_NET_CDCETHER=m
+CONFIG_USB_NET_CDC_EEM=m
+CONFIG_USB_NET_CDC_NCM=m
+CONFIG_USB_NET_HUAWEI_CDC_NCM=m
+CONFIG_USB_NET_CDC_MBIM=m
+CONFIG_USB_NET_DM9601=m
+CONFIG_USB_NET_SR9700=m
+CONFIG_USB_NET_SR9800=m
+CONFIG_USB_NET_SMSC75XX=m
+CONFIG_USB_NET_SMSC95XX=m
+CONFIG_USB_NET_GL620A=m
+CONFIG_USB_NET_NET1080=m
+CONFIG_USB_NET_PLUSB=m
+CONFIG_USB_NET_MCS7830=m
+CONFIG_USB_NET_RNDIS_HOST=m
+CONFIG_USB_NET_CDC_SUBSET_ENABLE=m
+CONFIG_USB_NET_CDC_SUBSET=m
+CONFIG_USB_ALI_M5632=y
+CONFIG_USB_AN2720=y
+CONFIG_USB_BELKIN=y
+CONFIG_USB_ARMLINUX=y
+CONFIG_USB_EPSON2888=y
+CONFIG_USB_KC2190=y
+CONFIG_USB_NET_ZAURUS=m
+CONFIG_USB_NET_CX82310_ETH=m
+CONFIG_USB_NET_KALMIA=m
+CONFIG_USB_NET_QMI_WWAN=m
+CONFIG_USB_HSO=m
+CONFIG_USB_NET_INT51X1=m
+CONFIG_USB_IPHETH=m
+CONFIG_USB_SIERRA_NET=m
+CONFIG_USB_VL600=m
+CONFIG_USB_NET_CH9200=m
+CONFIG_USB_NET_AQC111=m
+CONFIG_WLAN=y
+# CONFIG_WIRELESS_WDS is not set
+CONFIG_WLAN_VENDOR_ADMTEK=y
+CONFIG_ADM8211=m
+CONFIG_ATH_COMMON=m
+CONFIG_WLAN_VENDOR_ATH=y
+CONFIG_ATH_DEBUG=y
+# CONFIG_ATH_TRACEPOINTS is not set
+CONFIG_ATH5K=m
+# CONFIG_ATH5K_DEBUG is not set
+# CONFIG_ATH5K_TRACER is not set
+CONFIG_ATH5K_PCI=y
+CONFIG_ATH9K_HW=m
+CONFIG_ATH9K_COMMON=m
+CONFIG_ATH9K_COMMON_DEBUG=y
+CONFIG_ATH9K_BTCOEX_SUPPORT=y
+CONFIG_ATH9K=m
+CONFIG_ATH9K_PCI=y
+CONFIG_ATH9K_AHB=y
+CONFIG_ATH9K_DEBUGFS=y
+# CONFIG_ATH9K_STATION_STATISTICS is not set
+# CONFIG_ATH9K_DYNACK is not set
+# CONFIG_ATH9K_WOW is not set
+CONFIG_ATH9K_RFKILL=y
+# CONFIG_ATH9K_CHANNEL_CONTEXT is not set
+CONFIG_ATH9K_PCOEM=y
+CONFIG_ATH9K_PCI_NO_EEPROM=m
+CONFIG_ATH9K_HTC=m
+CONFIG_ATH9K_HTC_DEBUGFS=y
+CONFIG_ATH9K_HWRNG=y
+# CONFIG_ATH9K_COMMON_SPECTRAL is not set
+CONFIG_CARL9170=m
+CONFIG_CARL9170_LEDS=y
+# CONFIG_CARL9170_DEBUGFS is not set
+CONFIG_CARL9170_WPC=y
+# CONFIG_CARL9170_HWRNG is not set
+CONFIG_ATH6KL=m
+CONFIG_ATH6KL_SDIO=m
+CONFIG_ATH6KL_USB=m
+# CONFIG_ATH6KL_DEBUG is not set
+# CONFIG_ATH6KL_TRACING is not set
+CONFIG_AR5523=m
+CONFIG_WIL6210=m
+CONFIG_WIL6210_ISR_COR=y
+# CONFIG_WIL6210_TRACING is not set
+# CONFIG_WIL6210_DEBUGFS is not set
+CONFIG_ATH10K=m
+CONFIG_ATH10K_CE=y
+CONFIG_ATH10K_PCI=m
+# CONFIG_ATH10K_SDIO is not set
+# CONFIG_ATH10K_USB is not set
+# CONFIG_ATH10K_DEBUG is not set
+CONFIG_ATH10K_DEBUGFS=y
+# CONFIG_ATH10K_SPECTRAL is not set
+# CONFIG_ATH10K_TRACING is not set
+CONFIG_WCN36XX=m
+# CONFIG_WCN36XX_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_ATMEL=y
+CONFIG_ATMEL=m
+CONFIG_PCI_ATMEL=m
+CONFIG_PCMCIA_ATMEL=m
+CONFIG_AT76C50X_USB=m
+CONFIG_WLAN_VENDOR_BROADCOM=y
+CONFIG_B43=m
+CONFIG_B43_BCMA=y
+CONFIG_B43_SSB=y
+CONFIG_B43_BUSES_BCMA_AND_SSB=y
+# CONFIG_B43_BUSES_BCMA is not set
+# CONFIG_B43_BUSES_SSB is not set
+CONFIG_B43_PCI_AUTOSELECT=y
+CONFIG_B43_PCICORE_AUTOSELECT=y
+CONFIG_B43_SDIO=y
+CONFIG_B43_BCMA_PIO=y
+CONFIG_B43_PIO=y
+CONFIG_B43_PHY_G=y
+CONFIG_B43_PHY_N=y
+CONFIG_B43_PHY_LP=y
+CONFIG_B43_PHY_HT=y
+CONFIG_B43_LEDS=y
+CONFIG_B43_HWRNG=y
+# CONFIG_B43_DEBUG is not set
+CONFIG_B43LEGACY=m
+CONFIG_B43LEGACY_PCI_AUTOSELECT=y
+CONFIG_B43LEGACY_PCICORE_AUTOSELECT=y
+CONFIG_B43LEGACY_LEDS=y
+CONFIG_B43LEGACY_HWRNG=y
+CONFIG_B43LEGACY_DEBUG=y
+CONFIG_B43LEGACY_DMA=y
+CONFIG_B43LEGACY_PIO=y
+CONFIG_B43LEGACY_DMA_AND_PIO_MODE=y
+# CONFIG_B43LEGACY_DMA_MODE is not set
+# CONFIG_B43LEGACY_PIO_MODE is not set
+CONFIG_BRCMUTIL=m
+CONFIG_BRCMSMAC=m
+CONFIG_BRCMFMAC=m
+CONFIG_BRCMFMAC_PROTO_BCDC=y
+CONFIG_BRCMFMAC_PROTO_MSGBUF=y
+CONFIG_BRCMFMAC_SDIO=y
+CONFIG_BRCMFMAC_USB=y
+CONFIG_BRCMFMAC_PCIE=y
+# CONFIG_BRCM_TRACING is not set
+# CONFIG_BRCMDBG is not set
+CONFIG_WLAN_VENDOR_CISCO=y
+CONFIG_AIRO=m
+CONFIG_AIRO_CS=m
+CONFIG_WLAN_VENDOR_INTEL=y
+CONFIG_IPW2100=m
+# CONFIG_IPW2100_MONITOR is not set
+# CONFIG_IPW2100_DEBUG is not set
+CONFIG_IPW2200=m
+# CONFIG_IPW2200_MONITOR is not set
+# CONFIG_IPW2200_QOS is not set
+# CONFIG_IPW2200_DEBUG is not set
+CONFIG_LIBIPW=m
+# CONFIG_LIBIPW_DEBUG is not set
+CONFIG_IWLEGACY=m
+CONFIG_IWL4965=m
+CONFIG_IWL3945=m
+
+#
+# iwl3945 / iwl4965 Debugging Options
+#
+# CONFIG_IWLEGACY_DEBUG is not set
+# CONFIG_IWLEGACY_DEBUGFS is not set
+# end of iwl3945 / iwl4965 Debugging Options
+
+CONFIG_IWLWIFI=m
+CONFIG_IWLWIFI_LEDS=y
+CONFIG_IWLDVM=m
+CONFIG_IWLMVM=m
+CONFIG_IWLWIFI_OPMODE_MODULAR=y
+# CONFIG_IWLWIFI_BCAST_FILTERING is not set
+
+#
+# Debugging Options
+#
+# CONFIG_IWLWIFI_DEBUG is not set
+# CONFIG_IWLWIFI_DEBUGFS is not set
+# CONFIG_IWLWIFI_DEVICE_TRACING is not set
+# end of Debugging Options
+
+CONFIG_WLAN_VENDOR_INTERSIL=y
+CONFIG_HOSTAP=m
+CONFIG_HOSTAP_FIRMWARE=y
+CONFIG_HOSTAP_FIRMWARE_NVRAM=y
+CONFIG_HOSTAP_PLX=m
+CONFIG_HOSTAP_PCI=m
+CONFIG_HOSTAP_CS=m
+CONFIG_HERMES=m
+# CONFIG_HERMES_PRISM is not set
+CONFIG_HERMES_CACHE_FW_ON_INIT=y
+CONFIG_PLX_HERMES=m
+CONFIG_TMD_HERMES=m
+CONFIG_NORTEL_HERMES=m
+CONFIG_PCMCIA_HERMES=m
+CONFIG_PCMCIA_SPECTRUM=m
+CONFIG_ORINOCO_USB=m
+CONFIG_P54_COMMON=m
+CONFIG_P54_USB=m
+CONFIG_P54_PCI=m
+CONFIG_P54_SPI=m
+# CONFIG_P54_SPI_DEFAULT_EEPROM is not set
+CONFIG_P54_LEDS=y
+# CONFIG_PRISM54 is not set
+CONFIG_WLAN_VENDOR_MARVELL=y
+CONFIG_LIBERTAS=m
+CONFIG_LIBERTAS_USB=m
+CONFIG_LIBERTAS_CS=m
+CONFIG_LIBERTAS_SDIO=m
+CONFIG_LIBERTAS_SPI=m
+# CONFIG_LIBERTAS_DEBUG is not set
+CONFIG_LIBERTAS_MESH=y
+CONFIG_LIBERTAS_THINFIRM=m
+# CONFIG_LIBERTAS_THINFIRM_DEBUG is not set
+CONFIG_LIBERTAS_THINFIRM_USB=m
+CONFIG_MWIFIEX=m
+CONFIG_MWIFIEX_SDIO=m
+CONFIG_MWIFIEX_PCIE=m
+CONFIG_MWIFIEX_USB=m
+CONFIG_MWL8K=m
+CONFIG_WLAN_VENDOR_MEDIATEK=y
+CONFIG_MT7601U=m
+CONFIG_MT76_CORE=m
+CONFIG_MT76_LEDS=y
+CONFIG_MT76_USB=m
+CONFIG_MT76x02_LIB=m
+CONFIG_MT76x02_USB=m
+CONFIG_MT76x0_COMMON=m
+CONFIG_MT76x0U=m
+CONFIG_MT76x0E=m
+CONFIG_MT76x2_COMMON=m
+CONFIG_MT76x2E=m
+CONFIG_MT76x2U=m
+# CONFIG_MT7603E is not set
+CONFIG_MT7615E=m
+CONFIG_WLAN_VENDOR_RALINK=y
+CONFIG_RT2X00=m
+CONFIG_RT2400PCI=m
+CONFIG_RT2500PCI=m
+CONFIG_RT61PCI=m
+CONFIG_RT2800PCI=m
+CONFIG_RT2800PCI_RT33XX=y
+CONFIG_RT2800PCI_RT35XX=y
+CONFIG_RT2800PCI_RT53XX=y
+CONFIG_RT2800PCI_RT3290=y
+CONFIG_RT2500USB=m
+CONFIG_RT73USB=m
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
+CONFIG_RT2800_LIB=m
+CONFIG_RT2800_LIB_MMIO=m
+CONFIG_RT2X00_LIB_MMIO=m
+CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
+CONFIG_RT2X00_LIB=m
+CONFIG_RT2X00_LIB_FIRMWARE=y
+CONFIG_RT2X00_LIB_CRYPTO=y
+CONFIG_RT2X00_LIB_LEDS=y
+# CONFIG_RT2X00_LIB_DEBUGFS is not set
+# CONFIG_RT2X00_DEBUG is not set
+CONFIG_WLAN_VENDOR_REALTEK=y
+CONFIG_RTL8180=m
+CONFIG_RTL8187=m
+CONFIG_RTL8187_LEDS=y
+CONFIG_RTL_CARDS=m
+CONFIG_RTL8192CE=m
+CONFIG_RTL8192SE=m
+CONFIG_RTL8192DE=m
+CONFIG_RTL8723AE=m
+CONFIG_RTL8723BE=m
+CONFIG_RTL8188EE=m
+CONFIG_RTL8192EE=m
+CONFIG_RTL8821AE=m
+CONFIG_RTL8192CU=m
+CONFIG_RTLWIFI=m
+CONFIG_RTLWIFI_PCI=m
+CONFIG_RTLWIFI_USB=m
+# CONFIG_RTLWIFI_DEBUG is not set
+CONFIG_RTL8192C_COMMON=m
+CONFIG_RTL8723_COMMON=m
+CONFIG_RTLBTCOEXIST=m
+CONFIG_RTL8XXXU=m
+# CONFIG_RTL8XXXU_UNTESTED is not set
+CONFIG_RTW88=m
+CONFIG_RTW88_CORE=m
+CONFIG_RTW88_PCI=m
+CONFIG_RTW88_8822BE=y
+CONFIG_RTW88_8822CE=y
+# CONFIG_RTW88_DEBUG is not set
+# CONFIG_RTW88_DEBUGFS is not set
+CONFIG_WLAN_VENDOR_RSI=y
+CONFIG_RSI_91X=m
+# CONFIG_RSI_DEBUGFS is not set
+CONFIG_RSI_SDIO=m
+CONFIG_RSI_USB=m
+CONFIG_RSI_COEX=y
+CONFIG_WLAN_VENDOR_ST=y
+CONFIG_CW1200=m
+CONFIG_CW1200_WLAN_SDIO=m
+CONFIG_CW1200_WLAN_SPI=m
+CONFIG_WLAN_VENDOR_TI=y
+CONFIG_WL1251=m
+CONFIG_WL1251_SPI=m
+CONFIG_WL1251_SDIO=m
+CONFIG_WL12XX=m
+CONFIG_WL18XX=m
+CONFIG_WLCORE=m
+CONFIG_WLCORE_SDIO=m
+CONFIG_WILINK_PLATFORM_DATA=y
+CONFIG_WLAN_VENDOR_ZYDAS=y
+CONFIG_USB_ZD1201=m
+CONFIG_ZD1211RW=m
+# CONFIG_ZD1211RW_DEBUG is not set
+CONFIG_WLAN_VENDOR_QUANTENNA=y
+CONFIG_QTNFMAC=m
+CONFIG_QTNFMAC_PCIE=m
+CONFIG_PCMCIA_RAYCS=m
+CONFIG_PCMCIA_WL3501=m
+# CONFIG_MAC80211_HWSIM is not set
+CONFIG_USB_NET_RNDIS_WLAN=m
+# CONFIG_VIRT_WIFI is not set
+
+#
+# Enable WiMAX (Networking options) to see the WiMAX drivers
+#
+CONFIG_WAN=y
+CONFIG_LANMEDIA=m
+CONFIG_HDLC=m
+CONFIG_HDLC_RAW=m
+CONFIG_HDLC_RAW_ETH=m
+CONFIG_HDLC_CISCO=m
+CONFIG_HDLC_FR=m
+CONFIG_HDLC_PPP=m
+
+#
+# X.25/LAPB support is disabled
+#
+CONFIG_PCI200SYN=m
+CONFIG_WANXL=m
+CONFIG_PC300TOO=m
+CONFIG_FARSYNC=m
+CONFIG_DLCI=m
+CONFIG_DLCI_MAX=8
+CONFIG_SBNI=m
+# CONFIG_SBNI_MULTILINE is not set
+CONFIG_IEEE802154_DRIVERS=m
+CONFIG_IEEE802154_FAKELB=m
+CONFIG_IEEE802154_AT86RF230=m
+# CONFIG_IEEE802154_AT86RF230_DEBUGFS is not set
+CONFIG_IEEE802154_MRF24J40=m
+CONFIG_IEEE802154_CC2520=m
+CONFIG_IEEE802154_ATUSB=m
+CONFIG_IEEE802154_ADF7242=m
+CONFIG_IEEE802154_CA8210=m
+# CONFIG_IEEE802154_CA8210_DEBUGFS is not set
+CONFIG_IEEE802154_MCR20A=m
+# CONFIG_IEEE802154_HWSIM is not set
+CONFIG_XEN_NETDEV_FRONTEND=m
+CONFIG_XEN_NETDEV_BACKEND=m
+CONFIG_VMXNET3=m
+CONFIG_FUJITSU_ES=m
+CONFIG_THUNDERBOLT_NET=m
+CONFIG_HYPERV_NET=m
+# CONFIG_NETDEVSIM is not set
+CONFIG_NET_FAILOVER=m
+CONFIG_ISDN=y
+CONFIG_ISDN_CAPI=m
+# CONFIG_CAPI_TRACE is not set
+CONFIG_ISDN_CAPI_CAPI20=m
+CONFIG_ISDN_CAPI_MIDDLEWARE=y
+CONFIG_MISDN=m
+CONFIG_MISDN_DSP=m
+CONFIG_MISDN_L1OIP=m
+
+#
+# mISDN hardware drivers
+#
+CONFIG_MISDN_HFCPCI=m
+CONFIG_MISDN_HFCMULTI=m
+CONFIG_MISDN_HFCUSB=m
+CONFIG_MISDN_AVMFRITZ=m
+CONFIG_MISDN_SPEEDFAX=m
+CONFIG_MISDN_INFINEON=m
+CONFIG_MISDN_W6692=m
+CONFIG_MISDN_NETJET=m
+CONFIG_MISDN_HDLC=m
+CONFIG_MISDN_IPAC=m
+CONFIG_MISDN_ISAR=m
+CONFIG_NVM=y
+CONFIG_NVM_PBLK=m
+# CONFIG_NVM_PBLK_DEBUG is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+CONFIG_INPUT_LEDS=m
+CONFIG_INPUT_FF_MEMLESS=y
+CONFIG_INPUT_POLLDEV=m
+CONFIG_INPUT_SPARSEKMAP=m
+# CONFIG_INPUT_MATRIXKMAP is not set
+
+#
+# Userland interfaces
+#
+CONFIG_INPUT_MOUSEDEV=y
+# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024
+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768
+CONFIG_INPUT_JOYDEV=m
+CONFIG_INPUT_EVDEV=y
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+CONFIG_INPUT_KEYBOARD=y
+# CONFIG_KEYBOARD_ADC is not set
+# CONFIG_KEYBOARD_ADP5588 is not set
+# CONFIG_KEYBOARD_ADP5589 is not set
+# CONFIG_KEYBOARD_APPLESPI is not set
+CONFIG_KEYBOARD_ATKBD=y
+# CONFIG_KEYBOARD_QT1050 is not set
+# CONFIG_KEYBOARD_QT1070 is not set
+# CONFIG_KEYBOARD_QT2160 is not set
+# CONFIG_KEYBOARD_DLINK_DIR685 is not set
+# CONFIG_KEYBOARD_LKKBD is not set
+# CONFIG_KEYBOARD_GPIO is not set
+# CONFIG_KEYBOARD_GPIO_POLLED is not set
+# CONFIG_KEYBOARD_TCA6416 is not set
+# CONFIG_KEYBOARD_TCA8418 is not set
+# CONFIG_KEYBOARD_MATRIX is not set
+# CONFIG_KEYBOARD_LM8323 is not set
+# CONFIG_KEYBOARD_LM8333 is not set
+# CONFIG_KEYBOARD_MAX7359 is not set
+# CONFIG_KEYBOARD_MCS is not set
+# CONFIG_KEYBOARD_MPR121 is not set
+# CONFIG_KEYBOARD_NEWTON is not set
+# CONFIG_KEYBOARD_OPENCORES is not set
+# CONFIG_KEYBOARD_SAMSUNG is not set
+# CONFIG_KEYBOARD_STOWAWAY is not set
+# CONFIG_KEYBOARD_SUNKBD is not set
+# CONFIG_KEYBOARD_TM2_TOUCHKEY is not set
+# CONFIG_KEYBOARD_XTKBD is not set
+CONFIG_INPUT_MOUSE=y
+CONFIG_MOUSE_PS2=y
+CONFIG_MOUSE_PS2_ALPS=y
+CONFIG_MOUSE_PS2_BYD=y
+CONFIG_MOUSE_PS2_LOGIPS2PP=y
+CONFIG_MOUSE_PS2_SYNAPTICS=y
+CONFIG_MOUSE_PS2_SYNAPTICS_SMBUS=y
+CONFIG_MOUSE_PS2_CYPRESS=y
+CONFIG_MOUSE_PS2_LIFEBOOK=y
+CONFIG_MOUSE_PS2_TRACKPOINT=y
+CONFIG_MOUSE_PS2_ELANTECH=y
+CONFIG_MOUSE_PS2_ELANTECH_SMBUS=y
+CONFIG_MOUSE_PS2_SENTELIC=y
+CONFIG_MOUSE_PS2_TOUCHKIT=y
+CONFIG_MOUSE_PS2_FOCALTECH=y
+CONFIG_MOUSE_PS2_VMMOUSE=y
+CONFIG_MOUSE_PS2_SMBUS=y
+CONFIG_MOUSE_SERIAL=m
+CONFIG_MOUSE_APPLETOUCH=m
+CONFIG_MOUSE_BCM5974=m
+CONFIG_MOUSE_CYAPA=m
+CONFIG_MOUSE_ELAN_I2C=m
+CONFIG_MOUSE_ELAN_I2C_I2C=y
+CONFIG_MOUSE_ELAN_I2C_SMBUS=y
+CONFIG_MOUSE_VSXXXAA=m
+CONFIG_MOUSE_GPIO=m
+CONFIG_MOUSE_SYNAPTICS_I2C=m
+CONFIG_MOUSE_SYNAPTICS_USB=m
+CONFIG_INPUT_JOYSTICK=y
+CONFIG_JOYSTICK_ANALOG=m
+CONFIG_JOYSTICK_A3D=m
+CONFIG_JOYSTICK_ADI=m
+CONFIG_JOYSTICK_COBRA=m
+CONFIG_JOYSTICK_GF2K=m
+CONFIG_JOYSTICK_GRIP=m
+CONFIG_JOYSTICK_GRIP_MP=m
+CONFIG_JOYSTICK_GUILLEMOT=m
+CONFIG_JOYSTICK_INTERACT=m
+CONFIG_JOYSTICK_SIDEWINDER=m
+CONFIG_JOYSTICK_TMDC=m
+CONFIG_JOYSTICK_IFORCE=m
+CONFIG_JOYSTICK_IFORCE_USB=m
+CONFIG_JOYSTICK_IFORCE_232=m
+CONFIG_JOYSTICK_WARRIOR=m
+CONFIG_JOYSTICK_MAGELLAN=m
+CONFIG_JOYSTICK_SPACEORB=m
+CONFIG_JOYSTICK_SPACEBALL=m
+CONFIG_JOYSTICK_STINGER=m
+CONFIG_JOYSTICK_TWIDJOY=m
+CONFIG_JOYSTICK_ZHENHUA=m
+CONFIG_JOYSTICK_DB9=m
+CONFIG_JOYSTICK_GAMECON=m
+CONFIG_JOYSTICK_TURBOGRAFX=m
+CONFIG_JOYSTICK_AS5011=m
+CONFIG_JOYSTICK_JOYDUMP=m
+CONFIG_JOYSTICK_XPAD=m
+CONFIG_JOYSTICK_XPAD_FF=y
+CONFIG_JOYSTICK_XPAD_LEDS=y
+CONFIG_JOYSTICK_WALKERA0701=m
+CONFIG_JOYSTICK_PSXPAD_SPI=m
+CONFIG_JOYSTICK_PSXPAD_SPI_FF=y
+CONFIG_JOYSTICK_PXRC=m
+CONFIG_JOYSTICK_FSIA6B=m
+CONFIG_INPUT_TABLET=y
+CONFIG_TABLET_USB_ACECAD=m
+CONFIG_TABLET_USB_AIPTEK=m
+CONFIG_TABLET_USB_GTCO=m
+CONFIG_TABLET_USB_HANWANG=m
+CONFIG_TABLET_USB_KBTAB=m
+CONFIG_TABLET_USB_PEGASUS=m
+CONFIG_TABLET_SERIAL_WACOM4=m
+CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_PROPERTIES=y
+CONFIG_TOUCHSCREEN_ADS7846=m
+CONFIG_TOUCHSCREEN_AD7877=m
+CONFIG_TOUCHSCREEN_AD7879=m
+CONFIG_TOUCHSCREEN_AD7879_I2C=m
+CONFIG_TOUCHSCREEN_AD7879_SPI=m
+CONFIG_TOUCHSCREEN_ADC=m
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
+# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set
+# CONFIG_TOUCHSCREEN_AUO_PIXCIR is not set
+CONFIG_TOUCHSCREEN_BU21013=m
+CONFIG_TOUCHSCREEN_BU21029=m
+CONFIG_TOUCHSCREEN_CHIPONE_ICN8505=m
+# CONFIG_TOUCHSCREEN_CY8CTMG110 is not set
+CONFIG_TOUCHSCREEN_CYTTSP_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP_SPI=m
+CONFIG_TOUCHSCREEN_CYTTSP4_CORE=m
+CONFIG_TOUCHSCREEN_CYTTSP4_I2C=m
+CONFIG_TOUCHSCREEN_CYTTSP4_SPI=m
+CONFIG_TOUCHSCREEN_DYNAPRO=m
+CONFIG_TOUCHSCREEN_HAMPSHIRE=m
+CONFIG_TOUCHSCREEN_EETI=m
+CONFIG_TOUCHSCREEN_EGALAX_SERIAL=m
+CONFIG_TOUCHSCREEN_EXC3000=m
+CONFIG_TOUCHSCREEN_FUJITSU=m
+CONFIG_TOUCHSCREEN_GOODIX=m
+CONFIG_TOUCHSCREEN_HIDEEP=m
+CONFIG_TOUCHSCREEN_ILI210X=m
+CONFIG_TOUCHSCREEN_S6SY761=m
+CONFIG_TOUCHSCREEN_GUNZE=m
+CONFIG_TOUCHSCREEN_EKTF2127=m
+CONFIG_TOUCHSCREEN_ELAN=m
+CONFIG_TOUCHSCREEN_ELO=m
+CONFIG_TOUCHSCREEN_WACOM_W8001=m
+CONFIG_TOUCHSCREEN_WACOM_I2C=m
+CONFIG_TOUCHSCREEN_MAX11801=m
+CONFIG_TOUCHSCREEN_MCS5000=m
+CONFIG_TOUCHSCREEN_MMS114=m
+CONFIG_TOUCHSCREEN_MELFAS_MIP4=m
+CONFIG_TOUCHSCREEN_MTOUCH=m
+CONFIG_TOUCHSCREEN_INEXIO=m
+CONFIG_TOUCHSCREEN_MK712=m
+CONFIG_TOUCHSCREEN_PENMOUNT=m
+CONFIG_TOUCHSCREEN_EDT_FT5X06=m
+CONFIG_TOUCHSCREEN_TOUCHRIGHT=m
+CONFIG_TOUCHSCREEN_TOUCHWIN=m
+# CONFIG_TOUCHSCREEN_TI_AM335X_TSC is not set
+CONFIG_TOUCHSCREEN_PIXCIR=m
+CONFIG_TOUCHSCREEN_WDT87XX_I2C=m
+CONFIG_TOUCHSCREEN_WM97XX=m
+CONFIG_TOUCHSCREEN_WM9705=y
+CONFIG_TOUCHSCREEN_WM9712=y
+CONFIG_TOUCHSCREEN_WM9713=y
+CONFIG_TOUCHSCREEN_USB_COMPOSITE=m
+# CONFIG_TOUCHSCREEN_MC13783 is not set
+CONFIG_TOUCHSCREEN_USB_EGALAX=y
+CONFIG_TOUCHSCREEN_USB_PANJIT=y
+CONFIG_TOUCHSCREEN_USB_3M=y
+CONFIG_TOUCHSCREEN_USB_ITM=y
+CONFIG_TOUCHSCREEN_USB_ETURBO=y
+CONFIG_TOUCHSCREEN_USB_GUNZE=y
+CONFIG_TOUCHSCREEN_USB_DMC_TSC10=y
+CONFIG_TOUCHSCREEN_USB_IRTOUCH=y
+CONFIG_TOUCHSCREEN_USB_IDEALTEK=y
+CONFIG_TOUCHSCREEN_USB_GENERAL_TOUCH=y
+CONFIG_TOUCHSCREEN_USB_GOTOP=y
+CONFIG_TOUCHSCREEN_USB_JASTEC=y
+CONFIG_TOUCHSCREEN_USB_ELO=y
+CONFIG_TOUCHSCREEN_USB_E2I=y
+CONFIG_TOUCHSCREEN_USB_ZYTRONIC=y
+CONFIG_TOUCHSCREEN_USB_ETT_TC45USB=y
+CONFIG_TOUCHSCREEN_USB_NEXIO=y
+CONFIG_TOUCHSCREEN_USB_EASYTOUCH=y
+CONFIG_TOUCHSCREEN_TOUCHIT213=m
+CONFIG_TOUCHSCREEN_TSC_SERIO=m
+CONFIG_TOUCHSCREEN_TSC200X_CORE=m
+CONFIG_TOUCHSCREEN_TSC2004=m
+CONFIG_TOUCHSCREEN_TSC2005=m
+CONFIG_TOUCHSCREEN_TSC2007=m
+CONFIG_TOUCHSCREEN_TSC2007_IIO=y
+CONFIG_TOUCHSCREEN_RM_TS=m
+CONFIG_TOUCHSCREEN_SILEAD=m
+CONFIG_TOUCHSCREEN_SIS_I2C=m
+CONFIG_TOUCHSCREEN_ST1232=m
+CONFIG_TOUCHSCREEN_STMFTS=m
+CONFIG_TOUCHSCREEN_SUR40=m
+CONFIG_TOUCHSCREEN_SURFACE3_SPI=m
+CONFIG_TOUCHSCREEN_SX8654=m
+CONFIG_TOUCHSCREEN_TPS6507X=m
+CONFIG_TOUCHSCREEN_ZET6223=m
+# CONFIG_TOUCHSCREEN_ZFORCE is not set
+CONFIG_TOUCHSCREEN_ROHM_BU21023=m
+# CONFIG_TOUCHSCREEN_IQS5XX is not set
+CONFIG_INPUT_MISC=y
+CONFIG_INPUT_AD714X=m
+CONFIG_INPUT_AD714X_I2C=m
+CONFIG_INPUT_AD714X_SPI=m
+CONFIG_INPUT_BMA150=m
+CONFIG_INPUT_E3X0_BUTTON=m
+# CONFIG_INPUT_MSM_VIBRATOR is not set
+CONFIG_INPUT_PCSPKR=m
+# CONFIG_INPUT_MC13783_PWRBUTTON is not set
+CONFIG_INPUT_MMA8450=m
+CONFIG_INPUT_APANEL=m
+# CONFIG_INPUT_GP2A is not set
+# CONFIG_INPUT_GPIO_BEEPER is not set
+CONFIG_INPUT_GPIO_DECODER=m
+# CONFIG_INPUT_GPIO_VIBRA is not set
+CONFIG_INPUT_ATLAS_BTNS=m
+CONFIG_INPUT_ATI_REMOTE2=m
+CONFIG_INPUT_KEYSPAN_REMOTE=m
+CONFIG_INPUT_KXTJ9=m
+CONFIG_INPUT_KXTJ9_POLLED_MODE=y
+CONFIG_INPUT_POWERMATE=m
+CONFIG_INPUT_YEALINK=m
+CONFIG_INPUT_CM109=m
+CONFIG_INPUT_REGULATOR_HAPTIC=m
+# CONFIG_INPUT_RETU_PWRBUTTON is not set
+CONFIG_INPUT_UINPUT=m
+# CONFIG_INPUT_PCF50633_PMU is not set
+CONFIG_INPUT_PCF8574=m
+# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
+CONFIG_INPUT_ADXL34X=m
+CONFIG_INPUT_ADXL34X_I2C=m
+CONFIG_INPUT_ADXL34X_SPI=m
+CONFIG_INPUT_IMS_PCU=m
+CONFIG_INPUT_CMA3000=m
+CONFIG_INPUT_CMA3000_I2C=m
+CONFIG_INPUT_XEN_KBDDEV_FRONTEND=m
+CONFIG_INPUT_IDEAPAD_SLIDEBAR=m
+CONFIG_INPUT_DRV260X_HAPTICS=m
+CONFIG_INPUT_DRV2665_HAPTICS=m
+CONFIG_INPUT_DRV2667_HAPTICS=m
+CONFIG_RMI4_CORE=m
+CONFIG_RMI4_I2C=m
+CONFIG_RMI4_SPI=m
+CONFIG_RMI4_SMB=m
+CONFIG_RMI4_F03=y
+CONFIG_RMI4_F03_SERIO=m
+CONFIG_RMI4_2D_SENSOR=y
+CONFIG_RMI4_F11=y
+CONFIG_RMI4_F12=y
+CONFIG_RMI4_F30=y
+# CONFIG_RMI4_F34 is not set
+# CONFIG_RMI4_F54 is not set
+# CONFIG_RMI4_F55 is not set
+
+#
+# Hardware I/O ports
+#
+CONFIG_SERIO=y
+CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y
+CONFIG_SERIO_I8042=y
+CONFIG_SERIO_SERPORT=y
+CONFIG_SERIO_CT82C710=m
+# CONFIG_SERIO_PARKBD is not set
+CONFIG_SERIO_PCIPS2=m
+CONFIG_SERIO_LIBPS2=y
+CONFIG_SERIO_RAW=m
+CONFIG_SERIO_ALTERA_PS2=m
+# CONFIG_SERIO_PS2MULT is not set
+CONFIG_SERIO_ARC_PS2=m
+CONFIG_HYPERV_KEYBOARD=m
+CONFIG_SERIO_GPIO_PS2=m
+# CONFIG_USERIO is not set
+CONFIG_GAMEPORT=m
+CONFIG_GAMEPORT_NS558=m
+CONFIG_GAMEPORT_L4=m
+CONFIG_GAMEPORT_EMU10K1=m
+CONFIG_GAMEPORT_FM801=m
+# end of Hardware I/O ports
+# end of Input device support
+
+#
+# Character devices
+#
+CONFIG_TTY=y
+CONFIG_VT=y
+CONFIG_CONSOLE_TRANSLATIONS=y
+CONFIG_VT_CONSOLE=y
+CONFIG_VT_CONSOLE_SLEEP=y
+CONFIG_HW_CONSOLE=y
+CONFIG_VT_HW_CONSOLE_BINDING=y
+CONFIG_UNIX98_PTYS=y
+# CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_NONSTANDARD=y
+CONFIG_ROCKETPORT=m
+CONFIG_CYCLADES=m
+# CONFIG_CYZ_INTR is not set
+CONFIG_MOXA_INTELLIO=m
+CONFIG_MOXA_SMARTIO=m
+CONFIG_SYNCLINK=m
+CONFIG_SYNCLINKMP=m
+CONFIG_SYNCLINK_GT=m
+CONFIG_NOZOMI=m
+CONFIG_ISI=m
+CONFIG_N_HDLC=m
+CONFIG_N_GSM=m
+# CONFIG_TRACE_SINK is not set
+# CONFIG_NULL_TTY is not set
+CONFIG_LDISC_AUTOLOAD=y
+CONFIG_DEVMEM=y
+# CONFIG_DEVKMEM is not set
+
+#
+# Serial drivers
+#
+CONFIG_SERIAL_EARLYCON=y
+CONFIG_SERIAL_8250=y
+# CONFIG_SERIAL_8250_DEPRECATED_OPTIONS is not set
+CONFIG_SERIAL_8250_PNP=y
+# CONFIG_SERIAL_8250_FINTEK is not set
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_DMA=y
+CONFIG_SERIAL_8250_PCI=y
+CONFIG_SERIAL_8250_EXAR=y
+CONFIG_SERIAL_8250_CS=m
+CONFIG_SERIAL_8250_NR_UARTS=32
+CONFIG_SERIAL_8250_RUNTIME_UARTS=4
+CONFIG_SERIAL_8250_EXTENDED=y
+CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
+# CONFIG_SERIAL_8250_DETECT_IRQ is not set
+CONFIG_SERIAL_8250_RSA=y
+CONFIG_SERIAL_8250_DWLIB=y
+# CONFIG_SERIAL_8250_DW is not set
+# CONFIG_SERIAL_8250_RT288X is not set
+CONFIG_SERIAL_8250_LPSS=y
+# CONFIG_SERIAL_8250_MID is not set
+
+#
+# Non-8250 serial port support
+#
+# CONFIG_SERIAL_KGDB_NMI is not set
+CONFIG_SERIAL_MAX3100=m
+CONFIG_SERIAL_MAX310X=m
+CONFIG_SERIAL_UARTLITE=m
+CONFIG_SERIAL_UARTLITE_NR_UARTS=1
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_CONSOLE_POLL=y
+CONFIG_SERIAL_JSM=m
+CONFIG_SERIAL_SCCNXP=m
+CONFIG_SERIAL_SC16IS7XX_CORE=m
+CONFIG_SERIAL_SC16IS7XX=m
+CONFIG_SERIAL_SC16IS7XX_I2C=y
+CONFIG_SERIAL_SC16IS7XX_SPI=y
+CONFIG_SERIAL_ALTERA_JTAGUART=m
+CONFIG_SERIAL_ALTERA_UART=m
+CONFIG_SERIAL_ALTERA_UART_MAXPORTS=4
+CONFIG_SERIAL_ALTERA_UART_BAUDRATE=115200
+# CONFIG_SERIAL_IFX6X60 is not set
+CONFIG_SERIAL_ARC=m
+CONFIG_SERIAL_ARC_NR_PORTS=1
+CONFIG_SERIAL_RP2=m
+CONFIG_SERIAL_RP2_NR_UARTS=32
+CONFIG_SERIAL_FSL_LPUART=m
+CONFIG_SERIAL_FSL_LINFLEXUART=m
+# end of Serial drivers
+
+CONFIG_SERIAL_MCTRL_GPIO=y
+# CONFIG_SERIAL_DEV_BUS is not set
+# CONFIG_TTY_PRINTK is not set
+CONFIG_PRINTER=m
+CONFIG_LP_CONSOLE=y
+CONFIG_PPDEV=m
+CONFIG_HVC_DRIVER=y
+CONFIG_HVC_IRQ=y
+CONFIG_HVC_XEN=y
+CONFIG_HVC_XEN_FRONTEND=y
+CONFIG_VIRTIO_CONSOLE=m
+CONFIG_IPMI_HANDLER=m
+CONFIG_IPMI_DMI_DECODE=y
+CONFIG_IPMI_PLAT_DATA=y
+# CONFIG_IPMI_PANIC_EVENT is not set
+CONFIG_IPMI_DEVICE_INTERFACE=m
+CONFIG_IPMI_SI=m
+# CONFIG_IPMI_SSIF is not set
+CONFIG_IPMI_WATCHDOG=m
+CONFIG_IPMI_POWEROFF=m
+# CONFIG_IPMB_DEVICE_INTERFACE is not set
+CONFIG_HW_RANDOM=y
+CONFIG_HW_RANDOM_TIMERIOMEM=m
+CONFIG_HW_RANDOM_INTEL=m
+CONFIG_HW_RANDOM_AMD=m
+CONFIG_HW_RANDOM_VIA=m
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_NVRAM=y
+# CONFIG_APPLICOM is not set
+
+#
+# PCMCIA character devices
+#
+CONFIG_SYNCLINK_CS=m
+CONFIG_CARDMAN_4000=m
+CONFIG_CARDMAN_4040=m
+CONFIG_SCR24X=m
+CONFIG_IPWIRELESS=m
+# end of PCMCIA character devices
+
+# CONFIG_MWAVE is not set
+CONFIG_RAW_DRIVER=y
+CONFIG_MAX_RAW_DEVS=8192
+CONFIG_HPET=y
+CONFIG_HPET_MMAP=y
+# CONFIG_HPET_MMAP_DEFAULT is not set
+CONFIG_HANGCHECK_TIMER=m
+CONFIG_UV_MMTIMER=m
+CONFIG_TCG_TPM=y
+CONFIG_HW_RANDOM_TPM=y
+CONFIG_TCG_TIS_CORE=y
+CONFIG_TCG_TIS=y
+CONFIG_TCG_TIS_SPI=m
+CONFIG_TCG_TIS_I2C_ATMEL=m
+CONFIG_TCG_TIS_I2C_INFINEON=m
+CONFIG_TCG_TIS_I2C_NUVOTON=m
+CONFIG_TCG_NSC=m
+CONFIG_TCG_ATMEL=m
+CONFIG_TCG_INFINEON=m
+CONFIG_TCG_XEN=m
+CONFIG_TCG_CRB=y
+CONFIG_TCG_VTPM_PROXY=m
+CONFIG_TCG_TIS_ST33ZP24=m
+CONFIG_TCG_TIS_ST33ZP24_I2C=m
+CONFIG_TCG_TIS_ST33ZP24_SPI=m
+CONFIG_TELCLOCK=m
+CONFIG_DEVPORT=y
+# CONFIG_XILLYBUS is not set
+# end of Character devices
+
+# CONFIG_RANDOM_TRUST_CPU is not set
+# CONFIG_RANDOM_TRUST_BOOTLOADER is not set
+
+#
+# I2C support
+#
+CONFIG_I2C=y
+CONFIG_ACPI_I2C_OPREGION=y
+CONFIG_I2C_BOARDINFO=y
+CONFIG_I2C_COMPAT=y
+CONFIG_I2C_CHARDEV=m
+CONFIG_I2C_MUX=m
+
+#
+# Multiplexer I2C Chip support
+#
+CONFIG_I2C_MUX_GPIO=m
+CONFIG_I2C_MUX_LTC4306=m
+CONFIG_I2C_MUX_PCA9541=m
+CONFIG_I2C_MUX_PCA954x=m
+CONFIG_I2C_MUX_REG=m
+CONFIG_I2C_MUX_MLXCPLD=m
+# end of Multiplexer I2C Chip support
+
+CONFIG_I2C_HELPER_AUTO=y
+CONFIG_I2C_SMBUS=m
+CONFIG_I2C_ALGOBIT=m
+CONFIG_I2C_ALGOPCA=m
+
+#
+# I2C Hardware Bus support
+#
+
+#
+# PC SMBus host controller drivers
+#
+CONFIG_I2C_ALI1535=m
+CONFIG_I2C_ALI1563=m
+CONFIG_I2C_ALI15X3=m
+CONFIG_I2C_AMD756=m
+CONFIG_I2C_AMD756_S4882=m
+CONFIG_I2C_AMD8111=m
+CONFIG_I2C_AMD_MP2=m
+CONFIG_I2C_I801=m
+CONFIG_I2C_ISCH=m
+CONFIG_I2C_ISMT=m
+CONFIG_I2C_PIIX4=m
+CONFIG_I2C_NFORCE2=m
+CONFIG_I2C_NFORCE2_S4985=m
+CONFIG_I2C_NVIDIA_GPU=m
+CONFIG_I2C_SIS5595=m
+CONFIG_I2C_SIS630=m
+CONFIG_I2C_SIS96X=m
+CONFIG_I2C_VIA=m
+CONFIG_I2C_VIAPRO=m
+
+#
+# ACPI drivers
+#
+CONFIG_I2C_SCMI=m
+
+#
+# I2C system bus drivers (mostly embedded / system-on-chip)
+#
+CONFIG_I2C_CBUS_GPIO=m
+CONFIG_I2C_DESIGNWARE_CORE=m
+CONFIG_I2C_DESIGNWARE_PLATFORM=m
+# CONFIG_I2C_DESIGNWARE_SLAVE is not set
+CONFIG_I2C_DESIGNWARE_PCI=m
+# CONFIG_I2C_DESIGNWARE_BAYTRAIL is not set
+CONFIG_I2C_EMEV2=m
+CONFIG_I2C_GPIO=m
+# CONFIG_I2C_GPIO_FAULT_INJECTOR is not set
+CONFIG_I2C_KEMPLD=m
+CONFIG_I2C_OCORES=m
+CONFIG_I2C_PCA_PLATFORM=m
+CONFIG_I2C_SIMTEC=m
+CONFIG_I2C_XILINX=m
+
+#
+# External I2C/SMBus adapter drivers
+#
+CONFIG_I2C_DIOLAN_U2C=m
+CONFIG_I2C_PARPORT=m
+CONFIG_I2C_PARPORT_LIGHT=m
+CONFIG_I2C_ROBOTFUZZ_OSIF=m
+CONFIG_I2C_TAOS_EVM=m
+CONFIG_I2C_TINY_USB=m
+CONFIG_I2C_VIPERBOARD=m
+
+#
+# Other I2C/SMBus bus drivers
+#
+CONFIG_I2C_MLXCPLD=m
+# end of I2C Hardware Bus support
+
+CONFIG_I2C_STUB=m
+CONFIG_I2C_SLAVE=y
+CONFIG_I2C_SLAVE_EEPROM=m
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# end of I2C support
+
+# CONFIG_I3C is not set
+CONFIG_SPI=y
+# CONFIG_SPI_DEBUG is not set
+CONFIG_SPI_MASTER=y
+CONFIG_SPI_MEM=y
+
+#
+# SPI Master Controller Drivers
+#
+CONFIG_SPI_ALTERA=m
+# CONFIG_SPI_AXI_SPI_ENGINE is not set
+CONFIG_SPI_BITBANG=m
+# CONFIG_SPI_BUTTERFLY is not set
+CONFIG_SPI_CADENCE=m
+# CONFIG_SPI_DESIGNWARE is not set
+# CONFIG_SPI_NXP_FLEXSPI is not set
+CONFIG_SPI_GPIO=m
+# CONFIG_SPI_LM70_LLP is not set
+# CONFIG_SPI_OC_TINY is not set
+CONFIG_SPI_PXA2XX=m
+CONFIG_SPI_PXA2XX_PCI=m
+# CONFIG_SPI_ROCKCHIP is not set
+# CONFIG_SPI_SC18IS602 is not set
+# CONFIG_SPI_SIFIVE is not set
+# CONFIG_SPI_MXIC is not set
+# CONFIG_SPI_XCOMM is not set
+# CONFIG_SPI_XILINX is not set
+# CONFIG_SPI_ZYNQMP_GQSPI is not set
+
+#
+# SPI Protocol Masters
+#
+# CONFIG_SPI_SPIDEV is not set
+# CONFIG_SPI_LOOPBACK_TEST is not set
+# CONFIG_SPI_TLE62X0 is not set
+# CONFIG_SPI_SLAVE is not set
+# CONFIG_SPMI is not set
+# CONFIG_HSI is not set
+CONFIG_PPS=m
+# CONFIG_PPS_DEBUG is not set
+
+#
+# PPS clients support
+#
+# CONFIG_PPS_CLIENT_KTIMER is not set
+CONFIG_PPS_CLIENT_LDISC=m
+CONFIG_PPS_CLIENT_PARPORT=m
+CONFIG_PPS_CLIENT_GPIO=m
+
+#
+# PPS generators support
+#
+
+#
+# PTP clock support
+#
+CONFIG_PTP_1588_CLOCK=m
+CONFIG_DP83640_PHY=m
+CONFIG_PTP_1588_CLOCK_KVM=m
+# end of PTP clock support
+
+CONFIG_PINCTRL=y
+CONFIG_PINMUX=y
+CONFIG_PINCONF=y
+CONFIG_GENERIC_PINCONF=y
+# CONFIG_DEBUG_PINCTRL is not set
+CONFIG_PINCTRL_AMD=m
+CONFIG_PINCTRL_MCP23S08=m
+CONFIG_PINCTRL_SX150X=y
+CONFIG_PINCTRL_BAYTRAIL=y
+CONFIG_PINCTRL_CHERRYVIEW=m
+CONFIG_PINCTRL_INTEL=m
+CONFIG_PINCTRL_BROXTON=m
+CONFIG_PINCTRL_CANNONLAKE=m
+CONFIG_PINCTRL_CEDARFORK=m
+CONFIG_PINCTRL_DENVERTON=m
+CONFIG_PINCTRL_GEMINILAKE=m
+CONFIG_PINCTRL_ICELAKE=m
+CONFIG_PINCTRL_LEWISBURG=m
+CONFIG_PINCTRL_SUNRISEPOINT=m
+CONFIG_GPIOLIB=y
+CONFIG_GPIOLIB_FASTPATH_LIMIT=512
+CONFIG_GPIO_ACPI=y
+CONFIG_GPIOLIB_IRQCHIP=y
+# CONFIG_DEBUG_GPIO is not set
+CONFIG_GPIO_SYSFS=y
+CONFIG_GPIO_GENERIC=m
+CONFIG_GPIO_MAX730X=m
+
+#
+# Memory mapped GPIO drivers
+#
+CONFIG_GPIO_AMDPT=m
+CONFIG_GPIO_DWAPB=m
+# CONFIG_GPIO_EXAR is not set
+CONFIG_GPIO_GENERIC_PLATFORM=m
+CONFIG_GPIO_ICH=m
+CONFIG_GPIO_LYNXPOINT=m
+CONFIG_GPIO_MB86S7X=m
+CONFIG_GPIO_VX855=m
+# CONFIG_GPIO_XILINX is not set
+# CONFIG_GPIO_AMD_FCH is not set
+# end of Memory mapped GPIO drivers
+
+#
+# Port-mapped I/O GPIO drivers
+#
+CONFIG_GPIO_F7188X=m
+CONFIG_GPIO_IT87=m
+CONFIG_GPIO_SCH=m
+CONFIG_GPIO_SCH311X=m
+CONFIG_GPIO_WINBOND=m
+CONFIG_GPIO_WS16C48=m
+# end of Port-mapped I/O GPIO drivers
+
+#
+# I2C GPIO expanders
+#
+CONFIG_GPIO_ADP5588=m
+CONFIG_GPIO_MAX7300=m
+CONFIG_GPIO_MAX732X=m
+CONFIG_GPIO_PCA953X=m
+CONFIG_GPIO_PCF857X=m
+CONFIG_GPIO_TPIC2810=m
+# end of I2C GPIO expanders
+
+#
+# MFD GPIO expanders
+#
+CONFIG_GPIO_JANZ_TTL=m
+CONFIG_GPIO_KEMPLD=m
+CONFIG_GPIO_LP3943=m
+# end of MFD GPIO expanders
+
+#
+# PCI GPIO expanders
+#
+CONFIG_GPIO_AMD8111=m
+CONFIG_GPIO_ML_IOH=m
+# CONFIG_GPIO_PCI_IDIO_16 is not set
+# CONFIG_GPIO_PCIE_IDIO_24 is not set
+CONFIG_GPIO_RDC321X=m
+# end of PCI GPIO expanders
+
+#
+# SPI GPIO expanders
+#
+# CONFIG_GPIO_MAX3191X is not set
+CONFIG_GPIO_MAX7301=m
+CONFIG_GPIO_MC33880=m
+CONFIG_GPIO_PISOSR=m
+# CONFIG_GPIO_XRA1403 is not set
+# end of SPI GPIO expanders
+
+#
+# USB GPIO expanders
+#
+# CONFIG_GPIO_VIPERBOARD is not set
+# end of USB GPIO expanders
+
+# CONFIG_GPIO_MOCKUP is not set
+CONFIG_W1=m
+CONFIG_W1_CON=y
+
+#
+# 1-wire Bus Masters
+#
+# CONFIG_W1_MASTER_MATROX is not set
+# CONFIG_W1_MASTER_DS2490 is not set
+# CONFIG_W1_MASTER_DS2482 is not set
+# CONFIG_W1_MASTER_DS1WM is not set
+# CONFIG_W1_MASTER_GPIO is not set
+# CONFIG_W1_MASTER_SGI is not set
+# end of 1-wire Bus Masters
+
+#
+# 1-wire Slaves
+#
+# CONFIG_W1_SLAVE_THERM is not set
+# CONFIG_W1_SLAVE_SMEM is not set
+# CONFIG_W1_SLAVE_DS2405 is not set
+# CONFIG_W1_SLAVE_DS2408 is not set
+# CONFIG_W1_SLAVE_DS2413 is not set
+# CONFIG_W1_SLAVE_DS2406 is not set
+# CONFIG_W1_SLAVE_DS2423 is not set
+# CONFIG_W1_SLAVE_DS2805 is not set
+# CONFIG_W1_SLAVE_DS2431 is not set
+# CONFIG_W1_SLAVE_DS2433 is not set
+# CONFIG_W1_SLAVE_DS2438 is not set
+# CONFIG_W1_SLAVE_DS250X is not set
+CONFIG_W1_SLAVE_DS2780=m
+CONFIG_W1_SLAVE_DS2781=m
+# CONFIG_W1_SLAVE_DS28E04 is not set
+# CONFIG_W1_SLAVE_DS28E17 is not set
+# end of 1-wire Slaves
+
+# CONFIG_POWER_AVS is not set
+CONFIG_POWER_RESET=y
+# CONFIG_POWER_RESET_RESTART is not set
+CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY_DEBUG is not set
+CONFIG_POWER_SUPPLY_HWMON=y
+# CONFIG_PDA_POWER is not set
+# CONFIG_GENERIC_ADC_BATTERY is not set
+# CONFIG_TEST_POWER is not set
+# CONFIG_CHARGER_ADP5061 is not set
+CONFIG_BATTERY_DS2760=m
+CONFIG_BATTERY_DS2780=m
+CONFIG_BATTERY_DS2781=m
+CONFIG_BATTERY_DS2782=m
+CONFIG_BATTERY_SBS=m
+# CONFIG_CHARGER_SBS is not set
+# CONFIG_MANAGER_SBS is not set
+CONFIG_BATTERY_BQ27XXX=m
+CONFIG_BATTERY_BQ27XXX_I2C=m
+CONFIG_BATTERY_BQ27XXX_HDQ=m
+# CONFIG_BATTERY_BQ27XXX_DT_UPDATES_NVM is not set
+CONFIG_BATTERY_MAX17040=m
+CONFIG_BATTERY_MAX17042=m
+# CONFIG_BATTERY_MAX1721X is not set
+# CONFIG_CHARGER_PCF50633 is not set
+CONFIG_CHARGER_ISP1704=m
+CONFIG_CHARGER_MAX8903=m
+CONFIG_CHARGER_LP8727=m
+CONFIG_CHARGER_GPIO=m
+CONFIG_CHARGER_MANAGER=y
+# CONFIG_CHARGER_LT3651 is not set
+CONFIG_CHARGER_BQ2415X=m
+# CONFIG_CHARGER_BQ24190 is not set
+# CONFIG_CHARGER_BQ24257 is not set
+# CONFIG_CHARGER_BQ24735 is not set
+# CONFIG_CHARGER_BQ25890 is not set
+CONFIG_CHARGER_SMB347=m
+CONFIG_BATTERY_GAUGE_LTC2941=m
+# CONFIG_CHARGER_RT9455 is not set
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
+# CONFIG_HWMON_DEBUG_CHIP is not set
+
+#
+# Native drivers
+#
+CONFIG_SENSORS_ABITUGURU=m
+CONFIG_SENSORS_ABITUGURU3=m
+CONFIG_SENSORS_AD7314=m
+CONFIG_SENSORS_AD7414=m
+CONFIG_SENSORS_AD7418=m
+CONFIG_SENSORS_ADM1021=m
+CONFIG_SENSORS_ADM1025=m
+CONFIG_SENSORS_ADM1026=m
+CONFIG_SENSORS_ADM1029=m
+CONFIG_SENSORS_ADM1031=m
+CONFIG_SENSORS_ADM9240=m
+CONFIG_SENSORS_ADT7X10=m
+CONFIG_SENSORS_ADT7310=m
+CONFIG_SENSORS_ADT7410=m
+CONFIG_SENSORS_ADT7411=m
+CONFIG_SENSORS_ADT7462=m
+CONFIG_SENSORS_ADT7470=m
+CONFIG_SENSORS_ADT7475=m
+CONFIG_SENSORS_AS370=m
+CONFIG_SENSORS_ASC7621=m
+CONFIG_SENSORS_K8TEMP=m
+CONFIG_SENSORS_K10TEMP=m
+CONFIG_SENSORS_FAM15H_POWER=m
+CONFIG_SENSORS_APPLESMC=m
+CONFIG_SENSORS_ASB100=m
+CONFIG_SENSORS_ASPEED=m
+CONFIG_SENSORS_ATXP1=m
+CONFIG_SENSORS_DS620=m
+CONFIG_SENSORS_DS1621=m
+CONFIG_SENSORS_DELL_SMM=m
+CONFIG_SENSORS_I5K_AMB=m
+CONFIG_SENSORS_F71805F=m
+CONFIG_SENSORS_F71882FG=m
+CONFIG_SENSORS_F75375S=m
+CONFIG_SENSORS_MC13783_ADC=m
+CONFIG_SENSORS_FSCHMD=m
+CONFIG_SENSORS_FTSTEUTATES=m
+CONFIG_SENSORS_GL518SM=m
+CONFIG_SENSORS_GL520SM=m
+CONFIG_SENSORS_G760A=m
+CONFIG_SENSORS_G762=m
+CONFIG_SENSORS_HIH6130=m
+CONFIG_SENSORS_IBMAEM=m
+CONFIG_SENSORS_IBMPEX=m
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_SENSORS_I5500=m
+CONFIG_SENSORS_CORETEMP=m
+CONFIG_SENSORS_IT87=m
+CONFIG_SENSORS_JC42=m
+CONFIG_SENSORS_POWR1220=m
+CONFIG_SENSORS_LINEAGE=m
+CONFIG_SENSORS_LTC2945=m
+CONFIG_SENSORS_LTC2990=m
+CONFIG_SENSORS_LTC4151=m
+CONFIG_SENSORS_LTC4215=m
+CONFIG_SENSORS_LTC4222=m
+CONFIG_SENSORS_LTC4245=m
+CONFIG_SENSORS_LTC4260=m
+CONFIG_SENSORS_LTC4261=m
+CONFIG_SENSORS_MAX1111=m
+CONFIG_SENSORS_MAX16065=m
+CONFIG_SENSORS_MAX1619=m
+CONFIG_SENSORS_MAX1668=m
+CONFIG_SENSORS_MAX197=m
+CONFIG_SENSORS_MAX31722=m
+CONFIG_SENSORS_MAX6621=m
+CONFIG_SENSORS_MAX6639=m
+CONFIG_SENSORS_MAX6642=m
+CONFIG_SENSORS_MAX6650=m
+CONFIG_SENSORS_MAX6697=m
+CONFIG_SENSORS_MAX31790=m
+CONFIG_SENSORS_MCP3021=m
+CONFIG_SENSORS_TC654=m
+CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_LM63=m
+CONFIG_SENSORS_LM70=m
+CONFIG_SENSORS_LM73=m
+CONFIG_SENSORS_LM75=m
+CONFIG_SENSORS_LM77=m
+CONFIG_SENSORS_LM78=m
+CONFIG_SENSORS_LM80=m
+CONFIG_SENSORS_LM83=m
+CONFIG_SENSORS_LM85=m
+CONFIG_SENSORS_LM87=m
+CONFIG_SENSORS_LM90=m
+CONFIG_SENSORS_LM92=m
+CONFIG_SENSORS_LM93=m
+CONFIG_SENSORS_LM95234=m
+CONFIG_SENSORS_LM95241=m
+CONFIG_SENSORS_LM95245=m
+CONFIG_SENSORS_PC87360=m
+CONFIG_SENSORS_PC87427=m
+CONFIG_SENSORS_NTC_THERMISTOR=m
+CONFIG_SENSORS_NCT6683=m
+CONFIG_SENSORS_NCT6775=m
+CONFIG_SENSORS_NCT7802=m
+CONFIG_SENSORS_NCT7904=m
+CONFIG_SENSORS_NPCM7XX=m
+CONFIG_SENSORS_PCF8591=m
+CONFIG_PMBUS=m
+CONFIG_SENSORS_PMBUS=m
+CONFIG_SENSORS_ADM1275=m
+CONFIG_SENSORS_IBM_CFFPS=m
+CONFIG_SENSORS_INSPUR_IPSPS=m
+CONFIG_SENSORS_IR35221=m
+CONFIG_SENSORS_IR38064=m
+CONFIG_SENSORS_IRPS5401=m
+CONFIG_SENSORS_ISL68137=m
+CONFIG_SENSORS_LM25066=m
+CONFIG_SENSORS_LTC2978=m
+CONFIG_SENSORS_LTC2978_REGULATOR=y
+CONFIG_SENSORS_LTC3815=m
+CONFIG_SENSORS_MAX16064=m
+CONFIG_SENSORS_MAX20751=m
+CONFIG_SENSORS_MAX31785=m
+CONFIG_SENSORS_MAX34440=m
+CONFIG_SENSORS_MAX8688=m
+CONFIG_SENSORS_PXE1610=m
+CONFIG_SENSORS_TPS40422=m
+CONFIG_SENSORS_TPS53679=m
+CONFIG_SENSORS_UCD9000=m
+CONFIG_SENSORS_UCD9200=m
+CONFIG_SENSORS_ZL6100=m
+CONFIG_SENSORS_SHT15=m
+CONFIG_SENSORS_SHT21=m
+CONFIG_SENSORS_SHT3x=m
+CONFIG_SENSORS_SHTC1=m
+CONFIG_SENSORS_SIS5595=m
+CONFIG_SENSORS_DME1737=m
+CONFIG_SENSORS_EMC1403=m
+CONFIG_SENSORS_EMC2103=m
+CONFIG_SENSORS_EMC6W201=m
+CONFIG_SENSORS_SMSC47M1=m
+CONFIG_SENSORS_SMSC47M192=m
+CONFIG_SENSORS_SMSC47B397=m
+CONFIG_SENSORS_SCH56XX_COMMON=m
+CONFIG_SENSORS_SCH5627=m
+CONFIG_SENSORS_SCH5636=m
+CONFIG_SENSORS_STTS751=m
+CONFIG_SENSORS_SMM665=m
+CONFIG_SENSORS_ADC128D818=m
+CONFIG_SENSORS_ADS7828=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_AMC6821=m
+CONFIG_SENSORS_INA209=m
+CONFIG_SENSORS_INA2XX=m
+CONFIG_SENSORS_INA3221=m
+CONFIG_SENSORS_TC74=m
+CONFIG_SENSORS_THMC50=m
+CONFIG_SENSORS_TMP102=m
+CONFIG_SENSORS_TMP103=m
+CONFIG_SENSORS_TMP108=m
+CONFIG_SENSORS_TMP401=m
+CONFIG_SENSORS_TMP421=m
+CONFIG_SENSORS_VIA_CPUTEMP=m
+CONFIG_SENSORS_VIA686A=m
+CONFIG_SENSORS_VT1211=m
+CONFIG_SENSORS_VT8231=m
+CONFIG_SENSORS_W83773G=m
+CONFIG_SENSORS_W83781D=m
+CONFIG_SENSORS_W83791D=m
+CONFIG_SENSORS_W83792D=m
+CONFIG_SENSORS_W83793=m
+CONFIG_SENSORS_W83795=m
+# CONFIG_SENSORS_W83795_FANCTRL is not set
+CONFIG_SENSORS_W83L785TS=m
+CONFIG_SENSORS_W83L786NG=m
+CONFIG_SENSORS_W83627HF=m
+CONFIG_SENSORS_W83627EHF=m
+CONFIG_SENSORS_XGENE=m
+
+#
+# ACPI drivers
+#
+CONFIG_SENSORS_ACPI_POWER=m
+CONFIG_SENSORS_ATK0110=m
+CONFIG_THERMAL=y
+# CONFIG_THERMAL_STATISTICS is not set
+CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0
+CONFIG_THERMAL_HWMON=y
+CONFIG_THERMAL_WRITABLE_TRIPS=y
+CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y
+# CONFIG_THERMAL_DEFAULT_GOV_FAIR_SHARE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_USER_SPACE is not set
+# CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR is not set
+CONFIG_THERMAL_GOV_FAIR_SHARE=y
+CONFIG_THERMAL_GOV_STEP_WISE=y
+CONFIG_THERMAL_GOV_BANG_BANG=y
+CONFIG_THERMAL_GOV_USER_SPACE=y
+CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y
+# CONFIG_CLOCK_THERMAL is not set
+# CONFIG_DEVFREQ_THERMAL is not set
+# CONFIG_THERMAL_EMULATION is not set
+
+#
+# Intel thermal drivers
+#
+CONFIG_INTEL_POWERCLAMP=m
+CONFIG_X86_PKG_TEMP_THERMAL=m
+CONFIG_INTEL_SOC_DTS_IOSF_CORE=m
+# CONFIG_INTEL_SOC_DTS_THERMAL is not set
+
+#
+# ACPI INT340X thermal drivers
+#
+CONFIG_INT340X_THERMAL=m
+CONFIG_ACPI_THERMAL_REL=m
+# CONFIG_INT3406_THERMAL is not set
+# end of ACPI INT340X thermal drivers
+
+CONFIG_INTEL_PCH_THERMAL=m
+# end of Intel thermal drivers
+
+CONFIG_GENERIC_ADC_THERMAL=m
+CONFIG_WATCHDOG=y
+CONFIG_WATCHDOG_CORE=y
+# CONFIG_WATCHDOG_NOWAYOUT is not set
+CONFIG_WATCHDOG_HANDLE_BOOT_ENABLED=y
+CONFIG_WATCHDOG_OPEN_TIMEOUT=0
+# CONFIG_WATCHDOG_SYSFS is not set
+
+#
+# Watchdog Pretimeout Governors
+#
+# CONFIG_WATCHDOG_PRETIMEOUT_GOV is not set
+
+#
+# Watchdog Device Drivers
+#
+CONFIG_SOFT_WATCHDOG=m
+CONFIG_WDAT_WDT=m
+CONFIG_XILINX_WATCHDOG=m
+CONFIG_ZIIRAVE_WATCHDOG=m
+CONFIG_CADENCE_WATCHDOG=m
+CONFIG_DW_WATCHDOG=m
+CONFIG_MAX63XX_WATCHDOG=m
+CONFIG_RETU_WATCHDOG=m
+CONFIG_ACQUIRE_WDT=m
+CONFIG_ADVANTECH_WDT=m
+CONFIG_ALIM1535_WDT=m
+CONFIG_ALIM7101_WDT=m
+CONFIG_EBC_C384_WDT=m
+CONFIG_F71808E_WDT=m
+CONFIG_SP5100_TCO=m
+CONFIG_SBC_FITPC2_WATCHDOG=m
+CONFIG_EUROTECH_WDT=m
+CONFIG_IB700_WDT=m
+CONFIG_IBMASR=m
+CONFIG_WAFER_WDT=m
+CONFIG_I6300ESB_WDT=m
+CONFIG_IE6XX_WDT=m
+CONFIG_ITCO_WDT=m
+CONFIG_ITCO_VENDOR_SUPPORT=y
+CONFIG_IT8712F_WDT=m
+CONFIG_IT87_WDT=m
+CONFIG_HP_WATCHDOG=m
+CONFIG_HPWDT_NMI_DECODING=y
+CONFIG_KEMPLD_WDT=m
+CONFIG_SC1200_WDT=m
+CONFIG_PC87413_WDT=m
+CONFIG_NV_TCO=m
+CONFIG_60XX_WDT=m
+CONFIG_CPU5_WDT=m
+CONFIG_SMSC_SCH311X_WDT=m
+CONFIG_SMSC37B787_WDT=m
+CONFIG_TQMX86_WDT=m
+CONFIG_VIA_WDT=m
+CONFIG_W83627HF_WDT=m
+CONFIG_W83877F_WDT=m
+CONFIG_W83977F_WDT=m
+CONFIG_MACHZ_WDT=m
+CONFIG_SBC_EPX_C3_WATCHDOG=m
+CONFIG_INTEL_MEI_WDT=m
+CONFIG_NI903X_WDT=m
+CONFIG_NIC7018_WDT=m
+CONFIG_MEN_A21_WDT=m
+CONFIG_XEN_WDT=m
+
+#
+# PCI-based Watchdog Cards
+#
+CONFIG_PCIPCWATCHDOG=m
+CONFIG_WDTPCI=m
+
+#
+# USB-based Watchdog Cards
+#
+CONFIG_USBPCWATCHDOG=m
+CONFIG_SSB_POSSIBLE=y
+CONFIG_SSB=m
+CONFIG_SSB_SPROM=y
+CONFIG_SSB_BLOCKIO=y
+CONFIG_SSB_PCIHOST_POSSIBLE=y
+CONFIG_SSB_PCIHOST=y
+CONFIG_SSB_B43_PCI_BRIDGE=y
+CONFIG_SSB_PCMCIAHOST_POSSIBLE=y
+CONFIG_SSB_PCMCIAHOST=y
+CONFIG_SSB_SDIOHOST_POSSIBLE=y
+CONFIG_SSB_SDIOHOST=y
+CONFIG_SSB_DRIVER_PCICORE_POSSIBLE=y
+CONFIG_SSB_DRIVER_PCICORE=y
+CONFIG_SSB_DRIVER_GPIO=y
+CONFIG_BCMA_POSSIBLE=y
+CONFIG_BCMA=m
+CONFIG_BCMA_BLOCKIO=y
+CONFIG_BCMA_HOST_PCI_POSSIBLE=y
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_HOST_SOC is not set
+CONFIG_BCMA_DRIVER_PCI=y
+CONFIG_BCMA_DRIVER_GMAC_CMN=y
+CONFIG_BCMA_DRIVER_GPIO=y
+# CONFIG_BCMA_DEBUG is not set
+
+#
+# Multifunction device drivers
+#
+CONFIG_MFD_CORE=m
+# CONFIG_MFD_AS3711 is not set
+# CONFIG_PMIC_ADP5520 is not set
+# CONFIG_MFD_AAT2870_CORE is not set
+CONFIG_MFD_BCM590XX=m
+# CONFIG_MFD_BD9571MWV is not set
+# CONFIG_MFD_AXP20X_I2C is not set
+# CONFIG_MFD_MADERA is not set
+# CONFIG_PMIC_DA903X is not set
+# CONFIG_MFD_DA9052_SPI is not set
+# CONFIG_MFD_DA9052_I2C is not set
+# CONFIG_MFD_DA9055 is not set
+# CONFIG_MFD_DA9062 is not set
+# CONFIG_MFD_DA9063 is not set
+# CONFIG_MFD_DA9150 is not set
+# CONFIG_MFD_DLN2 is not set
+CONFIG_MFD_MC13XXX=m
+CONFIG_MFD_MC13XXX_SPI=m
+CONFIG_MFD_MC13XXX_I2C=m
+CONFIG_HTC_PASIC3=m
+# CONFIG_HTC_I2CPLD is not set
+CONFIG_MFD_INTEL_QUARK_I2C_GPIO=m
+CONFIG_LPC_ICH=m
+CONFIG_LPC_SCH=m
+# CONFIG_INTEL_SOC_PMIC_BXTWC is not set
+# CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
+CONFIG_MFD_INTEL_LPSS=m
+CONFIG_MFD_INTEL_LPSS_ACPI=m
+CONFIG_MFD_INTEL_LPSS_PCI=m
+CONFIG_MFD_JANZ_CMODIO=m
+CONFIG_MFD_KEMPLD=m
+# CONFIG_MFD_88PM800 is not set
+# CONFIG_MFD_88PM805 is not set
+# CONFIG_MFD_88PM860X is not set
+# CONFIG_MFD_MAX14577 is not set
+# CONFIG_MFD_MAX77693 is not set
+# CONFIG_MFD_MAX77843 is not set
+# CONFIG_MFD_MAX8907 is not set
+# CONFIG_MFD_MAX8925 is not set
+# CONFIG_MFD_MAX8997 is not set
+# CONFIG_MFD_MAX8998 is not set
+# CONFIG_MFD_MT6397 is not set
+# CONFIG_MFD_MENF21BMC is not set
+# CONFIG_EZX_PCAP is not set
+CONFIG_MFD_VIPERBOARD=m
+CONFIG_MFD_RETU=m
+CONFIG_MFD_PCF50633=m
+CONFIG_PCF50633_ADC=m
+CONFIG_PCF50633_GPIO=m
+# CONFIG_UCB1400_CORE is not set
+CONFIG_MFD_RDC321X=m
+# CONFIG_MFD_RT5033 is not set
+# CONFIG_MFD_RC5T583 is not set
+# CONFIG_MFD_SEC_CORE is not set
+CONFIG_MFD_SI476X_CORE=m
+CONFIG_MFD_SM501=m
+CONFIG_MFD_SM501_GPIO=y
+# CONFIG_MFD_SKY81452 is not set
+# CONFIG_MFD_SMSC is not set
+# CONFIG_ABX500_CORE is not set
+CONFIG_MFD_SYSCON=y
+CONFIG_MFD_TI_AM335X_TSCADC=m
+CONFIG_MFD_LP3943=m
+# CONFIG_MFD_LP8788 is not set
+# CONFIG_MFD_TI_LMU is not set
+# CONFIG_MFD_PALMAS is not set
+CONFIG_TPS6105X=m
+# CONFIG_TPS65010 is not set
+CONFIG_TPS6507X=m
+# CONFIG_MFD_TPS65086 is not set
+# CONFIG_MFD_TPS65090 is not set
+# CONFIG_MFD_TI_LP873X is not set
+# CONFIG_MFD_TPS6586X is not set
+# CONFIG_MFD_TPS65910 is not set
+# CONFIG_MFD_TPS65912_I2C is not set
+# CONFIG_MFD_TPS65912_SPI is not set
+# CONFIG_MFD_TPS80031 is not set
+# CONFIG_TWL4030_CORE is not set
+# CONFIG_TWL6040_CORE is not set
+CONFIG_MFD_WL1273_CORE=m
+CONFIG_MFD_LM3533=m
+# CONFIG_MFD_TQMX86 is not set
+CONFIG_MFD_VX855=m
+# CONFIG_MFD_ARIZONA_I2C is not set
+# CONFIG_MFD_ARIZONA_SPI is not set
+# CONFIG_MFD_WM8400 is not set
+# CONFIG_MFD_WM831X_I2C is not set
+# CONFIG_MFD_WM831X_SPI is not set
+# CONFIG_MFD_WM8350_I2C is not set
+# CONFIG_MFD_WM8994 is not set
+# end of Multifunction device drivers
+
+CONFIG_REGULATOR=y
+# CONFIG_REGULATOR_DEBUG is not set
+CONFIG_REGULATOR_FIXED_VOLTAGE=m
+CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
+CONFIG_REGULATOR_USERSPACE_CONSUMER=m
+CONFIG_REGULATOR_88PG86X=m
+CONFIG_REGULATOR_ACT8865=m
+CONFIG_REGULATOR_AD5398=m
+CONFIG_REGULATOR_ANATOP=m
+CONFIG_REGULATOR_BCM590XX=m
+CONFIG_REGULATOR_DA9210=m
+CONFIG_REGULATOR_DA9211=m
+CONFIG_REGULATOR_FAN53555=m
+CONFIG_REGULATOR_GPIO=m
+CONFIG_REGULATOR_ISL9305=m
+CONFIG_REGULATOR_ISL6271A=m
+CONFIG_REGULATOR_LP3971=m
+CONFIG_REGULATOR_LP3972=m
+CONFIG_REGULATOR_LP872X=m
+CONFIG_REGULATOR_LP8755=m
+CONFIG_REGULATOR_LTC3589=m
+CONFIG_REGULATOR_LTC3676=m
+CONFIG_REGULATOR_MAX1586=m
+CONFIG_REGULATOR_MAX8649=m
+CONFIG_REGULATOR_MAX8660=m
+CONFIG_REGULATOR_MAX8952=m
+CONFIG_REGULATOR_MC13XXX_CORE=m
+CONFIG_REGULATOR_MC13783=m
+CONFIG_REGULATOR_MC13892=m
+CONFIG_REGULATOR_MT6311=m
+CONFIG_REGULATOR_PCF50633=m
+CONFIG_REGULATOR_PFUZE100=m
+CONFIG_REGULATOR_PV88060=m
+CONFIG_REGULATOR_PV88080=m
+CONFIG_REGULATOR_PV88090=m
+CONFIG_REGULATOR_SLG51000=m
+CONFIG_REGULATOR_TPS51632=m
+CONFIG_REGULATOR_TPS6105X=m
+CONFIG_REGULATOR_TPS62360=m
+CONFIG_REGULATOR_TPS65023=m
+CONFIG_REGULATOR_TPS6507X=m
+CONFIG_REGULATOR_TPS65132=m
+CONFIG_REGULATOR_TPS6524X=m
+CONFIG_CEC_CORE=m
+CONFIG_CEC_NOTIFIER=y
+CONFIG_RC_CORE=m
+CONFIG_RC_MAP=m
+# CONFIG_LIRC is not set
+CONFIG_RC_DECODERS=y
+CONFIG_IR_NEC_DECODER=m
+CONFIG_IR_RC5_DECODER=m
+CONFIG_IR_RC6_DECODER=m
+CONFIG_IR_JVC_DECODER=m
+CONFIG_IR_SONY_DECODER=m
+CONFIG_IR_SANYO_DECODER=m
+CONFIG_IR_SHARP_DECODER=m
+CONFIG_IR_MCE_KBD_DECODER=m
+CONFIG_IR_XMP_DECODER=m
+CONFIG_IR_IMON_DECODER=m
+CONFIG_IR_RCMM_DECODER=m
+CONFIG_RC_DEVICES=y
+CONFIG_RC_ATI_REMOTE=m
+CONFIG_IR_ENE=m
+CONFIG_IR_IMON=m
+CONFIG_IR_IMON_RAW=m
+CONFIG_IR_MCEUSB=m
+CONFIG_IR_ITE_CIR=m
+CONFIG_IR_FINTEK=m
+CONFIG_IR_NUVOTON=m
+CONFIG_IR_REDRAT3=m
+CONFIG_IR_STREAMZAP=m
+CONFIG_IR_WINBOND_CIR=m
+CONFIG_IR_IGORPLUGUSB=m
+CONFIG_IR_IGUANA=m
+CONFIG_IR_TTUSBIR=m
+# CONFIG_RC_LOOPBACK is not set
+CONFIG_IR_SERIAL=m
+CONFIG_IR_SERIAL_TRANSMITTER=y
+CONFIG_IR_SIR=m
+# CONFIG_RC_XBOX_DVD is not set
+CONFIG_MEDIA_SUPPORT=m
+
+#
+# Multimedia core support
+#
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
+CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y
+CONFIG_MEDIA_RADIO_SUPPORT=y
+CONFIG_MEDIA_SDR_SUPPORT=y
+CONFIG_MEDIA_CEC_SUPPORT=y
+CONFIG_MEDIA_CEC_RC=y
+CONFIG_MEDIA_CONTROLLER=y
+CONFIG_MEDIA_CONTROLLER_DVB=y
+CONFIG_VIDEO_DEV=m
+# CONFIG_VIDEO_V4L2_SUBDEV_API is not set
+CONFIG_VIDEO_V4L2=m
+CONFIG_VIDEO_V4L2_I2C=y
+# CONFIG_VIDEO_ADV_DEBUG is not set
+# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set
+CONFIG_VIDEO_TUNER=m
+CONFIG_V4L2_FWNODE=m
+CONFIG_VIDEOBUF_GEN=m
+CONFIG_VIDEOBUF_DMA_SG=m
+CONFIG_VIDEOBUF_VMALLOC=m
+CONFIG_DVB_CORE=m
+# CONFIG_DVB_MMAP is not set
+CONFIG_DVB_NET=y
+CONFIG_TTPCI_EEPROM=m
+CONFIG_DVB_MAX_ADAPTERS=8
+CONFIG_DVB_DYNAMIC_MINORS=y
+# CONFIG_DVB_DEMUX_SECTION_LOSS_LOG is not set
+# CONFIG_DVB_ULE_DEBUG is not set
+
+#
+# Media drivers
+#
+CONFIG_MEDIA_USB_SUPPORT=y
+
+#
+# Webcam devices
+#
+CONFIG_USB_VIDEO_CLASS=m
+CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
+CONFIG_USB_GSPCA=m
+CONFIG_USB_M5602=m
+CONFIG_USB_STV06XX=m
+CONFIG_USB_GL860=m
+CONFIG_USB_GSPCA_BENQ=m
+CONFIG_USB_GSPCA_CONEX=m
+CONFIG_USB_GSPCA_CPIA1=m
+CONFIG_USB_GSPCA_DTCS033=m
+CONFIG_USB_GSPCA_ETOMS=m
+CONFIG_USB_GSPCA_FINEPIX=m
+CONFIG_USB_GSPCA_JEILINJ=m
+CONFIG_USB_GSPCA_JL2005BCD=m
+CONFIG_USB_GSPCA_KINECT=m
+CONFIG_USB_GSPCA_KONICA=m
+CONFIG_USB_GSPCA_MARS=m
+CONFIG_USB_GSPCA_MR97310A=m
+CONFIG_USB_GSPCA_NW80X=m
+CONFIG_USB_GSPCA_OV519=m
+CONFIG_USB_GSPCA_OV534=m
+CONFIG_USB_GSPCA_OV534_9=m
+CONFIG_USB_GSPCA_PAC207=m
+CONFIG_USB_GSPCA_PAC7302=m
+CONFIG_USB_GSPCA_PAC7311=m
+CONFIG_USB_GSPCA_SE401=m
+CONFIG_USB_GSPCA_SN9C2028=m
+CONFIG_USB_GSPCA_SN9C20X=m
+CONFIG_USB_GSPCA_SONIXB=m
+CONFIG_USB_GSPCA_SONIXJ=m
+CONFIG_USB_GSPCA_SPCA500=m
+CONFIG_USB_GSPCA_SPCA501=m
+CONFIG_USB_GSPCA_SPCA505=m
+CONFIG_USB_GSPCA_SPCA506=m
+CONFIG_USB_GSPCA_SPCA508=m
+CONFIG_USB_GSPCA_SPCA561=m
+CONFIG_USB_GSPCA_SPCA1528=m
+CONFIG_USB_GSPCA_SQ905=m
+CONFIG_USB_GSPCA_SQ905C=m
+CONFIG_USB_GSPCA_SQ930X=m
+CONFIG_USB_GSPCA_STK014=m
+CONFIG_USB_GSPCA_STK1135=m
+CONFIG_USB_GSPCA_STV0680=m
+CONFIG_USB_GSPCA_SUNPLUS=m
+CONFIG_USB_GSPCA_T613=m
+CONFIG_USB_GSPCA_TOPRO=m
+CONFIG_USB_GSPCA_TOUPTEK=m
+CONFIG_USB_GSPCA_TV8532=m
+CONFIG_USB_GSPCA_VC032X=m
+CONFIG_USB_GSPCA_VICAM=m
+CONFIG_USB_GSPCA_XIRLINK_CIT=m
+CONFIG_USB_GSPCA_ZC3XX=m
+CONFIG_USB_PWC=m
+# CONFIG_USB_PWC_DEBUG is not set
+CONFIG_USB_PWC_INPUT_EVDEV=y
+CONFIG_VIDEO_CPIA2=m
+CONFIG_USB_ZR364XX=m
+CONFIG_USB_STKWEBCAM=m
+CONFIG_USB_S2255=m
+CONFIG_VIDEO_USBTV=m
+
+#
+# Analog TV USB devices
+#
+CONFIG_VIDEO_PVRUSB2=m
+CONFIG_VIDEO_PVRUSB2_SYSFS=y
+CONFIG_VIDEO_PVRUSB2_DVB=y
+# CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set
+CONFIG_VIDEO_HDPVR=m
+CONFIG_VIDEO_USBVISION=m
+CONFIG_VIDEO_STK1160_COMMON=m
+CONFIG_VIDEO_STK1160=m
+CONFIG_VIDEO_GO7007=m
+CONFIG_VIDEO_GO7007_USB=m
+CONFIG_VIDEO_GO7007_LOADER=m
+CONFIG_VIDEO_GO7007_USB_S2250_BOARD=m
+
+#
+# Analog/digital TV USB devices
+#
+CONFIG_VIDEO_AU0828=m
+CONFIG_VIDEO_AU0828_V4L2=y
+CONFIG_VIDEO_AU0828_RC=y
+CONFIG_VIDEO_CX231XX=m
+CONFIG_VIDEO_CX231XX_RC=y
+CONFIG_VIDEO_CX231XX_ALSA=m
+CONFIG_VIDEO_CX231XX_DVB=m
+CONFIG_VIDEO_TM6000=m
+CONFIG_VIDEO_TM6000_ALSA=m
+CONFIG_VIDEO_TM6000_DVB=m
+
+#
+# Digital TV USB devices
+#
+CONFIG_DVB_USB=m
+# CONFIG_DVB_USB_DEBUG is not set
+CONFIG_DVB_USB_DIB3000MC=m
+CONFIG_DVB_USB_A800=m
+CONFIG_DVB_USB_DIBUSB_MB=m
+# CONFIG_DVB_USB_DIBUSB_MB_FAULTY is not set
+CONFIG_DVB_USB_DIBUSB_MC=m
+CONFIG_DVB_USB_DIB0700=m
+CONFIG_DVB_USB_UMT_010=m
+CONFIG_DVB_USB_CXUSB=m
+# CONFIG_DVB_USB_CXUSB_ANALOG is not set
+CONFIG_DVB_USB_M920X=m
+CONFIG_DVB_USB_DIGITV=m
+CONFIG_DVB_USB_VP7045=m
+CONFIG_DVB_USB_VP702X=m
+CONFIG_DVB_USB_GP8PSK=m
+CONFIG_DVB_USB_NOVA_T_USB2=m
+CONFIG_DVB_USB_TTUSB2=m
+CONFIG_DVB_USB_DTT200U=m
+CONFIG_DVB_USB_OPERA1=m
+CONFIG_DVB_USB_AF9005=m
+CONFIG_DVB_USB_AF9005_REMOTE=m
+CONFIG_DVB_USB_PCTV452E=m
+CONFIG_DVB_USB_DW2102=m
+CONFIG_DVB_USB_CINERGY_T2=m
+CONFIG_DVB_USB_DTV5100=m
+CONFIG_DVB_USB_AZ6027=m
+CONFIG_DVB_USB_TECHNISAT_USB2=m
+CONFIG_DVB_USB_V2=m
+CONFIG_DVB_USB_AF9015=m
+CONFIG_DVB_USB_AF9035=m
+CONFIG_DVB_USB_ANYSEE=m
+CONFIG_DVB_USB_AU6610=m
+CONFIG_DVB_USB_AZ6007=m
+CONFIG_DVB_USB_CE6230=m
+CONFIG_DVB_USB_EC168=m
+CONFIG_DVB_USB_GL861=m
+CONFIG_DVB_USB_LME2510=m
+CONFIG_DVB_USB_MXL111SF=m
+CONFIG_DVB_USB_RTL28XXU=m
+CONFIG_DVB_USB_DVBSKY=m
+CONFIG_DVB_USB_ZD1301=m
+CONFIG_DVB_TTUSB_BUDGET=m
+CONFIG_DVB_TTUSB_DEC=m
+CONFIG_SMS_USB_DRV=m
+CONFIG_DVB_B2C2_FLEXCOP_USB=m
+# CONFIG_DVB_B2C2_FLEXCOP_USB_DEBUG is not set
+CONFIG_DVB_AS102=m
+
+#
+# Webcam, TV (analog/digital) USB devices
+#
+CONFIG_VIDEO_EM28XX=m
+CONFIG_VIDEO_EM28XX_V4L2=m
+CONFIG_VIDEO_EM28XX_ALSA=m
+CONFIG_VIDEO_EM28XX_DVB=m
+CONFIG_VIDEO_EM28XX_RC=m
+
+#
+# Software defined radio USB devices
+#
+CONFIG_USB_AIRSPY=m
+CONFIG_USB_HACKRF=m
+CONFIG_USB_MSI2500=m
+
+#
+# USB HDMI CEC adapters
+#
+CONFIG_USB_PULSE8_CEC=m
+CONFIG_USB_RAINSHADOW_CEC=m
+CONFIG_MEDIA_PCI_SUPPORT=y
+
+#
+# Media capture support
+#
+CONFIG_VIDEO_MEYE=m
+CONFIG_VIDEO_SOLO6X10=m
+# CONFIG_VIDEO_TW5864 is not set
+CONFIG_VIDEO_TW68=m
+CONFIG_VIDEO_TW686X=m
+
+#
+# Media capture/analog TV support
+#
+CONFIG_VIDEO_IVTV=m
+# CONFIG_VIDEO_IVTV_DEPRECATED_IOCTLS is not set
+CONFIG_VIDEO_IVTV_ALSA=m
+CONFIG_VIDEO_FB_IVTV=m
+# CONFIG_VIDEO_FB_IVTV_FORCE_PAT is not set
+CONFIG_VIDEO_HEXIUM_GEMINI=m
+CONFIG_VIDEO_HEXIUM_ORION=m
+CONFIG_VIDEO_MXB=m
+CONFIG_VIDEO_DT3155=m
+
+#
+# Media capture/analog/hybrid TV support
+#
+CONFIG_VIDEO_CX18=m
+CONFIG_VIDEO_CX18_ALSA=m
+CONFIG_VIDEO_CX23885=m
+CONFIG_MEDIA_ALTERA_CI=m
+CONFIG_VIDEO_CX25821=m
+CONFIG_VIDEO_CX25821_ALSA=m
+CONFIG_VIDEO_CX88=m
+CONFIG_VIDEO_CX88_ALSA=m
+CONFIG_VIDEO_CX88_BLACKBIRD=m
+CONFIG_VIDEO_CX88_DVB=m
+CONFIG_VIDEO_CX88_ENABLE_VP3054=y
+CONFIG_VIDEO_CX88_VP3054=m
+CONFIG_VIDEO_CX88_MPEG=m
+CONFIG_VIDEO_BT848=m
+CONFIG_DVB_BT8XX=m
+CONFIG_VIDEO_SAA7134=m
+CONFIG_VIDEO_SAA7134_ALSA=m
+CONFIG_VIDEO_SAA7134_RC=y
+CONFIG_VIDEO_SAA7134_DVB=m
+CONFIG_VIDEO_SAA7134_GO7007=m
+CONFIG_VIDEO_SAA7164=m
+
+#
+# Media digital TV PCI Adapters
+#
+CONFIG_DVB_AV7110_IR=y
+CONFIG_DVB_AV7110=m
+CONFIG_DVB_AV7110_OSD=y
+CONFIG_DVB_BUDGET_CORE=m
+CONFIG_DVB_BUDGET=m
+CONFIG_DVB_BUDGET_CI=m
+CONFIG_DVB_BUDGET_AV=m
+CONFIG_DVB_BUDGET_PATCH=m
+CONFIG_DVB_B2C2_FLEXCOP_PCI=m
+# CONFIG_DVB_B2C2_FLEXCOP_PCI_DEBUG is not set
+CONFIG_DVB_PLUTO2=m
+CONFIG_DVB_DM1105=m
+CONFIG_DVB_PT1=m
+CONFIG_DVB_PT3=m
+CONFIG_MANTIS_CORE=m
+CONFIG_DVB_MANTIS=m
+CONFIG_DVB_HOPPER=m
+CONFIG_DVB_NGENE=m
+CONFIG_DVB_DDBRIDGE=m
+# CONFIG_DVB_DDBRIDGE_MSIENABLE is not set
+CONFIG_DVB_SMIPCIE=m
+CONFIG_DVB_NETUP_UNIDVB=m
+# CONFIG_V4L_PLATFORM_DRIVERS is not set
+# CONFIG_V4L_MEM2MEM_DRIVERS is not set
+# CONFIG_V4L_TEST_DRIVERS is not set
+# CONFIG_DVB_PLATFORM_DRIVERS is not set
+# CONFIG_CEC_PLATFORM_DRIVERS is not set
+# CONFIG_SDR_PLATFORM_DRIVERS is not set
+
+#
+# Supported MMC/SDIO adapters
+#
+CONFIG_SMS_SDIO_DRV=m
+CONFIG_RADIO_ADAPTERS=y
+CONFIG_RADIO_TEA575X=m
+CONFIG_RADIO_SI470X=m
+CONFIG_USB_SI470X=m
+CONFIG_I2C_SI470X=m
+CONFIG_RADIO_SI4713=m
+CONFIG_USB_SI4713=m
+CONFIG_PLATFORM_SI4713=m
+CONFIG_I2C_SI4713=m
+# CONFIG_RADIO_SI476X is not set
+CONFIG_USB_MR800=m
+CONFIG_USB_DSBR=m
+CONFIG_RADIO_MAXIRADIO=m
+CONFIG_RADIO_SHARK=m
+CONFIG_RADIO_SHARK2=m
+CONFIG_USB_KEENE=m
+CONFIG_USB_RAREMONO=m
+CONFIG_USB_MA901=m
+CONFIG_RADIO_TEA5764=m
+CONFIG_RADIO_SAA7706H=m
+CONFIG_RADIO_TEF6862=m
+CONFIG_RADIO_WL1273=m
+
+#
+# Texas Instruments WL128x FM driver (ST based)
+#
+# end of Texas Instruments WL128x FM driver (ST based)
+
+#
+# Supported FireWire (IEEE 1394) Adapters
+#
+CONFIG_DVB_FIREDTV=m
+CONFIG_DVB_FIREDTV_INPUT=y
+CONFIG_MEDIA_COMMON_OPTIONS=y
+
+#
+# common driver options
+#
+CONFIG_VIDEO_CX2341X=m
+CONFIG_VIDEO_TVEEPROM=m
+CONFIG_CYPRESS_FIRMWARE=m
+CONFIG_VIDEOBUF2_CORE=m
+CONFIG_VIDEOBUF2_V4L2=m
+CONFIG_VIDEOBUF2_MEMOPS=m
+CONFIG_VIDEOBUF2_DMA_CONTIG=m
+CONFIG_VIDEOBUF2_VMALLOC=m
+CONFIG_VIDEOBUF2_DMA_SG=m
+CONFIG_VIDEOBUF2_DVB=m
+CONFIG_DVB_B2C2_FLEXCOP=m
+CONFIG_VIDEO_SAA7146=m
+CONFIG_VIDEO_SAA7146_VV=m
+CONFIG_SMS_SIANO_MDTV=m
+CONFIG_SMS_SIANO_RC=y
+# CONFIG_SMS_SIANO_DEBUGFS is not set
+
+#
+# Media ancillary drivers (tuners, sensors, i2c, spi, frontends)
+#
+CONFIG_MEDIA_SUBDRV_AUTOSELECT=y
+CONFIG_MEDIA_ATTACH=y
+CONFIG_VIDEO_IR_I2C=m
+
+#
+# I2C Encoders, decoders, sensors and other helper chips
+#
+
+#
+# Audio decoders, processors and mixers
+#
+CONFIG_VIDEO_TVAUDIO=m
+CONFIG_VIDEO_TDA7432=m
+CONFIG_VIDEO_TDA9840=m
+CONFIG_VIDEO_TEA6415C=m
+CONFIG_VIDEO_TEA6420=m
+CONFIG_VIDEO_MSP3400=m
+CONFIG_VIDEO_CS3308=m
+CONFIG_VIDEO_CS5345=m
+CONFIG_VIDEO_CS53L32A=m
+# CONFIG_VIDEO_TLV320AIC23B is not set
+CONFIG_VIDEO_UDA1342=m
+CONFIG_VIDEO_WM8775=m
+CONFIG_VIDEO_WM8739=m
+CONFIG_VIDEO_VP27SMPX=m
+CONFIG_VIDEO_SONY_BTF_MPX=m
+
+#
+# RDS decoders
+#
+CONFIG_VIDEO_SAA6588=m
+
+#
+# Video decoders
+#
+# CONFIG_VIDEO_ADV7183 is not set
+# CONFIG_VIDEO_BT819 is not set
+# CONFIG_VIDEO_BT856 is not set
+# CONFIG_VIDEO_BT866 is not set
+# CONFIG_VIDEO_KS0127 is not set
+# CONFIG_VIDEO_ML86V7667 is not set
+# CONFIG_VIDEO_SAA7110 is not set
+CONFIG_VIDEO_SAA711X=m
+# CONFIG_VIDEO_TVP514X is not set
+CONFIG_VIDEO_TVP5150=m
+# CONFIG_VIDEO_TVP7002 is not set
+CONFIG_VIDEO_TW2804=m
+CONFIG_VIDEO_TW9903=m
+CONFIG_VIDEO_TW9906=m
+# CONFIG_VIDEO_TW9910 is not set
+# CONFIG_VIDEO_VPX3220 is not set
+
+#
+# Video and audio decoders
+#
+CONFIG_VIDEO_SAA717X=m
+CONFIG_VIDEO_CX25840=m
+
+#
+# Video encoders
+#
+CONFIG_VIDEO_SAA7127=m
+# CONFIG_VIDEO_SAA7185 is not set
+# CONFIG_VIDEO_ADV7170 is not set
+# CONFIG_VIDEO_ADV7175 is not set
+# CONFIG_VIDEO_ADV7343 is not set
+# CONFIG_VIDEO_ADV7393 is not set
+# CONFIG_VIDEO_AK881X is not set
+# CONFIG_VIDEO_THS8200 is not set
+
+#
+# Camera sensor devices
+#
+CONFIG_VIDEO_OV2640=m
+# CONFIG_VIDEO_OV2659 is not set
+# CONFIG_VIDEO_OV2680 is not set
+# CONFIG_VIDEO_OV2685 is not set
+# CONFIG_VIDEO_OV6650 is not set
+# CONFIG_VIDEO_OV5695 is not set
+# CONFIG_VIDEO_OV772X is not set
+CONFIG_VIDEO_OV7640=m
+# CONFIG_VIDEO_OV7670 is not set
+# CONFIG_VIDEO_OV7740 is not set
+# CONFIG_VIDEO_OV9640 is not set
+# CONFIG_VIDEO_VS6624 is not set
+# CONFIG_VIDEO_MT9M111 is not set
+# CONFIG_VIDEO_MT9T112 is not set
+CONFIG_VIDEO_MT9V011=m
+# CONFIG_VIDEO_MT9V111 is not set
+# CONFIG_VIDEO_SR030PC30 is not set
+# CONFIG_VIDEO_RJ54N1 is not set
+
+#
+# Lens drivers
+#
+# CONFIG_VIDEO_AD5820 is not set
+
+#
+# Flash devices
+#
+# CONFIG_VIDEO_ADP1653 is not set
+# CONFIG_VIDEO_LM3560 is not set
+# CONFIG_VIDEO_LM3646 is not set
+
+#
+# Video improvement chips
+#
+CONFIG_VIDEO_UPD64031A=m
+CONFIG_VIDEO_UPD64083=m
+
+#
+# Audio/Video compression chips
+#
+CONFIG_VIDEO_SAA6752HS=m
+
+#
+# SDR tuner chips
+#
+# CONFIG_SDR_MAX2175 is not set
+
+#
+# Miscellaneous helper chips
+#
+# CONFIG_VIDEO_THS7303 is not set
+CONFIG_VIDEO_M52790=m
+# CONFIG_VIDEO_I2C is not set
+# end of I2C Encoders, decoders, sensors and other helper chips
+
+#
+# SPI helper chips
+#
+# end of SPI helper chips
+
+#
+# Media SPI Adapters
+#
+# CONFIG_CXD2880_SPI_DRV is not set
+# end of Media SPI Adapters
+
+CONFIG_MEDIA_TUNER=m
+
+#
+# Customize TV tuners
+#
+CONFIG_MEDIA_TUNER_SIMPLE=m
+CONFIG_MEDIA_TUNER_TDA18250=m
+CONFIG_MEDIA_TUNER_TDA8290=m
+CONFIG_MEDIA_TUNER_TDA827X=m
+CONFIG_MEDIA_TUNER_TDA18271=m
+CONFIG_MEDIA_TUNER_TDA9887=m
+CONFIG_MEDIA_TUNER_TEA5761=m
+CONFIG_MEDIA_TUNER_TEA5767=m
+CONFIG_MEDIA_TUNER_MSI001=m
+CONFIG_MEDIA_TUNER_MT20XX=m
+CONFIG_MEDIA_TUNER_MT2060=m
+CONFIG_MEDIA_TUNER_MT2063=m
+CONFIG_MEDIA_TUNER_MT2266=m
+CONFIG_MEDIA_TUNER_MT2131=m
+CONFIG_MEDIA_TUNER_QT1010=m
+CONFIG_MEDIA_TUNER_XC2028=m
+CONFIG_MEDIA_TUNER_XC5000=m
+CONFIG_MEDIA_TUNER_XC4000=m
+CONFIG_MEDIA_TUNER_MXL5005S=m
+CONFIG_MEDIA_TUNER_MXL5007T=m
+CONFIG_MEDIA_TUNER_MC44S803=m
+CONFIG_MEDIA_TUNER_MAX2165=m
+CONFIG_MEDIA_TUNER_TDA18218=m
+CONFIG_MEDIA_TUNER_FC0011=m
+CONFIG_MEDIA_TUNER_FC0012=m
+CONFIG_MEDIA_TUNER_FC0013=m
+CONFIG_MEDIA_TUNER_TDA18212=m
+CONFIG_MEDIA_TUNER_E4000=m
+CONFIG_MEDIA_TUNER_FC2580=m
+CONFIG_MEDIA_TUNER_M88RS6000T=m
+CONFIG_MEDIA_TUNER_TUA9001=m
+CONFIG_MEDIA_TUNER_SI2157=m
+CONFIG_MEDIA_TUNER_IT913X=m
+CONFIG_MEDIA_TUNER_R820T=m
+CONFIG_MEDIA_TUNER_MXL301RF=m
+CONFIG_MEDIA_TUNER_QM1D1C0042=m
+CONFIG_MEDIA_TUNER_QM1D1B0004=m
+# end of Customize TV tuners
+
+#
+# Customise DVB Frontends
+#
+
+#
+# Multistandard (satellite) frontends
+#
+CONFIG_DVB_STB0899=m
+CONFIG_DVB_STB6100=m
+CONFIG_DVB_STV090x=m
+CONFIG_DVB_STV0910=m
+CONFIG_DVB_STV6110x=m
+CONFIG_DVB_STV6111=m
+CONFIG_DVB_MXL5XX=m
+CONFIG_DVB_M88DS3103=m
+
+#
+# Multistandard (cable + terrestrial) frontends
+#
+CONFIG_DVB_DRXK=m
+CONFIG_DVB_TDA18271C2DD=m
+CONFIG_DVB_SI2165=m
+CONFIG_DVB_MN88472=m
+CONFIG_DVB_MN88473=m
+
+#
+# DVB-S (satellite) frontends
+#
+CONFIG_DVB_CX24110=m
+CONFIG_DVB_CX24123=m
+CONFIG_DVB_MT312=m
+CONFIG_DVB_ZL10036=m
+CONFIG_DVB_ZL10039=m
+CONFIG_DVB_S5H1420=m
+CONFIG_DVB_STV0288=m
+CONFIG_DVB_STB6000=m
+CONFIG_DVB_STV0299=m
+CONFIG_DVB_STV6110=m
+CONFIG_DVB_STV0900=m
+CONFIG_DVB_TDA8083=m
+CONFIG_DVB_TDA10086=m
+CONFIG_DVB_TDA8261=m
+CONFIG_DVB_VES1X93=m
+CONFIG_DVB_TUNER_ITD1000=m
+CONFIG_DVB_TUNER_CX24113=m
+CONFIG_DVB_TDA826X=m
+CONFIG_DVB_TUA6100=m
+CONFIG_DVB_CX24116=m
+CONFIG_DVB_CX24117=m
+CONFIG_DVB_CX24120=m
+CONFIG_DVB_SI21XX=m
+CONFIG_DVB_TS2020=m
+CONFIG_DVB_DS3000=m
+CONFIG_DVB_MB86A16=m
+CONFIG_DVB_TDA10071=m
+
+#
+# DVB-T (terrestrial) frontends
+#
+CONFIG_DVB_SP8870=m
+CONFIG_DVB_SP887X=m
+CONFIG_DVB_CX22700=m
+CONFIG_DVB_CX22702=m
+# CONFIG_DVB_S5H1432 is not set
+CONFIG_DVB_DRXD=m
+CONFIG_DVB_L64781=m
+CONFIG_DVB_TDA1004X=m
+CONFIG_DVB_NXT6000=m
+CONFIG_DVB_MT352=m
+CONFIG_DVB_ZL10353=m
+CONFIG_DVB_DIB3000MB=m
+CONFIG_DVB_DIB3000MC=m
+CONFIG_DVB_DIB7000M=m
+CONFIG_DVB_DIB7000P=m
+# CONFIG_DVB_DIB9000 is not set
+CONFIG_DVB_TDA10048=m
+CONFIG_DVB_AF9013=m
+CONFIG_DVB_EC100=m
+CONFIG_DVB_STV0367=m
+CONFIG_DVB_CXD2820R=m
+CONFIG_DVB_CXD2841ER=m
+CONFIG_DVB_RTL2830=m
+CONFIG_DVB_RTL2832=m
+CONFIG_DVB_RTL2832_SDR=m
+CONFIG_DVB_SI2168=m
+CONFIG_DVB_AS102_FE=m
+CONFIG_DVB_ZD1301_DEMOD=m
+CONFIG_DVB_GP8PSK_FE=m
+# CONFIG_DVB_CXD2880 is not set
+
+#
+# DVB-C (cable) frontends
+#
+CONFIG_DVB_VES1820=m
+CONFIG_DVB_TDA10021=m
+CONFIG_DVB_TDA10023=m
+CONFIG_DVB_STV0297=m
+
+#
+# ATSC (North American/Korean Terrestrial/Cable DTV) frontends
+#
+CONFIG_DVB_NXT200X=m
+CONFIG_DVB_OR51211=m
+CONFIG_DVB_OR51132=m
+CONFIG_DVB_BCM3510=m
+CONFIG_DVB_LGDT330X=m
+CONFIG_DVB_LGDT3305=m
+CONFIG_DVB_LGDT3306A=m
+CONFIG_DVB_LG2160=m
+CONFIG_DVB_S5H1409=m
+CONFIG_DVB_AU8522=m
+CONFIG_DVB_AU8522_DTV=m
+CONFIG_DVB_AU8522_V4L=m
+CONFIG_DVB_S5H1411=m
+
+#
+# ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_S921=m
+CONFIG_DVB_DIB8000=m
+CONFIG_DVB_MB86A20S=m
+
+#
+# ISDB-S (satellite) & ISDB-T (terrestrial) frontends
+#
+CONFIG_DVB_TC90522=m
+# CONFIG_DVB_MN88443X is not set
+
+#
+# Digital terrestrial only tuners/PLL
+#
+CONFIG_DVB_PLL=m
+CONFIG_DVB_TUNER_DIB0070=m
+CONFIG_DVB_TUNER_DIB0090=m
+
+#
+# SEC control devices for DVB-S
+#
+CONFIG_DVB_DRX39XYJ=m
+CONFIG_DVB_LNBH25=m
+# CONFIG_DVB_LNBH29 is not set
+CONFIG_DVB_LNBP21=m
+CONFIG_DVB_LNBP22=m
+CONFIG_DVB_ISL6405=m
+CONFIG_DVB_ISL6421=m
+CONFIG_DVB_ISL6423=m
+CONFIG_DVB_A8293=m
+# CONFIG_DVB_LGS8GL5 is not set
+CONFIG_DVB_LGS8GXX=m
+CONFIG_DVB_ATBM8830=m
+CONFIG_DVB_TDA665x=m
+CONFIG_DVB_IX2505V=m
+CONFIG_DVB_M88RS2000=m
+CONFIG_DVB_AF9033=m
+CONFIG_DVB_HORUS3A=m
+CONFIG_DVB_ASCOT2E=m
+CONFIG_DVB_HELENE=m
+
+#
+# Common Interface (EN50221) controller drivers
+#
+CONFIG_DVB_CXD2099=m
+CONFIG_DVB_SP2=m
+
+#
+# Tools to develop new frontends
+#
+CONFIG_DVB_DUMMY_FE=m
+# end of Customise DVB Frontends
+
+#
+# Graphics support
+#
+CONFIG_AGP=y
+CONFIG_AGP_AMD64=y
+CONFIG_AGP_INTEL=y
+CONFIG_AGP_SIS=y
+CONFIG_AGP_VIA=y
+CONFIG_INTEL_GTT=y
+CONFIG_VGA_ARB=y
+CONFIG_VGA_ARB_MAX_GPUS=64
+CONFIG_VGA_SWITCHEROO=y
+CONFIG_DRM=m
+CONFIG_DRM_MIPI_DBI=m
+CONFIG_DRM_MIPI_DSI=y
+CONFIG_DRM_DP_AUX_CHARDEV=y
+# CONFIG_DRM_DEBUG_SELFTEST is not set
+CONFIG_DRM_KMS_HELPER=m
+CONFIG_DRM_KMS_FB_HELPER=y
+CONFIG_DRM_FBDEV_EMULATION=y
+CONFIG_DRM_FBDEV_OVERALLOC=100
+# CONFIG_DRM_FBDEV_LEAK_PHYS_SMEM is not set
+CONFIG_DRM_LOAD_EDID_FIRMWARE=y
+# CONFIG_DRM_DP_CEC is not set
+CONFIG_DRM_TTM=m
+CONFIG_DRM_VRAM_HELPER=m
+CONFIG_DRM_GEM_CMA_HELPER=y
+CONFIG_DRM_KMS_CMA_HELPER=y
+CONFIG_DRM_GEM_SHMEM_HELPER=y
+CONFIG_DRM_SCHED=m
+
+#
+# I2C encoder or helper chips
+#
+CONFIG_DRM_I2C_CH7006=m
+CONFIG_DRM_I2C_SIL164=m
+CONFIG_DRM_I2C_NXP_TDA998X=m
+CONFIG_DRM_I2C_NXP_TDA9950=m
+# end of I2C encoder or helper chips
+
+#
+# ARM devices
+#
+# end of ARM devices
+
+CONFIG_DRM_RADEON=m
+CONFIG_DRM_RADEON_USERPTR=y
+CONFIG_DRM_AMDGPU=m
+CONFIG_DRM_AMDGPU_SI=y
+CONFIG_DRM_AMDGPU_CIK=y
+CONFIG_DRM_AMDGPU_USERPTR=y
+# CONFIG_DRM_AMDGPU_GART_DEBUGFS is not set
+
+#
+# ACP (Audio CoProcessor) Configuration
+#
+# CONFIG_DRM_AMD_ACP is not set
+# end of ACP (Audio CoProcessor) Configuration
+
+#
+# Display Engine Configuration
+#
+CONFIG_DRM_AMD_DC=y
+CONFIG_DRM_AMD_DC_DCN1_0=y
+CONFIG_DRM_AMD_DC_DCN2_0=y
+CONFIG_DRM_AMD_DC_DCN2_1=y
+CONFIG_DRM_AMD_DC_DSC_SUPPORT=y
+# CONFIG_DEBUG_KERNEL_DC is not set
+# end of Display Engine Configuration
+
+# CONFIG_HSA_AMD is not set
+CONFIG_DRM_NOUVEAU=m
+# CONFIG_NOUVEAU_LEGACY_CTX_SUPPORT is not set
+CONFIG_NOUVEAU_DEBUG=5
+CONFIG_NOUVEAU_DEBUG_DEFAULT=3
+# CONFIG_NOUVEAU_DEBUG_MMU is not set
+CONFIG_DRM_NOUVEAU_BACKLIGHT=y
+CONFIG_DRM_I915=m
+# CONFIG_DRM_I915_ALPHA_SUPPORT is not set
+CONFIG_DRM_I915_FORCE_PROBE=""
+CONFIG_DRM_I915_CAPTURE_ERROR=y
+CONFIG_DRM_I915_COMPRESS_ERROR=y
+CONFIG_DRM_I915_USERPTR=y
+# CONFIG_DRM_I915_GVT is not set
+
+#
+# drm/i915 Debugging
+#
+# CONFIG_DRM_I915_WERROR is not set
+# CONFIG_DRM_I915_DEBUG is not set
+# CONFIG_DRM_I915_DEBUG_MMIO is not set
+# CONFIG_DRM_I915_SW_FENCE_DEBUG_OBJECTS is not set
+# CONFIG_DRM_I915_SW_FENCE_CHECK_DAG is not set
+# CONFIG_DRM_I915_DEBUG_GUC is not set
+# CONFIG_DRM_I915_SELFTEST is not set
+# CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS is not set
+# CONFIG_DRM_I915_DEBUG_VBLANK_EVADE is not set
+# CONFIG_DRM_I915_DEBUG_RUNTIME_PM is not set
+# end of drm/i915 Debugging
+
+#
+# drm/i915 Profile Guided Optimisation
+#
+CONFIG_DRM_I915_USERFAULT_AUTOSUSPEND=250
+CONFIG_DRM_I915_SPIN_REQUEST=5
+# end of drm/i915 Profile Guided Optimisation
+
+CONFIG_DRM_VGEM=m
+# CONFIG_DRM_VKMS is not set
+CONFIG_DRM_VMWGFX=m
+CONFIG_DRM_VMWGFX_FBCON=y
+CONFIG_DRM_GMA500=m
+CONFIG_DRM_GMA600=y
+CONFIG_DRM_GMA3600=y
+CONFIG_DRM_UDL=m
+CONFIG_DRM_AST=m
+CONFIG_DRM_MGAG200=m
+CONFIG_DRM_CIRRUS_QEMU=m
+CONFIG_DRM_QXL=m
+CONFIG_DRM_BOCHS=m
+CONFIG_DRM_VIRTIO_GPU=m
+CONFIG_DRM_PANEL=y
+
+#
+# Display Panels
+#
+# CONFIG_DRM_PANEL_RASPBERRYPI_TOUCHSCREEN is not set
+# end of Display Panels
+
+CONFIG_DRM_BRIDGE=y
+CONFIG_DRM_PANEL_BRIDGE=y
+
+#
+# Display Interface Bridges
+#
+# CONFIG_DRM_ANALOGIX_ANX78XX is not set
+# end of Display Interface Bridges
+
+# CONFIG_DRM_ETNAVIV is not set
+# CONFIG_DRM_GM12U320 is not set
+CONFIG_TINYDRM_HX8357D=m
+CONFIG_TINYDRM_ILI9225=m
+CONFIG_TINYDRM_ILI9341=m
+CONFIG_TINYDRM_MI0283QT=m
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
+CONFIG_TINYDRM_ST7735R=m
+# CONFIG_DRM_XEN is not set
+# CONFIG_DRM_VBOXVIDEO is not set
+# CONFIG_DRM_LEGACY is not set
+CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+
+#
+# Frame buffer Devices
+#
+CONFIG_FB_CMDLINE=y
+CONFIG_FB_NOTIFY=y
+CONFIG_FB=y
+# CONFIG_FIRMWARE_EDID is not set
+CONFIG_FB_BOOT_VESA_SUPPORT=y
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
+CONFIG_FB_SYS_FILLRECT=m
+CONFIG_FB_SYS_COPYAREA=m
+CONFIG_FB_SYS_IMAGEBLIT=m
+# CONFIG_FB_FOREIGN_ENDIAN is not set
+CONFIG_FB_SYS_FOPS=m
+CONFIG_FB_DEFERRED_IO=y
+# CONFIG_FB_MODE_HELPERS is not set
+CONFIG_FB_TILEBLITTING=y
+
+#
+# Frame buffer hardware drivers
+#
+# CONFIG_FB_CIRRUS is not set
+# CONFIG_FB_PM2 is not set
+# CONFIG_FB_CYBER2000 is not set
+# CONFIG_FB_ARC is not set
+# CONFIG_FB_ASILIANT is not set
+# CONFIG_FB_IMSTT is not set
+# CONFIG_FB_VGA16 is not set
+# CONFIG_FB_UVESA is not set
+CONFIG_FB_VESA=y
+CONFIG_FB_EFI=y
+# CONFIG_FB_N411 is not set
+# CONFIG_FB_HGA is not set
+CONFIG_FB_OPENCORES=m
+# CONFIG_FB_S1D13XXX is not set
+# CONFIG_FB_NVIDIA is not set
+# CONFIG_FB_RIVA is not set
+# CONFIG_FB_I740 is not set
+# CONFIG_FB_LE80578 is not set
+# CONFIG_FB_INTEL is not set
+# CONFIG_FB_MATROX is not set
+# CONFIG_FB_RADEON is not set
+# CONFIG_FB_ATY128 is not set
+# CONFIG_FB_ATY is not set
+# CONFIG_FB_S3 is not set
+# CONFIG_FB_SAVAGE is not set
+# CONFIG_FB_SIS is not set
+# CONFIG_FB_VIA is not set
+# CONFIG_FB_NEOMAGIC is not set
+# CONFIG_FB_KYRO is not set
+# CONFIG_FB_3DFX is not set
+# CONFIG_FB_VOODOO1 is not set
+# CONFIG_FB_VT8623 is not set
+# CONFIG_FB_TRIDENT is not set
+# CONFIG_FB_ARK is not set
+# CONFIG_FB_PM3 is not set
+# CONFIG_FB_CARMINE is not set
+# CONFIG_FB_SM501 is not set
+# CONFIG_FB_SMSCUFX is not set
+# CONFIG_FB_UDL is not set
+# CONFIG_FB_IBM_GXT4500 is not set
+# CONFIG_FB_VIRTUAL is not set
+CONFIG_XEN_FBDEV_FRONTEND=m
+# CONFIG_FB_METRONOME is not set
+# CONFIG_FB_MB862XX is not set
+CONFIG_FB_HYPERV=m
+CONFIG_FB_SIMPLE=y
+CONFIG_FB_SM712=m
+# end of Frame buffer Devices
+
+#
+# Backlight & LCD device support
+#
+CONFIG_LCD_CLASS_DEVICE=m
+CONFIG_LCD_L4F00242T03=m
+CONFIG_LCD_LMS283GF05=m
+CONFIG_LCD_LTV350QV=m
+CONFIG_LCD_ILI922X=m
+CONFIG_LCD_ILI9320=m
+CONFIG_LCD_TDO24M=m
+CONFIG_LCD_VGG2432A4=m
+CONFIG_LCD_PLATFORM=m
+CONFIG_LCD_AMS369FG06=m
+CONFIG_LCD_LMS501KF03=m
+CONFIG_LCD_HX8357=m
+CONFIG_LCD_OTM3225A=m
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_GENERIC=m
+CONFIG_BACKLIGHT_LM3533=m
+CONFIG_BACKLIGHT_APPLE=m
+CONFIG_BACKLIGHT_PM8941_WLED=m
+CONFIG_BACKLIGHT_SAHARA=m
+CONFIG_BACKLIGHT_ADP8860=m
+CONFIG_BACKLIGHT_ADP8870=m
+CONFIG_BACKLIGHT_PCF50633=m
+CONFIG_BACKLIGHT_LM3639=m
+CONFIG_BACKLIGHT_GPIO=m
+CONFIG_BACKLIGHT_LV5207LP=m
+CONFIG_BACKLIGHT_BD6107=m
+CONFIG_BACKLIGHT_ARCXCNN=m
+# end of Backlight & LCD device support
+
+CONFIG_HDMI=y
+
+#
+# Console display driver support
+#
+CONFIG_VGA_CONSOLE=y
+CONFIG_VGACON_SOFT_SCROLLBACK=y
+CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64
+# CONFIG_VGACON_SOFT_SCROLLBACK_PERSISTENT_ENABLE_BY_DEFAULT is not set
+CONFIG_DUMMY_CONSOLE=y
+CONFIG_DUMMY_CONSOLE_COLUMNS=80
+CONFIG_DUMMY_CONSOLE_ROWS=25
+CONFIG_FRAMEBUFFER_CONSOLE=y
+CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
+CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
+CONFIG_FRAMEBUFFER_CONSOLE_DEFERRED_TAKEOVER=y
+# end of Console display driver support
+
+# CONFIG_LOGO is not set
+# end of Graphics support
+
+CONFIG_SOUND=m
+CONFIG_SOUND_OSS_CORE=y
+CONFIG_SOUND_OSS_CORE_PRECLAIM=y
+CONFIG_SND=m
+CONFIG_SND_TIMER=m
+CONFIG_SND_PCM=m
+CONFIG_SND_PCM_ELD=y
+CONFIG_SND_PCM_IEC958=y
+CONFIG_SND_DMAENGINE_PCM=m
+CONFIG_SND_HWDEP=m
+CONFIG_SND_SEQ_DEVICE=m
+CONFIG_SND_RAWMIDI=m
+CONFIG_SND_COMPRESS_OFFLOAD=m
+CONFIG_SND_JACK=y
+CONFIG_SND_JACK_INPUT_DEV=y
+CONFIG_SND_OSSEMUL=y
+CONFIG_SND_MIXER_OSS=m
+CONFIG_SND_PCM_OSS=m
+CONFIG_SND_PCM_OSS_PLUGINS=y
+CONFIG_SND_PCM_TIMER=y
+CONFIG_SND_HRTIMER=m
+CONFIG_SND_DYNAMIC_MINORS=y
+CONFIG_SND_MAX_CARDS=32
+# CONFIG_SND_SUPPORT_OLD_API is not set
+CONFIG_SND_PROC_FS=y
+# CONFIG_SND_VERBOSE_PROCFS is not set
+# CONFIG_SND_VERBOSE_PRINTK is not set
+# CONFIG_SND_DEBUG is not set
+CONFIG_SND_VMASTER=y
+CONFIG_SND_DMA_SGBUF=y
+CONFIG_SND_SEQUENCER=m
+CONFIG_SND_SEQ_DUMMY=m
+CONFIG_SND_SEQUENCER_OSS=m
+CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
+CONFIG_SND_SEQ_MIDI_EVENT=m
+CONFIG_SND_SEQ_MIDI=m
+CONFIG_SND_SEQ_MIDI_EMUL=m
+CONFIG_SND_SEQ_VIRMIDI=m
+CONFIG_SND_MPU401_UART=m
+CONFIG_SND_OPL3_LIB=m
+CONFIG_SND_OPL3_LIB_SEQ=m
+CONFIG_SND_VX_LIB=m
+CONFIG_SND_AC97_CODEC=m
+CONFIG_SND_DRIVERS=y
+# CONFIG_SND_PCSP is not set
+# CONFIG_SND_DUMMY is not set
+CONFIG_SND_ALOOP=m
+CONFIG_SND_VIRMIDI=m
+CONFIG_SND_MTPAV=m
+CONFIG_SND_MTS64=m
+CONFIG_SND_SERIAL_U16550=m
+CONFIG_SND_MPU401=m
+CONFIG_SND_PORTMAN2X4=m
+CONFIG_SND_AC97_POWER_SAVE=y
+CONFIG_SND_AC97_POWER_SAVE_DEFAULT=5
+CONFIG_SND_SB_COMMON=m
+CONFIG_SND_PCI=y
+CONFIG_SND_AD1889=m
+CONFIG_SND_ALS300=m
+CONFIG_SND_ALS4000=m
+CONFIG_SND_ALI5451=m
+CONFIG_SND_ASIHPI=m
+CONFIG_SND_ATIIXP=m
+CONFIG_SND_ATIIXP_MODEM=m
+CONFIG_SND_AU8810=m
+CONFIG_SND_AU8820=m
+CONFIG_SND_AU8830=m
+CONFIG_SND_AW2=m
+CONFIG_SND_AZT3328=m
+CONFIG_SND_BT87X=m
+# CONFIG_SND_BT87X_OVERCLOCK is not set
+CONFIG_SND_CA0106=m
+CONFIG_SND_CMIPCI=m
+CONFIG_SND_OXYGEN_LIB=m
+CONFIG_SND_OXYGEN=m
+CONFIG_SND_CS4281=m
+CONFIG_SND_CS46XX=m
+CONFIG_SND_CS46XX_NEW_DSP=y
+CONFIG_SND_CTXFI=m
+CONFIG_SND_DARLA20=m
+CONFIG_SND_GINA20=m
+CONFIG_SND_LAYLA20=m
+CONFIG_SND_DARLA24=m
+CONFIG_SND_GINA24=m
+CONFIG_SND_LAYLA24=m
+CONFIG_SND_MONA=m
+CONFIG_SND_MIA=m
+CONFIG_SND_ECHO3G=m
+CONFIG_SND_INDIGO=m
+CONFIG_SND_INDIGOIO=m
+CONFIG_SND_INDIGODJ=m
+CONFIG_SND_INDIGOIOX=m
+CONFIG_SND_INDIGODJX=m
+CONFIG_SND_EMU10K1=m
+CONFIG_SND_EMU10K1_SEQ=m
+CONFIG_SND_EMU10K1X=m
+CONFIG_SND_ENS1370=m
+CONFIG_SND_ENS1371=m
+CONFIG_SND_ES1938=m
+CONFIG_SND_ES1968=m
+CONFIG_SND_ES1968_INPUT=y
+CONFIG_SND_ES1968_RADIO=y
+CONFIG_SND_FM801=m
+CONFIG_SND_FM801_TEA575X_BOOL=y
+CONFIG_SND_HDSP=m
+CONFIG_SND_HDSPM=m
+CONFIG_SND_ICE1712=m
+CONFIG_SND_ICE1724=m
+CONFIG_SND_INTEL8X0=m
+CONFIG_SND_INTEL8X0M=m
+CONFIG_SND_KORG1212=m
+CONFIG_SND_LOLA=m
+CONFIG_SND_LX6464ES=m
+CONFIG_SND_MAESTRO3=m
+CONFIG_SND_MAESTRO3_INPUT=y
+CONFIG_SND_MIXART=m
+CONFIG_SND_NM256=m
+CONFIG_SND_PCXHR=m
+CONFIG_SND_RIPTIDE=m
+CONFIG_SND_RME32=m
+CONFIG_SND_RME96=m
+CONFIG_SND_RME9652=m
+CONFIG_SND_SONICVIBES=m
+CONFIG_SND_TRIDENT=m
+CONFIG_SND_VIA82XX=m
+CONFIG_SND_VIA82XX_MODEM=m
+CONFIG_SND_VIRTUOSO=m
+CONFIG_SND_VX222=m
+CONFIG_SND_YMFPCI=m
+
+#
+# HD-Audio
+#
+CONFIG_SND_HDA=m
+CONFIG_SND_HDA_INTEL=m
+# CONFIG_SND_HDA_INTEL_DETECT_DMIC is not set
+CONFIG_SND_HDA_HWDEP=y
+CONFIG_SND_HDA_RECONFIG=y
+CONFIG_SND_HDA_INPUT_BEEP=y
+CONFIG_SND_HDA_INPUT_BEEP_MODE=0
+CONFIG_SND_HDA_PATCH_LOADER=y
+CONFIG_SND_HDA_CODEC_REALTEK=m
+CONFIG_SND_HDA_CODEC_ANALOG=m
+CONFIG_SND_HDA_CODEC_SIGMATEL=m
+CONFIG_SND_HDA_CODEC_VIA=m
+CONFIG_SND_HDA_CODEC_HDMI=m
+CONFIG_SND_HDA_CODEC_CIRRUS=m
+CONFIG_SND_HDA_CODEC_CONEXANT=m
+CONFIG_SND_HDA_CODEC_CA0110=m
+CONFIG_SND_HDA_CODEC_CA0132=m
+CONFIG_SND_HDA_CODEC_CA0132_DSP=y
+CONFIG_SND_HDA_CODEC_CMEDIA=m
+CONFIG_SND_HDA_CODEC_SI3054=m
+CONFIG_SND_HDA_GENERIC=m
+CONFIG_SND_HDA_POWER_SAVE_DEFAULT=0
+# end of HD-Audio
+
+CONFIG_SND_HDA_CORE=m
+CONFIG_SND_HDA_DSP_LOADER=y
+CONFIG_SND_HDA_COMPONENT=y
+CONFIG_SND_HDA_I915=y
+CONFIG_SND_HDA_EXT_CORE=m
+CONFIG_SND_HDA_PREALLOC_SIZE=512
+CONFIG_SND_INTEL_NHLT=m
+CONFIG_SND_SPI=y
+CONFIG_SND_USB=y
+CONFIG_SND_USB_AUDIO=m
+CONFIG_SND_USB_AUDIO_USE_MEDIA_CONTROLLER=y
+CONFIG_SND_USB_UA101=m
+CONFIG_SND_USB_USX2Y=m
+CONFIG_SND_USB_CAIAQ=m
+CONFIG_SND_USB_CAIAQ_INPUT=y
+CONFIG_SND_USB_US122L=m
+CONFIG_SND_USB_6FIRE=m
+CONFIG_SND_USB_HIFACE=m
+CONFIG_SND_BCD2000=m
+CONFIG_SND_USB_LINE6=m
+CONFIG_SND_USB_POD=m
+CONFIG_SND_USB_PODHD=m
+CONFIG_SND_USB_TONEPORT=m
+CONFIG_SND_USB_VARIAX=m
+CONFIG_SND_FIREWIRE=y
+CONFIG_SND_FIREWIRE_LIB=m
+CONFIG_SND_DICE=m
+CONFIG_SND_OXFW=m
+CONFIG_SND_ISIGHT=m
+CONFIG_SND_FIREWORKS=m
+CONFIG_SND_BEBOB=m
+CONFIG_SND_FIREWIRE_DIGI00X=m
+CONFIG_SND_FIREWIRE_TASCAM=m
+CONFIG_SND_FIREWIRE_MOTU=m
+CONFIG_SND_FIREFACE=m
+CONFIG_SND_PCMCIA=y
+CONFIG_SND_VXPOCKET=m
+CONFIG_SND_PDAUDIOCF=m
+CONFIG_SND_SOC=m
+CONFIG_SND_SOC_AC97_BUS=y
+CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
+CONFIG_SND_SOC_COMPRESS=y
+CONFIG_SND_SOC_TOPOLOGY=y
+CONFIG_SND_SOC_ACPI=m
+CONFIG_SND_SOC_AMD_ACP=m
+CONFIG_SND_SOC_AMD_CZ_DA7219MX98357_MACH=m
+CONFIG_SND_SOC_AMD_CZ_RT5645_MACH=m
+CONFIG_SND_SOC_AMD_ACP3x=m
+CONFIG_SND_ATMEL_SOC=m
+CONFIG_SND_DESIGNWARE_I2S=m
+CONFIG_SND_DESIGNWARE_PCM=y
+
+#
+# SoC Audio for Freescale CPUs
+#
+
+#
+# Common SoC Audio options for Freescale CPUs:
+#
+# CONFIG_SND_SOC_FSL_ASRC is not set
+# CONFIG_SND_SOC_FSL_SAI is not set
+# CONFIG_SND_SOC_FSL_AUDMIX is not set
+# CONFIG_SND_SOC_FSL_SSI is not set
+# CONFIG_SND_SOC_FSL_SPDIF is not set
+# CONFIG_SND_SOC_FSL_ESAI is not set
+# CONFIG_SND_SOC_FSL_MICFIL is not set
+# CONFIG_SND_SOC_IMX_AUDMUX is not set
+# end of SoC Audio for Freescale CPUs
+
+CONFIG_SND_I2S_HI6210_I2S=m
+CONFIG_SND_SOC_IMG=y
+CONFIG_SND_SOC_IMG_I2S_IN=m
+CONFIG_SND_SOC_IMG_I2S_OUT=m
+CONFIG_SND_SOC_IMG_PARALLEL_OUT=m
+CONFIG_SND_SOC_IMG_SPDIF_IN=m
+CONFIG_SND_SOC_IMG_SPDIF_OUT=m
+CONFIG_SND_SOC_IMG_PISTACHIO_INTERNAL_DAC=m
+CONFIG_SND_SOC_INTEL_SST_TOPLEVEL=y
+CONFIG_SND_SST_IPC=m
+CONFIG_SND_SST_IPC_PCI=m
+CONFIG_SND_SST_IPC_ACPI=m
+CONFIG_SND_SOC_INTEL_SST_ACPI=m
+CONFIG_SND_SOC_INTEL_SST=m
+CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m
+CONFIG_SND_SOC_INTEL_HASWELL=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_PCI=m
+CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI=m
+CONFIG_SND_SOC_INTEL_SKYLAKE=m
+CONFIG_SND_SOC_INTEL_SKL=m
+CONFIG_SND_SOC_INTEL_APL=m
+CONFIG_SND_SOC_INTEL_KBL=m
+CONFIG_SND_SOC_INTEL_GLK=m
+CONFIG_SND_SOC_INTEL_CNL=m
+CONFIG_SND_SOC_INTEL_CFL=m
+CONFIG_SND_SOC_INTEL_CML_H=m
+CONFIG_SND_SOC_INTEL_CML_LP=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_FAMILY=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_SSP_CLK=m
+CONFIG_SND_SOC_INTEL_SKYLAKE_HDAUDIO_CODEC=y
+CONFIG_SND_SOC_INTEL_SKYLAKE_COMMON=m
+CONFIG_SND_SOC_ACPI_INTEL_MATCH=m
+CONFIG_SND_SOC_INTEL_MACH=y
+CONFIG_SND_SOC_INTEL_HASWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BDW_RT5677_MACH=m
+CONFIG_SND_SOC_INTEL_BROADWELL_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m
+CONFIG_SND_SOC_INTEL_BYTCR_RT5651_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_MAX98090_TI_MACH=m
+CONFIG_SND_SOC_INTEL_CHT_BSW_NAU8824_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_CX2072X_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_DA7213_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_ES8316_MACH=m
+CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_SSM4567_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_NAU88L25_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_DA7219_MAX98357A_GENERIC=m
+CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_BXT_RT298_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5663_RT5514_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_DA7219_MAX98927_MACH=m
+CONFIG_SND_SOC_INTEL_KBL_RT5660_MACH=m
+CONFIG_SND_SOC_INTEL_GLK_RT5682_MAX98357A_MACH=m
+CONFIG_SND_SOC_INTEL_SKL_HDA_DSP_GENERIC_MACH=m
+# CONFIG_SND_SOC_MTK_BTCVSD is not set
+# CONFIG_SND_SOC_SOF_TOPLEVEL is not set
+
+#
+# STMicroelectronics STM32 SOC audio support
+#
+# end of STMicroelectronics STM32 SOC audio support
+
+CONFIG_SND_SOC_XILINX_I2S=m
+# CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER is not set
+# CONFIG_SND_SOC_XILINX_SPDIF is not set
+CONFIG_SND_SOC_XTFPGA_I2S=m
+CONFIG_ZX_TDM=m
+CONFIG_SND_SOC_I2C_AND_SPI=m
+
+#
+# CODEC drivers
+#
+CONFIG_SND_SOC_AC97_CODEC=m
+CONFIG_SND_SOC_ADAU_UTILS=m
+CONFIG_SND_SOC_ADAU1701=m
+CONFIG_SND_SOC_ADAU17X1=m
+CONFIG_SND_SOC_ADAU1761=m
+CONFIG_SND_SOC_ADAU1761_I2C=m
+CONFIG_SND_SOC_ADAU1761_SPI=m
+CONFIG_SND_SOC_ADAU7002=m
+CONFIG_SND_SOC_AK4104=m
+CONFIG_SND_SOC_AK4118=m
+CONFIG_SND_SOC_AK4458=m
+CONFIG_SND_SOC_AK4554=m
+CONFIG_SND_SOC_AK4613=m
+CONFIG_SND_SOC_AK4642=m
+CONFIG_SND_SOC_AK5386=m
+CONFIG_SND_SOC_AK5558=m
+CONFIG_SND_SOC_ALC5623=m
+CONFIG_SND_SOC_BD28623=m
+CONFIG_SND_SOC_BT_SCO=m
+CONFIG_SND_SOC_CS35L32=m
+CONFIG_SND_SOC_CS35L33=m
+CONFIG_SND_SOC_CS35L34=m
+CONFIG_SND_SOC_CS35L35=m
+CONFIG_SND_SOC_CS35L36=m
+CONFIG_SND_SOC_CS42L42=m
+CONFIG_SND_SOC_CS42L51=m
+CONFIG_SND_SOC_CS42L51_I2C=m
+CONFIG_SND_SOC_CS42L52=m
+CONFIG_SND_SOC_CS42L56=m
+CONFIG_SND_SOC_CS42L73=m
+CONFIG_SND_SOC_CS4265=m
+CONFIG_SND_SOC_CS4270=m
+CONFIG_SND_SOC_CS4271=m
+CONFIG_SND_SOC_CS4271_I2C=m
+CONFIG_SND_SOC_CS4271_SPI=m
+CONFIG_SND_SOC_CS42XX8=m
+CONFIG_SND_SOC_CS42XX8_I2C=m
+CONFIG_SND_SOC_CS43130=m
+CONFIG_SND_SOC_CS4341=m
+CONFIG_SND_SOC_CS4349=m
+CONFIG_SND_SOC_CS53L30=m
+CONFIG_SND_SOC_CX2072X=m
+CONFIG_SND_SOC_DA7213=m
+CONFIG_SND_SOC_DA7219=m
+CONFIG_SND_SOC_DMIC=m
+CONFIG_SND_SOC_HDMI_CODEC=m
+CONFIG_SND_SOC_ES7134=m
+CONFIG_SND_SOC_ES7241=m
+CONFIG_SND_SOC_ES8316=m
+CONFIG_SND_SOC_ES8328=m
+CONFIG_SND_SOC_ES8328_I2C=m
+CONFIG_SND_SOC_ES8328_SPI=m
+CONFIG_SND_SOC_GTM601=m
+CONFIG_SND_SOC_HDAC_HDMI=m
+CONFIG_SND_SOC_HDAC_HDA=m
+CONFIG_SND_SOC_INNO_RK3036=m
+CONFIG_SND_SOC_MAX98088=m
+CONFIG_SND_SOC_MAX98090=m
+CONFIG_SND_SOC_MAX98357A=m
+CONFIG_SND_SOC_MAX98504=m
+CONFIG_SND_SOC_MAX9867=m
+CONFIG_SND_SOC_MAX98927=m
+CONFIG_SND_SOC_MAX98373=m
+CONFIG_SND_SOC_MAX9860=m
+CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=m
+CONFIG_SND_SOC_PCM1681=m
+CONFIG_SND_SOC_PCM1789=m
+CONFIG_SND_SOC_PCM1789_I2C=m
+CONFIG_SND_SOC_PCM179X=m
+CONFIG_SND_SOC_PCM179X_I2C=m
+CONFIG_SND_SOC_PCM179X_SPI=m
+CONFIG_SND_SOC_PCM186X=m
+CONFIG_SND_SOC_PCM186X_I2C=m
+CONFIG_SND_SOC_PCM186X_SPI=m
+CONFIG_SND_SOC_PCM3060=m
+CONFIG_SND_SOC_PCM3060_I2C=m
+CONFIG_SND_SOC_PCM3060_SPI=m
+CONFIG_SND_SOC_PCM3168A=m
+CONFIG_SND_SOC_PCM3168A_I2C=m
+CONFIG_SND_SOC_PCM3168A_SPI=m
+CONFIG_SND_SOC_PCM512x=m
+CONFIG_SND_SOC_PCM512x_I2C=m
+CONFIG_SND_SOC_PCM512x_SPI=m
+CONFIG_SND_SOC_RK3328=m
+CONFIG_SND_SOC_RL6231=m
+CONFIG_SND_SOC_RL6347A=m
+CONFIG_SND_SOC_RT286=m
+CONFIG_SND_SOC_RT298=m
+CONFIG_SND_SOC_RT5514=m
+CONFIG_SND_SOC_RT5514_SPI=m
+CONFIG_SND_SOC_RT5616=m
+CONFIG_SND_SOC_RT5631=m
+CONFIG_SND_SOC_RT5640=m
+CONFIG_SND_SOC_RT5645=m
+CONFIG_SND_SOC_RT5651=m
+CONFIG_SND_SOC_RT5660=m
+CONFIG_SND_SOC_RT5663=m
+CONFIG_SND_SOC_RT5670=m
+CONFIG_SND_SOC_RT5677=m
+CONFIG_SND_SOC_RT5677_SPI=m
+CONFIG_SND_SOC_RT5682=m
+CONFIG_SND_SOC_SGTL5000=m
+CONFIG_SND_SOC_SIGMADSP=m
+CONFIG_SND_SOC_SIGMADSP_I2C=m
+CONFIG_SND_SOC_SIGMADSP_REGMAP=m
+CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
+CONFIG_SND_SOC_SIRF_AUDIO_CODEC=m
+CONFIG_SND_SOC_SPDIF=m
+CONFIG_SND_SOC_SSM2305=m
+CONFIG_SND_SOC_SSM2602=m
+CONFIG_SND_SOC_SSM2602_SPI=m
+CONFIG_SND_SOC_SSM2602_I2C=m
+CONFIG_SND_SOC_SSM4567=m
+CONFIG_SND_SOC_STA32X=m
+CONFIG_SND_SOC_STA350=m
+CONFIG_SND_SOC_STI_SAS=m
+CONFIG_SND_SOC_TAS2552=m
+CONFIG_SND_SOC_TAS5086=m
+CONFIG_SND_SOC_TAS571X=m
+CONFIG_SND_SOC_TAS5720=m
+CONFIG_SND_SOC_TAS6424=m
+CONFIG_SND_SOC_TDA7419=m
+CONFIG_SND_SOC_TFA9879=m
+CONFIG_SND_SOC_TLV320AIC23=m
+CONFIG_SND_SOC_TLV320AIC23_I2C=m
+CONFIG_SND_SOC_TLV320AIC23_SPI=m
+CONFIG_SND_SOC_TLV320AIC31XX=m
+CONFIG_SND_SOC_TLV320AIC32X4=m
+CONFIG_SND_SOC_TLV320AIC32X4_I2C=m
+CONFIG_SND_SOC_TLV320AIC32X4_SPI=m
+CONFIG_SND_SOC_TLV320AIC3X=m
+CONFIG_SND_SOC_TS3A227E=m
+CONFIG_SND_SOC_TSCS42XX=m
+CONFIG_SND_SOC_TSCS454=m
+CONFIG_SND_SOC_UDA1334=m
+CONFIG_SND_SOC_WM8510=m
+CONFIG_SND_SOC_WM8523=m
+CONFIG_SND_SOC_WM8524=m
+CONFIG_SND_SOC_WM8580=m
+CONFIG_SND_SOC_WM8711=m
+CONFIG_SND_SOC_WM8728=m
+CONFIG_SND_SOC_WM8731=m
+CONFIG_SND_SOC_WM8737=m
+CONFIG_SND_SOC_WM8741=m
+CONFIG_SND_SOC_WM8750=m
+CONFIG_SND_SOC_WM8753=m
+CONFIG_SND_SOC_WM8770=m
+CONFIG_SND_SOC_WM8776=m
+CONFIG_SND_SOC_WM8782=m
+CONFIG_SND_SOC_WM8804=m
+CONFIG_SND_SOC_WM8804_I2C=m
+CONFIG_SND_SOC_WM8804_SPI=m
+CONFIG_SND_SOC_WM8903=m
+CONFIG_SND_SOC_WM8904=m
+CONFIG_SND_SOC_WM8960=m
+CONFIG_SND_SOC_WM8962=m
+CONFIG_SND_SOC_WM8974=m
+CONFIG_SND_SOC_WM8978=m
+CONFIG_SND_SOC_WM8985=m
+CONFIG_SND_SOC_ZX_AUD96P22=m
+CONFIG_SND_SOC_MAX9759=m
+CONFIG_SND_SOC_MT6351=m
+CONFIG_SND_SOC_MT6358=m
+CONFIG_SND_SOC_NAU8540=m
+CONFIG_SND_SOC_NAU8810=m
+CONFIG_SND_SOC_NAU8822=m
+CONFIG_SND_SOC_NAU8824=m
+CONFIG_SND_SOC_NAU8825=m
+CONFIG_SND_SOC_TPA6130A2=m
+# end of CODEC drivers
+
+CONFIG_SND_SIMPLE_CARD_UTILS=m
+CONFIG_SND_SIMPLE_CARD=m
+CONFIG_SND_X86=y
+CONFIG_HDMI_LPE_AUDIO=m
+CONFIG_SND_SYNTH_EMUX=m
+CONFIG_SND_XEN_FRONTEND=m
+CONFIG_AC97_BUS=m
+
+#
+# HID support
+#
+CONFIG_HID=y
+CONFIG_HID_BATTERY_STRENGTH=y
+CONFIG_HIDRAW=y
+CONFIG_UHID=m
+CONFIG_HID_GENERIC=y
+
+#
+# Special HID drivers
+#
+CONFIG_HID_A4TECH=y
+CONFIG_HID_ACCUTOUCH=m
+CONFIG_HID_ACRUX=m
+CONFIG_HID_ACRUX_FF=y
+CONFIG_HID_APPLE=y
+CONFIG_HID_APPLEIR=m
+CONFIG_HID_ASUS=m
+CONFIG_HID_AUREAL=m
+CONFIG_HID_BELKIN=y
+CONFIG_HID_BETOP_FF=m
+# CONFIG_HID_BIGBEN_FF is not set
+CONFIG_HID_CHERRY=y
+CONFIG_HID_CHICONY=y
+# CONFIG_HID_CORSAIR is not set
+# CONFIG_HID_COUGAR is not set
+# CONFIG_HID_MACALLY is not set
+CONFIG_HID_PRODIKEYS=m
+# CONFIG_HID_CMEDIA is not set
+# CONFIG_HID_CP2112 is not set
+# CONFIG_HID_CREATIVE_SB0540 is not set
+CONFIG_HID_CYPRESS=y
+CONFIG_HID_DRAGONRISE=m
+CONFIG_DRAGONRISE_FF=y
+CONFIG_HID_EMS_FF=m
+CONFIG_HID_ELAN=m
+CONFIG_HID_ELECOM=m
+CONFIG_HID_ELO=m
+CONFIG_HID_EZKEY=y
+CONFIG_HID_GEMBIRD=m
+# CONFIG_HID_GFRM is not set
+CONFIG_HID_HOLTEK=m
+CONFIG_HOLTEK_FF=y
+CONFIG_HID_GT683R=m
+CONFIG_HID_KEYTOUCH=m
+CONFIG_HID_KYE=m
+CONFIG_HID_UCLOGIC=m
+CONFIG_HID_WALTOP=m
+# CONFIG_HID_VIEWSONIC is not set
+CONFIG_HID_GYRATION=m
+CONFIG_HID_ICADE=m
+# CONFIG_HID_ITE is not set
+# CONFIG_HID_JABRA is not set
+CONFIG_HID_TWINHAN=m
+CONFIG_HID_KENSINGTON=y
+CONFIG_HID_LCPOWER=m
+CONFIG_HID_LED=m
+CONFIG_HID_LENOVO=m
+CONFIG_HID_LOGITECH=y
+CONFIG_HID_LOGITECH_DJ=m
+CONFIG_HID_LOGITECH_HIDPP=m
+CONFIG_LOGITECH_FF=y
+CONFIG_LOGIRUMBLEPAD2_FF=y
+CONFIG_LOGIG940_FF=y
+CONFIG_LOGIWHEELS_FF=y
+CONFIG_HID_MAGICMOUSE=y
+# CONFIG_HID_MALTRON is not set
+# CONFIG_HID_MAYFLASH is not set
+# CONFIG_HID_REDRAGON is not set
+CONFIG_HID_MICROSOFT=y
+CONFIG_HID_MONTEREY=y
+CONFIG_HID_MULTITOUCH=m
+CONFIG_HID_NTI=m
+CONFIG_HID_NTRIG=y
+CONFIG_HID_ORTEK=m
+CONFIG_HID_PANTHERLORD=m
+CONFIG_PANTHERLORD_FF=y
+CONFIG_HID_PENMOUNT=m
+CONFIG_HID_PETALYNX=m
+CONFIG_HID_PICOLCD=m
+CONFIG_HID_PICOLCD_FB=y
+CONFIG_HID_PICOLCD_BACKLIGHT=y
+CONFIG_HID_PICOLCD_LCD=y
+CONFIG_HID_PICOLCD_LEDS=y
+CONFIG_HID_PICOLCD_CIR=y
+CONFIG_HID_PLANTRONICS=m
+CONFIG_HID_PRIMAX=m
+# CONFIG_HID_RETRODE is not set
+CONFIG_HID_ROCCAT=m
+CONFIG_HID_SAITEK=m
+CONFIG_HID_SAMSUNG=m
+CONFIG_HID_SONY=m
+CONFIG_SONY_FF=y
+CONFIG_HID_SPEEDLINK=m
+# CONFIG_HID_STEAM is not set
+CONFIG_HID_STEELSERIES=m
+CONFIG_HID_SUNPLUS=m
+CONFIG_HID_RMI=m
+CONFIG_HID_GREENASIA=m
+CONFIG_GREENASIA_FF=y
+CONFIG_HID_HYPERV_MOUSE=m
+CONFIG_HID_SMARTJOYPLUS=m
+CONFIG_SMARTJOYPLUS_FF=y
+CONFIG_HID_TIVO=m
+CONFIG_HID_TOPSEED=m
+CONFIG_HID_THINGM=m
+CONFIG_HID_THRUSTMASTER=m
+CONFIG_THRUSTMASTER_FF=y
+# CONFIG_HID_UDRAW_PS3 is not set
+# CONFIG_HID_U2FZERO is not set
+CONFIG_HID_WACOM=m
+CONFIG_HID_WIIMOTE=m
+CONFIG_HID_XINMO=m
+CONFIG_HID_ZEROPLUS=m
+CONFIG_ZEROPLUS_FF=y
+CONFIG_HID_ZYDACRON=m
+CONFIG_HID_SENSOR_HUB=m
+# CONFIG_HID_SENSOR_CUSTOM_SENSOR is not set
+CONFIG_HID_ALPS=m
+# end of Special HID drivers
+
+#
+# USB HID support
+#
+CONFIG_USB_HID=y
+CONFIG_HID_PID=y
+CONFIG_USB_HIDDEV=y
+# end of USB HID support
+
+#
+# I2C HID support
+#
+CONFIG_I2C_HID=m
+# end of I2C HID support
+
+#
+# Intel ISH HID support
+#
+# CONFIG_INTEL_ISH_HID is not set
+# end of Intel ISH HID support
+# end of HID support
+
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+CONFIG_USB_SUPPORT=y
+CONFIG_USB_COMMON=y
+# CONFIG_USB_LED_TRIG is not set
+CONFIG_USB_ULPI_BUS=m
+# CONFIG_USB_CONN_GPIO is not set
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB=y
+CONFIG_USB_PCI=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+
+#
+# Miscellaneous USB options
+#
+CONFIG_USB_DEFAULT_PERSIST=y
+# CONFIG_USB_DYNAMIC_MINORS is not set
+CONFIG_USB_OTG=y
+CONFIG_USB_OTG_WHITELIST=y
+# CONFIG_USB_OTG_BLACKLIST_HUB is not set
+CONFIG_USB_OTG_FSM=m
+# CONFIG_USB_LEDS_TRIGGER_USBPORT is not set
+CONFIG_USB_AUTOSUSPEND_DELAY=2
+CONFIG_USB_MON=y
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_C67X00_HCD=m
+CONFIG_USB_XHCI_HCD=y
+# CONFIG_USB_XHCI_DBGCAP is not set
+CONFIG_USB_XHCI_PCI=y
+CONFIG_USB_XHCI_PLATFORM=m
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
+CONFIG_USB_EHCI_TT_NEWSCHED=y
+CONFIG_USB_EHCI_PCI=y
+# CONFIG_USB_EHCI_FSL is not set
+CONFIG_USB_EHCI_HCD_PLATFORM=m
+CONFIG_USB_OXU210HP_HCD=m
+CONFIG_USB_ISP116X_HCD=m
+CONFIG_USB_FOTG210_HCD=m
+CONFIG_USB_MAX3421_HCD=m
+CONFIG_USB_OHCI_HCD=y
+CONFIG_USB_OHCI_HCD_PCI=y
+CONFIG_USB_OHCI_HCD_PLATFORM=m
+CONFIG_USB_UHCI_HCD=y
+CONFIG_USB_U132_HCD=m
+CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD_ISO is not set
+CONFIG_USB_SL811_CS=m
+CONFIG_USB_R8A66597_HCD=m
+CONFIG_USB_HCD_BCMA=m
+CONFIG_USB_HCD_SSB=m
+# CONFIG_USB_HCD_TEST_MODE is not set
+
+#
+# USB Device Class drivers
+#
+CONFIG_USB_ACM=m
+CONFIG_USB_PRINTER=m
+CONFIG_USB_WDM=m
+CONFIG_USB_TMC=m
+
+#
+# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may
+#
+
+#
+# also be needed; see USB_STORAGE Help for more info
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+CONFIG_USB_STORAGE_REALTEK=m
+CONFIG_REALTEK_AUTOPM=y
+CONFIG_USB_STORAGE_DATAFAB=m
+CONFIG_USB_STORAGE_FREECOM=m
+CONFIG_USB_STORAGE_ISD200=m
+CONFIG_USB_STORAGE_USBAT=m
+CONFIG_USB_STORAGE_SDDR09=m
+CONFIG_USB_STORAGE_SDDR55=m
+CONFIG_USB_STORAGE_JUMPSHOT=m
+CONFIG_USB_STORAGE_ALAUDA=m
+CONFIG_USB_STORAGE_ONETOUCH=m
+CONFIG_USB_STORAGE_KARMA=m
+CONFIG_USB_STORAGE_CYPRESS_ATACB=m
+CONFIG_USB_STORAGE_ENE_UB6250=m
+CONFIG_USB_UAS=m
+
+#
+# USB Imaging devices
+#
+CONFIG_USB_MDC800=m
+CONFIG_USB_MICROTEK=m
+# CONFIG_USBIP_CORE is not set
+# CONFIG_USB_CDNS3 is not set
+CONFIG_USB_MUSB_HDRC=m
+CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_GADGET is not set
+# CONFIG_USB_MUSB_DUAL_ROLE is not set
+
+#
+# Platform Glue Layer
+#
+
+#
+# MUSB DMA mode
+#
+CONFIG_MUSB_PIO_ONLY=y
+CONFIG_USB_DWC3=m
+# CONFIG_USB_DWC3_ULPI is not set
+# CONFIG_USB_DWC3_HOST is not set
+# CONFIG_USB_DWC3_GADGET is not set
+CONFIG_USB_DWC3_DUAL_ROLE=y
+
+#
+# Platform Glue Driver Support
+#
+CONFIG_USB_DWC3_PCI=m
+CONFIG_USB_DWC3_HAPS=m
+# CONFIG_USB_DWC2 is not set
+CONFIG_USB_CHIPIDEA=m
+CONFIG_USB_CHIPIDEA_PCI=m
+# CONFIG_USB_CHIPIDEA_UDC is not set
+CONFIG_USB_CHIPIDEA_HOST=y
+# CONFIG_USB_ISP1760 is not set
+
+#
+# USB port drivers
+#
+CONFIG_USB_USS720=m
+CONFIG_USB_SERIAL=y
+CONFIG_USB_SERIAL_CONSOLE=y
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_SIMPLE=m
+CONFIG_USB_SERIAL_AIRCABLE=m
+CONFIG_USB_SERIAL_ARK3116=m
+CONFIG_USB_SERIAL_BELKIN=m
+CONFIG_USB_SERIAL_CH341=m
+CONFIG_USB_SERIAL_WHITEHEAT=m
+CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_CYPRESS_M8=m
+CONFIG_USB_SERIAL_EMPEG=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_VISOR=m
+CONFIG_USB_SERIAL_IPAQ=m
+CONFIG_USB_SERIAL_IR=m
+CONFIG_USB_SERIAL_EDGEPORT=m
+CONFIG_USB_SERIAL_EDGEPORT_TI=m
+CONFIG_USB_SERIAL_F81232=m
+CONFIG_USB_SERIAL_F8153X=m
+CONFIG_USB_SERIAL_GARMIN=m
+CONFIG_USB_SERIAL_IPW=m
+CONFIG_USB_SERIAL_IUU=m
+CONFIG_USB_SERIAL_KEYSPAN_PDA=m
+CONFIG_USB_SERIAL_KEYSPAN=m
+CONFIG_USB_SERIAL_KLSI=m
+CONFIG_USB_SERIAL_KOBIL_SCT=m
+CONFIG_USB_SERIAL_MCT_U232=m
+CONFIG_USB_SERIAL_METRO=m
+CONFIG_USB_SERIAL_MOS7720=m
+CONFIG_USB_SERIAL_MOS7715_PARPORT=y
+CONFIG_USB_SERIAL_MOS7840=m
+CONFIG_USB_SERIAL_MXUPORT=m
+CONFIG_USB_SERIAL_NAVMAN=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OTI6858=m
+CONFIG_USB_SERIAL_QCAUX=m
+CONFIG_USB_SERIAL_QUALCOMM=m
+CONFIG_USB_SERIAL_SPCP8X5=m
+CONFIG_USB_SERIAL_SAFE=m
+CONFIG_USB_SERIAL_SAFE_PADDED=y
+CONFIG_USB_SERIAL_SIERRAWIRELESS=m
+CONFIG_USB_SERIAL_SYMBOL=m
+CONFIG_USB_SERIAL_TI=m
+CONFIG_USB_SERIAL_CYBERJACK=m
+CONFIG_USB_SERIAL_XIRCOM=m
+CONFIG_USB_SERIAL_WWAN=m
+CONFIG_USB_SERIAL_OPTION=m
+CONFIG_USB_SERIAL_OMNINET=m
+CONFIG_USB_SERIAL_OPTICON=m
+CONFIG_USB_SERIAL_XSENS_MT=m
+CONFIG_USB_SERIAL_WISHBONE=y
+CONFIG_USB_SERIAL_SSU100=m
+CONFIG_USB_SERIAL_QT2=m
+CONFIG_USB_SERIAL_UPD78F0730=m
+# CONFIG_USB_SERIAL_DEBUG is not set
+
+#
+# USB Miscellaneous drivers
+#
+CONFIG_USB_EMI62=m
+CONFIG_USB_EMI26=m
+CONFIG_USB_ADUTUX=m
+CONFIG_USB_SEVSEG=m
+CONFIG_USB_LEGOTOWER=m
+CONFIG_USB_LCD=m
+CONFIG_USB_CYPRESS_CY7C63=m
+CONFIG_USB_CYTHERM=m
+CONFIG_USB_IDMOUSE=m
+CONFIG_USB_FTDI_ELAN=m
+CONFIG_USB_APPLEDISPLAY=m
+CONFIG_USB_SISUSBVGA=m
+CONFIG_USB_SISUSBVGA_CON=y
+CONFIG_USB_LD=m
+CONFIG_USB_TRANCEVIBRATOR=m
+CONFIG_USB_IOWARRIOR=m
+# CONFIG_USB_TEST is not set
+# CONFIG_USB_EHSET_TEST_FIXTURE is not set
+CONFIG_USB_ISIGHTFW=m
+# CONFIG_USB_YUREX is not set
+CONFIG_USB_EZUSB_FX2=m
+CONFIG_USB_HUB_USB251XB=m
+CONFIG_USB_HSIC_USB3503=m
+# CONFIG_USB_HSIC_USB4604 is not set
+# CONFIG_USB_LINK_LAYER_TEST is not set
+CONFIG_USB_CHAOSKEY=m
+CONFIG_USB_ATM=m
+CONFIG_USB_SPEEDTOUCH=m
+CONFIG_USB_CXACRU=m
+CONFIG_USB_UEAGLEATM=m
+CONFIG_USB_XUSBATM=m
+
+#
+# USB Physical Layer drivers
+#
+CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=m
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_TAHVO_USB is not set
+CONFIG_USB_ISP1301=m
+# end of USB Physical Layer drivers
+
+CONFIG_USB_GADGET=m
+# CONFIG_USB_GADGET_DEBUG is not set
+# CONFIG_USB_GADGET_DEBUG_FILES is not set
+# CONFIG_USB_GADGET_DEBUG_FS is not set
+CONFIG_USB_GADGET_VBUS_DRAW=2
+CONFIG_USB_GADGET_STORAGE_NUM_BUFFERS=2
+
+#
+# USB Peripheral Controller
+#
+# CONFIG_USB_FOTG210_UDC is not set
+# CONFIG_USB_GR_UDC is not set
+# CONFIG_USB_R8A66597 is not set
+# CONFIG_USB_PXA27X is not set
+# CONFIG_USB_MV_UDC is not set
+# CONFIG_USB_MV_U3D is not set
+# CONFIG_USB_M66592 is not set
+# CONFIG_USB_BDC_UDC is not set
+# CONFIG_USB_AMD5536UDC is not set
+# CONFIG_USB_NET2272 is not set
+# CONFIG_USB_NET2280 is not set
+# CONFIG_USB_GOKU is not set
+# CONFIG_USB_EG20T is not set
+# CONFIG_USB_DUMMY_HCD is not set
+# end of USB Peripheral Controller
+
+# CONFIG_USB_CONFIGFS is not set
+# CONFIG_TYPEC is not set
+CONFIG_USB_ROLE_SWITCH=m
+# CONFIG_USB_ROLES_INTEL_XHCI is not set
+CONFIG_MMC=m
+CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK_MINORS=8
+CONFIG_SDIO_UART=m
+# CONFIG_MMC_TEST is not set
+
+#
+# MMC/SD/SDIO Host Controller Drivers
+#
+# CONFIG_MMC_DEBUG is not set
+CONFIG_MMC_SDHCI=m
+CONFIG_MMC_SDHCI_IO_ACCESSORS=y
+CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_RICOH_MMC=y
+CONFIG_MMC_SDHCI_ACPI=m
+CONFIG_MMC_SDHCI_PLTFM=m
+# CONFIG_MMC_SDHCI_F_SDH30 is not set
+CONFIG_MMC_WBSD=m
+CONFIG_MMC_TIFM_SD=m
+# CONFIG_MMC_SPI is not set
+CONFIG_MMC_SDRICOH_CS=m
+CONFIG_MMC_CB710=m
+CONFIG_MMC_VIA_SDMMC=m
+CONFIG_MMC_VUB300=m
+CONFIG_MMC_USHC=m
+CONFIG_MMC_USDHI6ROL0=m
+CONFIG_MMC_REALTEK_PCI=m
+CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_CQHCI=m
+CONFIG_MMC_TOSHIBA_PCI=m
+CONFIG_MMC_MTK=m
+# CONFIG_MMC_SDHCI_XENON is not set
+CONFIG_MEMSTICK=m
+# CONFIG_MEMSTICK_DEBUG is not set
+
+#
+# MemoryStick drivers
+#
+# CONFIG_MEMSTICK_UNSAFE_RESUME is not set
+CONFIG_MSPRO_BLOCK=m
+# CONFIG_MS_BLOCK is not set
+
+#
+# MemoryStick Host Controller Drivers
+#
+CONFIG_MEMSTICK_TIFM_MS=m
+CONFIG_MEMSTICK_JMICRON_38X=m
+CONFIG_MEMSTICK_R592=m
+CONFIG_MEMSTICK_REALTEK_PCI=m
+CONFIG_MEMSTICK_REALTEK_USB=m
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+# CONFIG_LEDS_CLASS_FLASH is not set
+# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set
+
+#
+# LED drivers
+#
+# CONFIG_LEDS_APU is not set
+CONFIG_LEDS_LM3530=m
+CONFIG_LEDS_LM3532=m
+CONFIG_LEDS_LM3533=m
+CONFIG_LEDS_LM3642=m
+CONFIG_LEDS_PCA9532=m
+CONFIG_LEDS_PCA9532_GPIO=y
+CONFIG_LEDS_GPIO=m
+CONFIG_LEDS_LP3944=m
+CONFIG_LEDS_LP3952=m
+CONFIG_LEDS_LP55XX_COMMON=m
+CONFIG_LEDS_LP5521=m
+CONFIG_LEDS_LP5523=m
+CONFIG_LEDS_LP5562=m
+CONFIG_LEDS_LP8501=m
+CONFIG_LEDS_CLEVO_MAIL=m
+CONFIG_LEDS_PCA955X=m
+CONFIG_LEDS_PCA955X_GPIO=y
+CONFIG_LEDS_PCA963X=m
+CONFIG_LEDS_DAC124S085=m
+CONFIG_LEDS_REGULATOR=m
+CONFIG_LEDS_BD2802=m
+CONFIG_LEDS_INTEL_SS4200=m
+CONFIG_LEDS_MC13783=m
+CONFIG_LEDS_TCA6507=m
+CONFIG_LEDS_TLC591XX=m
+CONFIG_LEDS_LM355x=m
+
+#
+# LED driver for blink(1) USB RGB LED is under Special HID drivers (HID_THINGM)
+#
+CONFIG_LEDS_BLINKM=m
+CONFIG_LEDS_MLXCPLD=m
+CONFIG_LEDS_MLXREG=m
+CONFIG_LEDS_USER=m
+CONFIG_LEDS_NIC78BX=m
+CONFIG_LEDS_TI_LMU_COMMON=m
+
+#
+# LED Triggers
+#
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=m
+CONFIG_LEDS_TRIGGER_ONESHOT=m
+CONFIG_LEDS_TRIGGER_DISK=y
+# CONFIG_LEDS_TRIGGER_MTD is not set
+CONFIG_LEDS_TRIGGER_HEARTBEAT=m
+CONFIG_LEDS_TRIGGER_BACKLIGHT=m
+CONFIG_LEDS_TRIGGER_CPU=y
+# CONFIG_LEDS_TRIGGER_ACTIVITY is not set
+CONFIG_LEDS_TRIGGER_GPIO=m
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
+
+#
+# iptables trigger is under Netfilter config (LED target)
+#
+CONFIG_LEDS_TRIGGER_TRANSIENT=m
+CONFIG_LEDS_TRIGGER_CAMERA=m
+CONFIG_LEDS_TRIGGER_PANIC=y
+# CONFIG_LEDS_TRIGGER_NETDEV is not set
+# CONFIG_LEDS_TRIGGER_PATTERN is not set
+CONFIG_LEDS_TRIGGER_AUDIO=m
+# CONFIG_ACCESSIBILITY is not set
+CONFIG_INFINIBAND=m
+CONFIG_INFINIBAND_USER_MAD=m
+CONFIG_INFINIBAND_USER_ACCESS=m
+# CONFIG_INFINIBAND_EXP_LEGACY_VERBS_NEW_UAPI is not set
+CONFIG_INFINIBAND_USER_MEM=y
+CONFIG_INFINIBAND_ON_DEMAND_PAGING=y
+CONFIG_INFINIBAND_ADDR_TRANS=y
+CONFIG_INFINIBAND_ADDR_TRANS_CONFIGFS=y
+CONFIG_INFINIBAND_MTHCA=m
+# CONFIG_INFINIBAND_MTHCA_DEBUG is not set
+CONFIG_INFINIBAND_QIB=m
+CONFIG_INFINIBAND_QIB_DCA=y
+CONFIG_INFINIBAND_CXGB3=m
+CONFIG_INFINIBAND_CXGB4=m
+CONFIG_INFINIBAND_EFA=m
+CONFIG_INFINIBAND_I40IW=m
+CONFIG_MLX4_INFINIBAND=m
+CONFIG_MLX5_INFINIBAND=m
+CONFIG_INFINIBAND_OCRDMA=m
+CONFIG_INFINIBAND_VMWARE_PVRDMA=m
+CONFIG_INFINIBAND_USNIC=m
+CONFIG_INFINIBAND_BNXT_RE=m
+CONFIG_INFINIBAND_HFI1=m
+# CONFIG_HFI1_DEBUG_SDMA_ORDER is not set
+# CONFIG_SDMA_VERBOSITY is not set
+CONFIG_INFINIBAND_QEDR=m
+CONFIG_INFINIBAND_RDMAVT=m
+CONFIG_RDMA_RXE=m
+CONFIG_RDMA_SIW=m
+CONFIG_INFINIBAND_IPOIB=m
+CONFIG_INFINIBAND_IPOIB_CM=y
+# CONFIG_INFINIBAND_IPOIB_DEBUG is not set
+CONFIG_INFINIBAND_SRP=m
+CONFIG_INFINIBAND_SRPT=m
+CONFIG_INFINIBAND_ISER=m
+CONFIG_INFINIBAND_ISERT=m
+CONFIG_INFINIBAND_OPA_VNIC=m
+CONFIG_EDAC_ATOMIC_SCRUB=y
+CONFIG_EDAC_SUPPORT=y
+CONFIG_EDAC=y
+CONFIG_EDAC_LEGACY_SYSFS=y
+# CONFIG_EDAC_DEBUG is not set
+CONFIG_EDAC_DECODE_MCE=m
+CONFIG_EDAC_GHES=y
+CONFIG_EDAC_AMD64=m
+# CONFIG_EDAC_AMD64_ERROR_INJECTION is not set
+CONFIG_EDAC_E752X=m
+CONFIG_EDAC_I82975X=m
+CONFIG_EDAC_I3000=m
+CONFIG_EDAC_I3200=m
+CONFIG_EDAC_IE31200=m
+CONFIG_EDAC_X38=m
+CONFIG_EDAC_I5400=m
+CONFIG_EDAC_I7CORE=m
+CONFIG_EDAC_I5000=m
+CONFIG_EDAC_I5100=m
+CONFIG_EDAC_I7300=m
+CONFIG_EDAC_SBRIDGE=m
+CONFIG_EDAC_SKX=m
+CONFIG_EDAC_I10NM=m
+CONFIG_EDAC_PND2=m
+CONFIG_RTC_LIB=y
+CONFIG_RTC_MC146818_LIB=y
+CONFIG_RTC_CLASS=y
+CONFIG_RTC_HCTOSYS=y
+CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
+CONFIG_RTC_SYSTOHC=y
+CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
+# CONFIG_RTC_DEBUG is not set
+CONFIG_RTC_NVMEM=y
+
+#
+# RTC interfaces
+#
+CONFIG_RTC_INTF_SYSFS=y
+CONFIG_RTC_INTF_PROC=y
+CONFIG_RTC_INTF_DEV=y
+# CONFIG_RTC_INTF_DEV_UIE_EMUL is not set
+# CONFIG_RTC_DRV_TEST is not set
+
+#
+# I2C RTC drivers
+#
+CONFIG_RTC_DRV_ABB5ZES3=m
+CONFIG_RTC_DRV_ABEOZ9=m
+CONFIG_RTC_DRV_ABX80X=m
+CONFIG_RTC_DRV_DS1307=m
+CONFIG_RTC_DRV_DS1307_CENTURY=y
+CONFIG_RTC_DRV_DS1374=m
+CONFIG_RTC_DRV_DS1374_WDT=y
+CONFIG_RTC_DRV_DS1672=m
+CONFIG_RTC_DRV_MAX6900=m
+CONFIG_RTC_DRV_RS5C372=m
+CONFIG_RTC_DRV_ISL1208=m
+CONFIG_RTC_DRV_ISL12022=m
+CONFIG_RTC_DRV_X1205=m
+CONFIG_RTC_DRV_PCF8523=m
+CONFIG_RTC_DRV_PCF85063=m
+CONFIG_RTC_DRV_PCF85363=m
+CONFIG_RTC_DRV_PCF8563=m
+CONFIG_RTC_DRV_PCF8583=m
+CONFIG_RTC_DRV_M41T80=m
+CONFIG_RTC_DRV_M41T80_WDT=y
+CONFIG_RTC_DRV_BQ32K=m
+CONFIG_RTC_DRV_S35390A=m
+CONFIG_RTC_DRV_FM3130=m
+CONFIG_RTC_DRV_RX8010=m
+CONFIG_RTC_DRV_RX8581=m
+CONFIG_RTC_DRV_RX8025=m
+CONFIG_RTC_DRV_EM3027=m
+CONFIG_RTC_DRV_RV3028=m
+CONFIG_RTC_DRV_RV8803=m
+CONFIG_RTC_DRV_SD3078=m
+
+#
+# SPI RTC drivers
+#
+CONFIG_RTC_DRV_M41T93=m
+CONFIG_RTC_DRV_M41T94=m
+CONFIG_RTC_DRV_DS1302=m
+CONFIG_RTC_DRV_DS1305=m
+CONFIG_RTC_DRV_DS1343=m
+CONFIG_RTC_DRV_DS1347=m
+CONFIG_RTC_DRV_DS1390=m
+CONFIG_RTC_DRV_MAX6916=m
+CONFIG_RTC_DRV_R9701=m
+CONFIG_RTC_DRV_RX4581=m
+CONFIG_RTC_DRV_RX6110=m
+CONFIG_RTC_DRV_RS5C348=m
+CONFIG_RTC_DRV_MAX6902=m
+CONFIG_RTC_DRV_PCF2123=m
+CONFIG_RTC_DRV_MCP795=m
+CONFIG_RTC_I2C_AND_SPI=y
+
+#
+# SPI and I2C RTC drivers
+#
+CONFIG_RTC_DRV_DS3232=m
+CONFIG_RTC_DRV_DS3232_HWMON=y
+CONFIG_RTC_DRV_PCF2127=m
+CONFIG_RTC_DRV_RV3029C2=m
+CONFIG_RTC_DRV_RV3029_HWMON=y
+
+#
+# Platform RTC drivers
+#
+CONFIG_RTC_DRV_CMOS=y
+CONFIG_RTC_DRV_DS1286=m
+CONFIG_RTC_DRV_DS1511=m
+CONFIG_RTC_DRV_DS1553=m
+CONFIG_RTC_DRV_DS1685_FAMILY=m
+CONFIG_RTC_DRV_DS1685=y
+# CONFIG_RTC_DRV_DS1689 is not set
+# CONFIG_RTC_DRV_DS17285 is not set
+# CONFIG_RTC_DRV_DS17485 is not set
+# CONFIG_RTC_DRV_DS17885 is not set
+CONFIG_RTC_DRV_DS1742=m
+CONFIG_RTC_DRV_DS2404=m
+CONFIG_RTC_DRV_STK17TA8=m
+CONFIG_RTC_DRV_M48T86=m
+CONFIG_RTC_DRV_M48T35=m
+CONFIG_RTC_DRV_M48T59=m
+CONFIG_RTC_DRV_MSM6242=m
+CONFIG_RTC_DRV_BQ4802=m
+CONFIG_RTC_DRV_RP5C01=m
+CONFIG_RTC_DRV_V3020=m
+CONFIG_RTC_DRV_PCF50633=m
+
+#
+# on-CPU RTC drivers
+#
+CONFIG_RTC_DRV_FTRTC010=m
+CONFIG_RTC_DRV_MC13XXX=m
+
+#
+# HID Sensor RTC drivers
+#
+CONFIG_RTC_DRV_HID_SENSOR_TIME=m
+CONFIG_DMADEVICES=y
+# CONFIG_DMADEVICES_DEBUG is not set
+
+#
+# DMA Devices
+#
+CONFIG_DMA_ENGINE=y
+CONFIG_DMA_VIRTUAL_CHANNELS=m
+CONFIG_DMA_ACPI=y
+CONFIG_ALTERA_MSGDMA=m
+CONFIG_INTEL_IDMA64=m
+CONFIG_INTEL_IOATDMA=m
+CONFIG_QCOM_HIDMA_MGMT=m
+CONFIG_QCOM_HIDMA=m
+CONFIG_DW_DMAC_CORE=y
+CONFIG_DW_DMAC=m
+CONFIG_DW_DMAC_PCI=y
+CONFIG_DW_EDMA=m
+CONFIG_DW_EDMA_PCIE=m
+
+#
+# DMA Clients
+#
+CONFIG_ASYNC_TX_DMA=y
+# CONFIG_DMATEST is not set
+CONFIG_DMA_ENGINE_RAID=y
+
+#
+# DMABUF options
+#
+CONFIG_SYNC_FILE=y
+# CONFIG_SW_SYNC is not set
+# CONFIG_UDMABUF is not set
+# CONFIG_DMABUF_SELFTESTS is not set
+# end of DMABUF options
+
+CONFIG_DCA=m
+CONFIG_AUXDISPLAY=y
+# CONFIG_HD44780 is not set
+CONFIG_KS0108=m
+CONFIG_KS0108_PORT=0x378
+CONFIG_KS0108_DELAY=2
+CONFIG_CFAG12864B=m
+CONFIG_CFAG12864B_RATE=20
+# CONFIG_IMG_ASCII_LCD is not set
+# CONFIG_PARPORT_PANEL is not set
+# CONFIG_CHARLCD_BL_OFF is not set
+# CONFIG_CHARLCD_BL_ON is not set
+CONFIG_CHARLCD_BL_FLASH=y
+# CONFIG_PANEL is not set
+CONFIG_UIO=m
+CONFIG_UIO_CIF=m
+CONFIG_UIO_PDRV_GENIRQ=m
+CONFIG_UIO_DMEM_GENIRQ=m
+CONFIG_UIO_AEC=m
+CONFIG_UIO_SERCOS3=m
+CONFIG_UIO_PCI_GENERIC=m
+CONFIG_UIO_NETX=m
+CONFIG_UIO_PRUSS=m
+CONFIG_UIO_MF624=m
+CONFIG_UIO_HV_GENERIC=m
+CONFIG_VFIO_IOMMU_TYPE1=m
+CONFIG_VFIO_VIRQFD=m
+CONFIG_VFIO=m
+# CONFIG_VFIO_NOIOMMU is not set
+CONFIG_VFIO_PCI=m
+# CONFIG_VFIO_PCI_VGA is not set
+CONFIG_VFIO_PCI_MMAP=y
+CONFIG_VFIO_PCI_INTX=y
+CONFIG_VFIO_PCI_IGD=y
+# CONFIG_VFIO_MDEV is not set
+CONFIG_IRQ_BYPASS_MANAGER=m
+CONFIG_VIRT_DRIVERS=y
+# CONFIG_VBOXGUEST is not set
+CONFIG_VIRTIO=m
+CONFIG_VIRTIO_MENU=y
+CONFIG_VIRTIO_PCI=m
+CONFIG_VIRTIO_PCI_LEGACY=y
+CONFIG_VIRTIO_PMEM=m
+CONFIG_VIRTIO_BALLOON=m
+CONFIG_VIRTIO_INPUT=m
+# CONFIG_VIRTIO_MMIO is not set
+
+#
+# Microsoft Hyper-V guest support
+#
+CONFIG_HYPERV=m
+CONFIG_HYPERV_TIMER=y
+CONFIG_HYPERV_UTILS=m
+CONFIG_HYPERV_BALLOON=m
+# end of Microsoft Hyper-V guest support
+
+#
+# Xen driver support
+#
+CONFIG_XEN_BALLOON=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG=y
+CONFIG_XEN_BALLOON_MEMORY_HOTPLUG_LIMIT=512
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
+CONFIG_XEN_DEV_EVTCHN=m
+CONFIG_XEN_BACKEND=y
+CONFIG_XENFS=m
+CONFIG_XEN_COMPAT_XENFS=y
+CONFIG_XEN_SYS_HYPERVISOR=y
+CONFIG_XEN_XENBUS_FRONTEND=y
+CONFIG_XEN_GNTDEV=m
+CONFIG_XEN_GNTDEV_DMABUF=y
+CONFIG_XEN_GRANT_DEV_ALLOC=m
+CONFIG_XEN_GRANT_DMA_ALLOC=y
+CONFIG_SWIOTLB_XEN=y
+CONFIG_XEN_PCIDEV_BACKEND=y
+CONFIG_XEN_PVCALLS_FRONTEND=m
+CONFIG_XEN_PVCALLS_BACKEND=y
+CONFIG_XEN_SCSI_BACKEND=m
+CONFIG_XEN_PRIVCMD=m
+CONFIG_XEN_ACPI_PROCESSOR=m
+CONFIG_XEN_MCE_LOG=y
+CONFIG_XEN_HAVE_PVMMU=y
+CONFIG_XEN_EFI=y
+CONFIG_XEN_AUTO_XLATE=y
+CONFIG_XEN_ACPI=y
+CONFIG_XEN_SYMS=y
+CONFIG_XEN_HAVE_VPMU=y
+CONFIG_XEN_FRONT_PGDIR_SHBUF=m
+# end of Xen driver support
+
+# CONFIG_GREYBUS is not set
+CONFIG_STAGING=y
+# CONFIG_PRISM2_USB is not set
+# CONFIG_COMEDI is not set
+CONFIG_RTL8192U=m
+CONFIG_RTLLIB=m
+CONFIG_RTLLIB_CRYPTO_CCMP=m
+CONFIG_RTLLIB_CRYPTO_TKIP=m
+CONFIG_RTLLIB_CRYPTO_WEP=m
+CONFIG_RTL8192E=m
+CONFIG_RTL8723BS=m
+CONFIG_R8712U=m
+CONFIG_R8188EU=m
+CONFIG_88EU_AP_MODE=y
+CONFIG_RTS5208=m
+# CONFIG_VT6655 is not set
+# CONFIG_VT6656 is not set
+
+#
+# IIO staging drivers
+#
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16203 is not set
+# CONFIG_ADIS16240 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7816 is not set
+# CONFIG_AD7192 is not set
+# CONFIG_AD7280 is not set
+# end of Analog to digital converters
+
+#
+# Analog digital bi-direction converters
+#
+# CONFIG_ADT7316 is not set
+# end of Analog digital bi-direction converters
+
+#
+# Capacitance to digital converters
+#
+# CONFIG_AD7150 is not set
+# CONFIG_AD7746 is not set
+# end of Capacitance to digital converters
+
+#
+# Direct Digital Synthesis
+#
+# CONFIG_AD9832 is not set
+# CONFIG_AD9834 is not set
+# end of Direct Digital Synthesis
+
+#
+# Network Analyzer, Impedance Converters
+#
+# CONFIG_AD5933 is not set
+# end of Network Analyzer, Impedance Converters
+
+#
+# Active energy metering IC
+#
+# CONFIG_ADE7854 is not set
+# end of Active energy metering IC
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S1210 is not set
+# end of Resolver to digital converters
+# end of IIO staging drivers
+
+# CONFIG_FB_SM750 is not set
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+# end of Speakup console speech
+
+# CONFIG_STAGING_MEDIA is not set
+
+#
+# Android
+#
+# end of Android
+
+# CONFIG_LTE_GDM724X is not set
+CONFIG_FIREWIRE_SERIAL=m
+CONFIG_FWTTY_MAX_TOTAL_PORTS=64
+CONFIG_FWTTY_MAX_CARD_PORTS=32
+# CONFIG_GS_FPGABOOT is not set
+# CONFIG_UNISYSSPAR is not set
+# CONFIG_WILC1000_SDIO is not set
+# CONFIG_WILC1000_SPI is not set
+# CONFIG_MOST is not set
+# CONFIG_KS7010 is not set
+CONFIG_PI433=m
+
+#
+# Gasket devices
+#
+# CONFIG_STAGING_GASKET_FRAMEWORK is not set
+# end of Gasket devices
+
+# CONFIG_FIELDBUS_DEV is not set
+# CONFIG_KPC2000 is not set
+
+#
+# ISDN CAPI drivers
+#
+CONFIG_CAPI_AVM=y
+CONFIG_ISDN_DRV_AVMB1_B1PCI=m
+CONFIG_ISDN_DRV_AVMB1_B1PCIV4=y
+CONFIG_ISDN_DRV_AVMB1_B1PCMCIA=m
+CONFIG_ISDN_DRV_AVMB1_AVM_CS=m
+CONFIG_ISDN_DRV_AVMB1_T1PCI=m
+CONFIG_ISDN_DRV_AVMB1_C4=m
+CONFIG_ISDN_DRV_GIGASET=m
+CONFIG_GIGASET_CAPI=y
+CONFIG_GIGASET_BASE=m
+CONFIG_GIGASET_M105=m
+CONFIG_GIGASET_M101=m
+# CONFIG_GIGASET_DEBUG is not set
+CONFIG_HYSDN=m
+CONFIG_HYSDN_CAPI=y
+# end of ISDN CAPI drivers
+
+CONFIG_USB_WUSB=m
+CONFIG_USB_WUSB_CBAF=m
+# CONFIG_USB_WUSB_CBAF_DEBUG is not set
+CONFIG_USB_WHCI_HCD=m
+CONFIG_USB_HWA_HCD=m
+CONFIG_UWB=m
+CONFIG_UWB_HWA=m
+CONFIG_UWB_WHCI=m
+CONFIG_UWB_I1480U=m
+# CONFIG_EXFAT_FS is not set
+CONFIG_QLGE=m
+CONFIG_X86_PLATFORM_DEVICES=y
+CONFIG_ACER_WMI=m
+CONFIG_ACER_WIRELESS=m
+CONFIG_ACERHDF=m
+CONFIG_ALIENWARE_WMI=m
+CONFIG_ASUS_LAPTOP=m
+CONFIG_DCDBAS=m
+CONFIG_DELL_SMBIOS=m
+CONFIG_DELL_SMBIOS_WMI=y
+CONFIG_DELL_SMBIOS_SMM=y
+CONFIG_DELL_LAPTOP=m
+CONFIG_DELL_WMI=m
+CONFIG_DELL_WMI_DESCRIPTOR=m
+CONFIG_DELL_WMI_AIO=m
+CONFIG_DELL_WMI_LED=m
+CONFIG_DELL_SMO8800=m
+CONFIG_DELL_RBTN=m
+CONFIG_DELL_RBU=m
+CONFIG_FUJITSU_LAPTOP=m
+CONFIG_FUJITSU_TABLET=m
+CONFIG_AMILO_RFKILL=m
+CONFIG_GPD_POCKET_FAN=m
+CONFIG_HP_ACCEL=m
+CONFIG_HP_WIRELESS=m
+CONFIG_HP_WMI=m
+CONFIG_LG_LAPTOP=m
+CONFIG_MSI_LAPTOP=m
+CONFIG_PANASONIC_LAPTOP=m
+CONFIG_COMPAL_LAPTOP=m
+CONFIG_SONY_LAPTOP=m
+CONFIG_SONYPI_COMPAT=y
+CONFIG_IDEAPAD_LAPTOP=m
+CONFIG_SURFACE3_WMI=m
+CONFIG_THINKPAD_ACPI=m
+CONFIG_THINKPAD_ACPI_ALSA_SUPPORT=y
+# CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set
+# CONFIG_THINKPAD_ACPI_DEBUG is not set
+# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set
+CONFIG_THINKPAD_ACPI_VIDEO=y
+CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y
+CONFIG_SENSORS_HDAPS=m
+CONFIG_INTEL_MENLOW=m
+CONFIG_EEEPC_LAPTOP=m
+CONFIG_ASUS_WMI=m
+CONFIG_ASUS_NB_WMI=m
+CONFIG_EEEPC_WMI=m
+CONFIG_ASUS_WIRELESS=m
+CONFIG_ACPI_WMI=m
+CONFIG_WMI_BMOF=m
+CONFIG_INTEL_WMI_THUNDERBOLT=m
+CONFIG_XIAOMI_WMI=m
+CONFIG_MSI_WMI=m
+CONFIG_PEAQ_WMI=m
+CONFIG_TOPSTAR_LAPTOP=m
+CONFIG_ACPI_TOSHIBA=m
+CONFIG_TOSHIBA_BT_RFKILL=m
+CONFIG_TOSHIBA_HAPS=m
+CONFIG_TOSHIBA_WMI=m
+CONFIG_ACPI_CMPC=m
+CONFIG_INTEL_INT0002_VGPIO=m
+CONFIG_INTEL_HID_EVENT=m
+CONFIG_INTEL_VBTN=m
+CONFIG_INTEL_IPS=m
+CONFIG_INTEL_PMC_CORE=m
+CONFIG_IBM_RTL=m
+CONFIG_SAMSUNG_LAPTOP=m
+CONFIG_MXM_WMI=m
+CONFIG_INTEL_OAKTRAIL=m
+CONFIG_SAMSUNG_Q10=m
+CONFIG_APPLE_GMUX=m
+CONFIG_INTEL_RST=m
+CONFIG_INTEL_SMARTCONNECT=m
+CONFIG_INTEL_PMC_IPC=m
+CONFIG_SURFACE_PRO3_BUTTON=m
+CONFIG_INTEL_PUNIT_IPC=m
+CONFIG_INTEL_TELEMETRY=m
+CONFIG_MLX_PLATFORM=m
+# CONFIG_INTEL_TURBO_MAX_3 is not set
+# CONFIG_TOUCHSCREEN_DMI is not set
+# CONFIG_I2C_MULTI_INSTANTIATE is not set
+# CONFIG_INTEL_ATOMISP2_PM is not set
+CONFIG_HUAWEI_WMI=m
+# CONFIG_PCENGINES_APU2 is not set
+
+#
+# Intel Speed Select Technology interface support
+#
+# CONFIG_INTEL_SPEED_SELECT_INTERFACE is not set
+# end of Intel Speed Select Technology interface support
+
+CONFIG_PMC_ATOM=y
+# CONFIG_MFD_CROS_EC is not set
+CONFIG_CHROME_PLATFORMS=y
+CONFIG_CHROMEOS_LAPTOP=m
+CONFIG_CHROMEOS_PSTORE=m
+CONFIG_CHROMEOS_TBMC=m
+# CONFIG_CROS_EC is not set
+CONFIG_CROS_KBD_LED_BACKLIGHT=m
+# CONFIG_MELLANOX_PLATFORM is not set
+CONFIG_CLKDEV_LOOKUP=y
+CONFIG_HAVE_CLK_PREPARE=y
+CONFIG_COMMON_CLK=y
+
+#
+# Common Clock Framework
+#
+# CONFIG_COMMON_CLK_MAX9485 is not set
+# CONFIG_COMMON_CLK_SI5341 is not set
+# CONFIG_COMMON_CLK_SI5351 is not set
+# CONFIG_COMMON_CLK_SI544 is not set
+# CONFIG_COMMON_CLK_CDCE706 is not set
+# CONFIG_COMMON_CLK_CS2000_CP is not set
+# end of Common Clock Framework
+
+# CONFIG_HWSPINLOCK is not set
+
+#
+# Clock Source drivers
+#
+CONFIG_CLKEVT_I8253=y
+CONFIG_I8253_LOCK=y
+CONFIG_CLKBLD_I8253=y
+# end of Clock Source drivers
+
+CONFIG_MAILBOX=y
+CONFIG_PCC=y
+# CONFIG_ALTERA_MBOX is not set
+CONFIG_IOMMU_IOVA=y
+CONFIG_IOMMU_API=y
+CONFIG_IOMMU_SUPPORT=y
+
+#
+# Generic IOMMU Pagetable Support
+#
+# end of Generic IOMMU Pagetable Support
+
+# CONFIG_IOMMU_DEBUGFS is not set
+# CONFIG_IOMMU_DEFAULT_PASSTHROUGH is not set
+CONFIG_AMD_IOMMU=y
+CONFIG_AMD_IOMMU_V2=m
+CONFIG_DMAR_TABLE=y
+CONFIG_INTEL_IOMMU=y
+CONFIG_INTEL_IOMMU_SVM=y
+# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set
+CONFIG_INTEL_IOMMU_FLOPPY_WA=y
+CONFIG_IRQ_REMAP=y
+CONFIG_HYPERV_IOMMU=y
+
+#
+# Remoteproc drivers
+#
+# CONFIG_REMOTEPROC is not set
+# end of Remoteproc drivers
+
+#
+# Rpmsg drivers
+#
+# CONFIG_RPMSG_QCOM_GLINK_RPM is not set
+# CONFIG_RPMSG_VIRTIO is not set
+# end of Rpmsg drivers
+
+# CONFIG_SOUNDWIRE is not set
+
+#
+# SOC (System On Chip) specific Drivers
+#
+
+#
+# Amlogic SoC drivers
+#
+# end of Amlogic SoC drivers
+
+#
+# Aspeed SoC drivers
+#
+# end of Aspeed SoC drivers
+
+#
+# Broadcom SoC drivers
+#
+# end of Broadcom SoC drivers
+
+#
+# NXP/Freescale QorIQ SoC drivers
+#
+# end of NXP/Freescale QorIQ SoC drivers
+
+#
+# i.MX SoC drivers
+#
+# end of i.MX SoC drivers
+
+#
+# Qualcomm SoC drivers
+#
+# end of Qualcomm SoC drivers
+
+# CONFIG_SOC_TI is not set
+
+#
+# Xilinx SoC drivers
+#
+# CONFIG_XILINX_VCU is not set
+# end of Xilinx SoC drivers
+# end of SOC (System On Chip) specific Drivers
+
+CONFIG_PM_DEVFREQ=y
+
+#
+# DEVFREQ Governors
+#
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+CONFIG_DEVFREQ_GOV_PERFORMANCE=m
+CONFIG_DEVFREQ_GOV_POWERSAVE=m
+CONFIG_DEVFREQ_GOV_USERSPACE=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+
+#
+# DEVFREQ Drivers
+#
+# CONFIG_PM_DEVFREQ_EVENT is not set
+CONFIG_EXTCON=y
+
+#
+# Extcon Device Drivers
+#
+# CONFIG_EXTCON_ADC_JACK is not set
+# CONFIG_EXTCON_FSA9480 is not set
+# CONFIG_EXTCON_GPIO is not set
+# CONFIG_EXTCON_INTEL_INT3496 is not set
+# CONFIG_EXTCON_MAX3355 is not set
+# CONFIG_EXTCON_PTN5150 is not set
+# CONFIG_EXTCON_RT8973A is not set
+# CONFIG_EXTCON_SM5502 is not set
+# CONFIG_EXTCON_USB_GPIO is not set
+# CONFIG_MEMORY is not set
+CONFIG_IIO=m
+CONFIG_IIO_BUFFER=y
+CONFIG_IIO_BUFFER_CB=m
+# CONFIG_IIO_BUFFER_HW_CONSUMER is not set
+CONFIG_IIO_KFIFO_BUF=m
+CONFIG_IIO_TRIGGERED_BUFFER=m
+CONFIG_IIO_CONFIGFS=m
+CONFIG_IIO_TRIGGER=y
+CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
+# CONFIG_IIO_SW_DEVICE is not set
+# CONFIG_IIO_SW_TRIGGER is not set
+
+#
+# Accelerometers
+#
+# CONFIG_ADIS16201 is not set
+# CONFIG_ADIS16209 is not set
+# CONFIG_ADXL372_SPI is not set
+# CONFIG_ADXL372_I2C is not set
+# CONFIG_BMA180 is not set
+# CONFIG_BMA220 is not set
+# CONFIG_BMC150_ACCEL is not set
+# CONFIG_DA280 is not set
+# CONFIG_DA311 is not set
+# CONFIG_DMARD09 is not set
+# CONFIG_DMARD10 is not set
+# CONFIG_HID_SENSOR_ACCEL_3D is not set
+# CONFIG_IIO_ST_ACCEL_3AXIS is not set
+# CONFIG_KXSD9 is not set
+# CONFIG_KXCJK1013 is not set
+# CONFIG_MC3230 is not set
+# CONFIG_MMA7455_I2C is not set
+# CONFIG_MMA7455_SPI is not set
+# CONFIG_MMA7660 is not set
+# CONFIG_MMA8452 is not set
+# CONFIG_MMA9551 is not set
+# CONFIG_MMA9553 is not set
+# CONFIG_MXC4005 is not set
+# CONFIG_MXC6255 is not set
+# CONFIG_SCA3000 is not set
+# CONFIG_STK8312 is not set
+# CONFIG_STK8BA50 is not set
+# end of Accelerometers
+
+#
+# Analog to digital converters
+#
+# CONFIG_AD7124 is not set
+# CONFIG_AD7266 is not set
+# CONFIG_AD7291 is not set
+# CONFIG_AD7298 is not set
+# CONFIG_AD7476 is not set
+# CONFIG_AD7606_IFACE_PARALLEL is not set
+# CONFIG_AD7606_IFACE_SPI is not set
+# CONFIG_AD7766 is not set
+# CONFIG_AD7768_1 is not set
+# CONFIG_AD7780 is not set
+# CONFIG_AD7791 is not set
+# CONFIG_AD7793 is not set
+# CONFIG_AD7887 is not set
+# CONFIG_AD7923 is not set
+# CONFIG_AD7949 is not set
+# CONFIG_AD799X is not set
+# CONFIG_CC10001_ADC is not set
+# CONFIG_HI8435 is not set
+# CONFIG_HX711 is not set
+# CONFIG_INA2XX_ADC is not set
+# CONFIG_LTC2471 is not set
+# CONFIG_LTC2485 is not set
+# CONFIG_LTC2497 is not set
+# CONFIG_MAX1027 is not set
+# CONFIG_MAX11100 is not set
+# CONFIG_MAX1118 is not set
+# CONFIG_MAX1363 is not set
+# CONFIG_MAX9611 is not set
+# CONFIG_MCP320X is not set
+# CONFIG_MCP3422 is not set
+# CONFIG_MCP3911 is not set
+# CONFIG_NAU7802 is not set
+# CONFIG_TI_ADC081C is not set
+# CONFIG_TI_ADC0832 is not set
+# CONFIG_TI_ADC084S021 is not set
+# CONFIG_TI_ADC12138 is not set
+# CONFIG_TI_ADC108S102 is not set
+# CONFIG_TI_ADC128S052 is not set
+# CONFIG_TI_ADC161S626 is not set
+# CONFIG_TI_ADS1015 is not set
+# CONFIG_TI_ADS7950 is not set
+# CONFIG_TI_AM335X_ADC is not set
+# CONFIG_TI_TLC4541 is not set
+# CONFIG_VIPERBOARD_ADC is not set
+# CONFIG_XILINX_XADC is not set
+# end of Analog to digital converters
+
+#
+# Analog Front Ends
+#
+# end of Analog Front Ends
+
+#
+# Amplifiers
+#
+# CONFIG_AD8366 is not set
+# end of Amplifiers
+
+#
+# Chemical Sensors
+#
+# CONFIG_ATLAS_PH_SENSOR is not set
+# CONFIG_BME680 is not set
+# CONFIG_CCS811 is not set
+# CONFIG_IAQCORE is not set
+# CONFIG_SENSIRION_SGP30 is not set
+# CONFIG_SPS30 is not set
+# CONFIG_VZ89X is not set
+# end of Chemical Sensors
+
+#
+# Hid Sensor IIO Common
+#
+CONFIG_HID_SENSOR_IIO_COMMON=m
+CONFIG_HID_SENSOR_IIO_TRIGGER=m
+# end of Hid Sensor IIO Common
+
+#
+# SSP Sensor Common
+#
+# CONFIG_IIO_SSP_SENSORHUB is not set
+# end of SSP Sensor Common
+
+#
+# Digital to analog converters
+#
+# CONFIG_AD5064 is not set
+# CONFIG_AD5360 is not set
+# CONFIG_AD5380 is not set
+# CONFIG_AD5421 is not set
+# CONFIG_AD5446 is not set
+# CONFIG_AD5449 is not set
+# CONFIG_AD5592R is not set
+# CONFIG_AD5593R is not set
+# CONFIG_AD5504 is not set
+# CONFIG_AD5624R_SPI is not set
+# CONFIG_LTC1660 is not set
+# CONFIG_LTC2632 is not set
+# CONFIG_AD5686_SPI is not set
+# CONFIG_AD5696_I2C is not set
+# CONFIG_AD5755 is not set
+# CONFIG_AD5758 is not set
+# CONFIG_AD5761 is not set
+# CONFIG_AD5764 is not set
+# CONFIG_AD5791 is not set
+# CONFIG_AD7303 is not set
+# CONFIG_AD8801 is not set
+# CONFIG_DS4424 is not set
+# CONFIG_M62332 is not set
+# CONFIG_MAX517 is not set
+# CONFIG_MCP4725 is not set
+# CONFIG_MCP4922 is not set
+# CONFIG_TI_DAC082S085 is not set
+# CONFIG_TI_DAC5571 is not set
+# CONFIG_TI_DAC7311 is not set
+# CONFIG_TI_DAC7612 is not set
+# end of Digital to analog converters
+
+#
+# IIO dummy driver
+#
+# end of IIO dummy driver
+
+#
+# Frequency Synthesizers DDS/PLL
+#
+
+#
+# Clock Generator/Distribution
+#
+# CONFIG_AD9523 is not set
+# end of Clock Generator/Distribution
+
+#
+# Phase-Locked Loop (PLL) frequency synthesizers
+#
+# CONFIG_ADF4350 is not set
+# CONFIG_ADF4371 is not set
+# end of Phase-Locked Loop (PLL) frequency synthesizers
+# end of Frequency Synthesizers DDS/PLL
+
+#
+# Digital gyroscope sensors
+#
+# CONFIG_ADIS16080 is not set
+# CONFIG_ADIS16130 is not set
+# CONFIG_ADIS16136 is not set
+# CONFIG_ADIS16260 is not set
+# CONFIG_ADXRS450 is not set
+# CONFIG_BMG160 is not set
+# CONFIG_FXAS21002C is not set
+# CONFIG_HID_SENSOR_GYRO_3D is not set
+# CONFIG_MPU3050_I2C is not set
+# CONFIG_IIO_ST_GYRO_3AXIS is not set
+# CONFIG_ITG3200 is not set
+# end of Digital gyroscope sensors
+
+#
+# Health Sensors
+#
+
+#
+# Heart Rate Monitors
+#
+# CONFIG_AFE4403 is not set
+# CONFIG_AFE4404 is not set
+# CONFIG_MAX30100 is not set
+# CONFIG_MAX30102 is not set
+# end of Heart Rate Monitors
+# end of Health Sensors
+
+#
+# Humidity sensors
+#
+# CONFIG_AM2315 is not set
+# CONFIG_DHT11 is not set
+# CONFIG_HDC100X is not set
+# CONFIG_HID_SENSOR_HUMIDITY is not set
+# CONFIG_HTS221 is not set
+# CONFIG_HTU21 is not set
+# CONFIG_SI7005 is not set
+# CONFIG_SI7020 is not set
+# end of Humidity sensors
+
+#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16460 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_BMI160_I2C is not set
+# CONFIG_BMI160_SPI is not set
+# CONFIG_KMX61 is not set
+# CONFIG_INV_MPU6050_I2C is not set
+# CONFIG_INV_MPU6050_SPI is not set
+# CONFIG_IIO_ST_LSM6DSX is not set
+# end of Inertial measurement units
+
+#
+# Light sensors
+#
+CONFIG_ACPI_ALS=m
+# CONFIG_ADJD_S311 is not set
+CONFIG_AL3320A=m
+CONFIG_APDS9300=m
+# CONFIG_APDS9960 is not set
+CONFIG_BH1750=m
+CONFIG_BH1780=m
+# CONFIG_CM32181 is not set
+CONFIG_CM3232=m
+# CONFIG_CM3323 is not set
+# CONFIG_CM36651 is not set
+# CONFIG_GP2AP020A00F is not set
+# CONFIG_SENSORS_ISL29018 is not set
+# CONFIG_SENSORS_ISL29028 is not set
+# CONFIG_ISL29125 is not set
+CONFIG_HID_SENSOR_ALS=m
+# CONFIG_HID_SENSOR_PROX is not set
+# CONFIG_JSA1212 is not set
+# CONFIG_RPR0521 is not set
+CONFIG_SENSORS_LM3533=m
+CONFIG_LTR501=m
+CONFIG_LV0104CS=m
+# CONFIG_MAX44000 is not set
+# CONFIG_MAX44009 is not set
+# CONFIG_NOA1305 is not set
+CONFIG_OPT3001=m
+# CONFIG_PA12203001 is not set
+# CONFIG_SI1133 is not set
+# CONFIG_SI1145 is not set
+# CONFIG_STK3310 is not set
+# CONFIG_ST_UVIS25 is not set
+# CONFIG_TCS3414 is not set
+# CONFIG_TCS3472 is not set
+CONFIG_SENSORS_TSL2563=m
+# CONFIG_TSL2583 is not set
+# CONFIG_TSL2772 is not set
+CONFIG_TSL4531=m
+# CONFIG_US5182D is not set
+# CONFIG_VCNL4000 is not set
+# CONFIG_VCNL4035 is not set
+# CONFIG_VEML6070 is not set
+# CONFIG_VL6180 is not set
+# CONFIG_ZOPT2201 is not set
+# end of Light sensors
+
+#
+# Magnetometer sensors
+#
+# CONFIG_AK8975 is not set
+# CONFIG_AK09911 is not set
+# CONFIG_BMC150_MAGN_I2C is not set
+# CONFIG_BMC150_MAGN_SPI is not set
+# CONFIG_MAG3110 is not set
+# CONFIG_HID_SENSOR_MAGNETOMETER_3D is not set
+# CONFIG_MMC35240 is not set
+# CONFIG_IIO_ST_MAGN_3AXIS is not set
+# CONFIG_SENSORS_HMC5843_I2C is not set
+# CONFIG_SENSORS_HMC5843_SPI is not set
+# CONFIG_SENSORS_RM3100_I2C is not set
+# CONFIG_SENSORS_RM3100_SPI is not set
+# end of Magnetometer sensors
+
+#
+# Multiplexers
+#
+# end of Multiplexers
+
+#
+# Inclinometer sensors
+#
+# CONFIG_HID_SENSOR_INCLINOMETER_3D is not set
+# CONFIG_HID_SENSOR_DEVICE_ROTATION is not set
+# end of Inclinometer sensors
+
+#
+# Triggers - standalone
+#
+# CONFIG_IIO_INTERRUPT_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# end of Triggers - standalone
+
+#
+# Digital potentiometers
+#
+# CONFIG_AD5272 is not set
+# CONFIG_DS1803 is not set
+# CONFIG_MAX5432 is not set
+# CONFIG_MAX5481 is not set
+# CONFIG_MAX5487 is not set
+# CONFIG_MCP4018 is not set
+# CONFIG_MCP4131 is not set
+# CONFIG_MCP4531 is not set
+# CONFIG_MCP41010 is not set
+# CONFIG_TPL0102 is not set
+# end of Digital potentiometers
+
+#
+# Digital potentiostats
+#
+# CONFIG_LMP91000 is not set
+# end of Digital potentiostats
+
+#
+# Pressure sensors
+#
+# CONFIG_ABP060MG is not set
+# CONFIG_BMP280 is not set
+# CONFIG_DPS310 is not set
+# CONFIG_HID_SENSOR_PRESS is not set
+# CONFIG_HP03 is not set
+# CONFIG_MPL115_I2C is not set
+# CONFIG_MPL115_SPI is not set
+# CONFIG_MPL3115 is not set
+# CONFIG_MS5611 is not set
+# CONFIG_MS5637 is not set
+# CONFIG_IIO_ST_PRESS is not set
+# CONFIG_T5403 is not set
+# CONFIG_HP206C is not set
+# CONFIG_ZPA2326 is not set
+# end of Pressure sensors
+
+#
+# Lightning sensors
+#
+# CONFIG_AS3935 is not set
+# end of Lightning sensors
+
+#
+# Proximity and distance sensors
+#
+# CONFIG_ISL29501 is not set
+# CONFIG_LIDAR_LITE_V2 is not set
+# CONFIG_MB1232 is not set
+# CONFIG_RFD77402 is not set
+# CONFIG_SRF04 is not set
+# CONFIG_SX9500 is not set
+# CONFIG_SRF08 is not set
+# CONFIG_VL53L0X_I2C is not set
+# end of Proximity and distance sensors
+
+#
+# Resolver to digital converters
+#
+# CONFIG_AD2S90 is not set
+# CONFIG_AD2S1200 is not set
+# end of Resolver to digital converters
+
+#
+# Temperature sensors
+#
+# CONFIG_MAXIM_THERMOCOUPLE is not set
+# CONFIG_HID_SENSOR_TEMP is not set
+# CONFIG_MLX90614 is not set
+# CONFIG_MLX90632 is not set
+# CONFIG_TMP006 is not set
+# CONFIG_TMP007 is not set
+# CONFIG_TSYS01 is not set
+# CONFIG_TSYS02D is not set
+# CONFIG_MAX31856 is not set
+# end of Temperature sensors
+
+CONFIG_NTB=m
+# CONFIG_NTB_MSI is not set
+CONFIG_NTB_AMD=m
+# CONFIG_NTB_IDT is not set
+CONFIG_NTB_INTEL=m
+# CONFIG_NTB_SWITCHTEC is not set
+# CONFIG_NTB_PINGPONG is not set
+# CONFIG_NTB_TOOL is not set
+# CONFIG_NTB_PERF is not set
+CONFIG_NTB_TRANSPORT=m
+# CONFIG_VME_BUS is not set
+# CONFIG_PWM is not set
+
+#
+# IRQ chip support
+#
+# end of IRQ chip support
+
+# CONFIG_IPACK_BUS is not set
+CONFIG_RESET_CONTROLLER=y
+# CONFIG_RESET_TI_SYSCON is not set
+
+#
+# PHY Subsystem
+#
+CONFIG_GENERIC_PHY=y
+CONFIG_BCM_KONA_USB2_PHY=m
+CONFIG_PHY_PXA_28NM_HSIC=m
+CONFIG_PHY_PXA_28NM_USB2=m
+# CONFIG_PHY_CPCAP_USB is not set
+CONFIG_PHY_QCOM_USB_HS=m
+CONFIG_PHY_QCOM_USB_HSIC=m
+CONFIG_PHY_TUSB1210=m
+# end of PHY Subsystem
+
+# CONFIG_POWERCAP is not set
+# CONFIG_MCB is not set
+
+#
+# Performance monitor support
+#
+# end of Performance monitor support
+
+CONFIG_RAS=y
+# CONFIG_RAS_CEC is not set
+CONFIG_THUNDERBOLT=m
+
+#
+# Android
+#
+# CONFIG_ANDROID is not set
+# end of Android
+
+CONFIG_LIBNVDIMM=y
+CONFIG_BLK_DEV_PMEM=m
+CONFIG_ND_BLK=m
+CONFIG_ND_CLAIM=y
+CONFIG_ND_BTT=m
+CONFIG_BTT=y
+CONFIG_ND_PFN=m
+CONFIG_NVDIMM_PFN=y
+CONFIG_NVDIMM_DAX=y
+CONFIG_NVDIMM_KEYS=y
+CONFIG_DAX_DRIVER=y
+CONFIG_DAX=y
+CONFIG_DEV_DAX=m
+CONFIG_DEV_DAX_PMEM=m
+CONFIG_DEV_DAX_KMEM=m
+CONFIG_DEV_DAX_PMEM_COMPAT=m
+CONFIG_NVMEM=y
+CONFIG_NVMEM_SYSFS=y
+
+#
+# HW tracing support
+#
+# CONFIG_STM is not set
+# CONFIG_INTEL_TH is not set
+# end of HW tracing support
+
+CONFIG_FPGA=m
+CONFIG_ALTERA_PR_IP_CORE=m
+CONFIG_FPGA_MGR_ALTERA_PS_SPI=m
+CONFIG_FPGA_MGR_ALTERA_CVP=m
+CONFIG_FPGA_MGR_XILINX_SPI=m
+CONFIG_FPGA_MGR_MACHXO2_SPI=m
+CONFIG_FPGA_BRIDGE=m
+# CONFIG_ALTERA_FREEZE_BRIDGE is not set
+CONFIG_XILINX_PR_DECOUPLER=m
+CONFIG_FPGA_REGION=m
+CONFIG_FPGA_DFL=m
+CONFIG_FPGA_DFL_FME=m
+CONFIG_FPGA_DFL_FME_MGR=m
+CONFIG_FPGA_DFL_FME_BRIDGE=m
+CONFIG_FPGA_DFL_FME_REGION=m
+CONFIG_FPGA_DFL_AFU=m
+CONFIG_FPGA_DFL_PCI=m
+CONFIG_PM_OPP=y
+# CONFIG_UNISYS_VISORBUS is not set
+# CONFIG_SIOX is not set
+# CONFIG_SLIMBUS is not set
+# CONFIG_INTERCONNECT is not set
+# CONFIG_COUNTER is not set
+# end of Device Drivers
+
+#
+# File systems
+#
+CONFIG_DCACHE_WORD_ACCESS=y
+CONFIG_VALIDATE_FS_PARSER=y
+CONFIG_FS_IOMAP=y
+# CONFIG_EXT2_FS is not set
+# CONFIG_EXT3_FS is not set
+CONFIG_EXT4_FS=m
+CONFIG_EXT4_USE_FOR_EXT2=y
+CONFIG_EXT4_FS_POSIX_ACL=y
+CONFIG_EXT4_FS_SECURITY=y
+# CONFIG_EXT4_DEBUG is not set
+CONFIG_JBD2=m
+# CONFIG_JBD2_DEBUG is not set
+CONFIG_FS_MBCACHE=m
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+CONFIG_XFS_FS=m
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_XFS_RT is not set
+# CONFIG_XFS_ONLINE_SCRUB is not set
+# CONFIG_XFS_WARN is not set
+# CONFIG_XFS_DEBUG is not set
+CONFIG_GFS2_FS=m
+CONFIG_GFS2_FS_LOCKING_DLM=y
+# CONFIG_OCFS2_FS is not set
+CONFIG_BTRFS_FS=m
+CONFIG_BTRFS_FS_POSIX_ACL=y
+# CONFIG_BTRFS_FS_CHECK_INTEGRITY is not set
+# CONFIG_BTRFS_FS_RUN_SANITY_TESTS is not set
+# CONFIG_BTRFS_DEBUG is not set
+# CONFIG_BTRFS_ASSERT is not set
+# CONFIG_BTRFS_FS_REF_VERIFY is not set
+# CONFIG_NILFS2_FS is not set
+CONFIG_F2FS_FS=m
+CONFIG_F2FS_STAT_FS=y
+CONFIG_F2FS_FS_XATTR=y
+CONFIG_F2FS_FS_POSIX_ACL=y
+# CONFIG_F2FS_FS_SECURITY is not set
+# CONFIG_F2FS_CHECK_FS is not set
+# CONFIG_F2FS_IO_TRACE is not set
+# CONFIG_F2FS_FAULT_INJECTION is not set
+CONFIG_FS_DAX=y
+CONFIG_FS_DAX_PMD=y
+CONFIG_FS_POSIX_ACL=y
+CONFIG_EXPORTFS=y
+# CONFIG_EXPORTFS_BLOCK_OPS is not set
+CONFIG_FILE_LOCKING=y
+CONFIG_MANDATORY_FILE_LOCKING=y
+# CONFIG_FS_ENCRYPTION is not set
+# CONFIG_FS_VERITY is not set
+CONFIG_FSNOTIFY=y
+CONFIG_DNOTIFY=y
+CONFIG_INOTIFY_USER=y
+CONFIG_FANOTIFY=y
+CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
+CONFIG_QUOTA=y
+CONFIG_QUOTA_NETLINK_INTERFACE=y
+CONFIG_PRINT_QUOTA_WARNING=y
+# CONFIG_QUOTA_DEBUG is not set
+CONFIG_QUOTA_TREE=y
+# CONFIG_QFMT_V1 is not set
+CONFIG_QFMT_V2=y
+CONFIG_QUOTACTL=y
+CONFIG_QUOTACTL_COMPAT=y
+CONFIG_AUTOFS4_FS=y
+CONFIG_AUTOFS_FS=y
+CONFIG_FUSE_FS=m
+CONFIG_CUSE=m
+CONFIG_VIRTIO_FS=m
+CONFIG_OVERLAY_FS=m
+# CONFIG_OVERLAY_FS_REDIRECT_DIR is not set
+CONFIG_OVERLAY_FS_REDIRECT_ALWAYS_FOLLOW=y
+# CONFIG_OVERLAY_FS_INDEX is not set
+# CONFIG_OVERLAY_FS_XINO_AUTO is not set
+# CONFIG_OVERLAY_FS_METACOPY is not set
+
+#
+# Caches
+#
+CONFIG_FSCACHE=m
+CONFIG_FSCACHE_STATS=y
+# CONFIG_FSCACHE_HISTOGRAM is not set
+# CONFIG_FSCACHE_DEBUG is not set
+# CONFIG_FSCACHE_OBJECT_LIST is not set
+CONFIG_CACHEFILES=m
+# CONFIG_CACHEFILES_DEBUG is not set
+# CONFIG_CACHEFILES_HISTOGRAM is not set
+# end of Caches
+
+#
+# CD-ROM/DVD Filesystems
+#
+CONFIG_ISO9660_FS=m
+CONFIG_JOLIET=y
+CONFIG_ZISOFS=y
+CONFIG_UDF_FS=m
+# end of CD-ROM/DVD Filesystems
+
+#
+# DOS/FAT/NT Filesystems
+#
+CONFIG_FAT_FS=m
+CONFIG_MSDOS_FS=m
+CONFIG_VFAT_FS=m
+CONFIG_FAT_DEFAULT_CODEPAGE=437
+CONFIG_FAT_DEFAULT_IOCHARSET="ascii"
+# CONFIG_FAT_DEFAULT_UTF8 is not set
+# CONFIG_NTFS_FS is not set
+# end of DOS/FAT/NT Filesystems
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_PROC_VMCORE=y
+# CONFIG_PROC_VMCORE_DEVICE_DUMP is not set
+CONFIG_PROC_SYSCTL=y
+CONFIG_PROC_PAGE_MONITOR=y
+CONFIG_PROC_CHILDREN=y
+CONFIG_PROC_PID_ARCH_STATUS=y
+CONFIG_KERNFS=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_HUGETLBFS=y
+CONFIG_HUGETLB_PAGE=y
+CONFIG_MEMFD_CREATE=y
+CONFIG_ARCH_HAS_GIGANTIC_PAGE=y
+CONFIG_CONFIGFS_FS=y
+CONFIG_EFIVAR_FS=y
+# end of Pseudo filesystems
+
+CONFIG_MISC_FILESYSTEMS=y
+CONFIG_ORANGEFS_FS=m
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+CONFIG_ECRYPT_FS=m
+CONFIG_ECRYPT_FS_MESSAGING=y
+CONFIG_HFS_FS=m
+CONFIG_HFSPLUS_FS=m
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+# CONFIG_JFFS2_FS is not set
+# CONFIG_UBIFS_FS is not set
+CONFIG_CRAMFS=m
+CONFIG_CRAMFS_BLOCKDEV=y
+# CONFIG_CRAMFS_MTD is not set
+CONFIG_SQUASHFS=m
+CONFIG_SQUASHFS_FILE_CACHE=y
+# CONFIG_SQUASHFS_FILE_DIRECT is not set
+CONFIG_SQUASHFS_DECOMP_SINGLE=y
+# CONFIG_SQUASHFS_DECOMP_MULTI is not set
+# CONFIG_SQUASHFS_DECOMP_MULTI_PERCPU is not set
+CONFIG_SQUASHFS_XATTR=y
+CONFIG_SQUASHFS_ZLIB=y
+CONFIG_SQUASHFS_LZ4=y
+CONFIG_SQUASHFS_LZO=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_SQUASHFS_ZSTD=y
+# CONFIG_SQUASHFS_4K_DEVBLK_SIZE is not set
+# CONFIG_SQUASHFS_EMBEDDED is not set
+CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
+CONFIG_VXFS_FS=m
+# CONFIG_MINIX_FS is not set
+# CONFIG_OMFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_QNX6FS_FS is not set
+# CONFIG_ROMFS_FS is not set
+CONFIG_PSTORE=y
+CONFIG_PSTORE_DEFLATE_COMPRESS=m
+# CONFIG_PSTORE_LZO_COMPRESS is not set
+# CONFIG_PSTORE_LZ4_COMPRESS is not set
+# CONFIG_PSTORE_LZ4HC_COMPRESS is not set
+# CONFIG_PSTORE_842_COMPRESS is not set
+# CONFIG_PSTORE_ZSTD_COMPRESS is not set
+CONFIG_PSTORE_COMPRESS=y
+CONFIG_PSTORE_DEFLATE_COMPRESS_DEFAULT=y
+CONFIG_PSTORE_COMPRESS_DEFAULT="deflate"
+# CONFIG_PSTORE_CONSOLE is not set
+# CONFIG_PSTORE_PMSG is not set
+# CONFIG_PSTORE_FTRACE is not set
+CONFIG_PSTORE_RAM=m
+# CONFIG_SYSV_FS is not set
+CONFIG_UFS_FS=m
+# CONFIG_UFS_FS_WRITE is not set
+# CONFIG_UFS_DEBUG is not set
+# CONFIG_EROFS_FS is not set
+CONFIG_NETWORK_FILESYSTEMS=y
+CONFIG_NFS_FS=m
+# CONFIG_NFS_V2 is not set
+CONFIG_NFS_V3=m
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=m
+# CONFIG_NFS_SWAP is not set
+CONFIG_NFS_V4_1=y
+CONFIG_NFS_V4_2=y
+CONFIG_PNFS_FILE_LAYOUT=m
+CONFIG_PNFS_BLOCK=m
+CONFIG_PNFS_FLEXFILE_LAYOUT=m
+CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
+# CONFIG_NFS_V4_1_MIGRATION is not set
+CONFIG_NFS_V4_SECURITY_LABEL=y
+CONFIG_NFS_FSCACHE=y
+# CONFIG_NFS_USE_LEGACY_DNS is not set
+CONFIG_NFS_USE_KERNEL_DNS=y
+CONFIG_NFS_DEBUG=y
+CONFIG_NFSD=m
+CONFIG_NFSD_V2_ACL=y
+CONFIG_NFSD_V3=y
+CONFIG_NFSD_V3_ACL=y
+CONFIG_NFSD_V4=y
+# CONFIG_NFSD_BLOCKLAYOUT is not set
+# CONFIG_NFSD_SCSILAYOUT is not set
+# CONFIG_NFSD_FLEXFILELAYOUT is not set
+CONFIG_NFSD_V4_SECURITY_LABEL=y
+CONFIG_GRACE_PERIOD=m
+CONFIG_LOCKD=m
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_ACL_SUPPORT=m
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=m
+CONFIG_SUNRPC_GSS=m
+CONFIG_SUNRPC_BACKCHANNEL=y
+CONFIG_RPCSEC_GSS_KRB5=m
+# CONFIG_SUNRPC_DISABLE_INSECURE_ENCTYPES is not set
+CONFIG_SUNRPC_DEBUG=y
+CONFIG_SUNRPC_XPRT_RDMA=m
+CONFIG_CEPH_FS=m
+CONFIG_CEPH_FSCACHE=y
+CONFIG_CEPH_FS_POSIX_ACL=y
+# CONFIG_CEPH_FS_SECURITY_LABEL is not set
+CONFIG_CIFS=m
+# CONFIG_CIFS_STATS2 is not set
+CONFIG_CIFS_ALLOW_INSECURE_LEGACY=y
+CONFIG_CIFS_WEAK_PW_HASH=y
+CONFIG_CIFS_UPCALL=y
+CONFIG_CIFS_XATTR=y
+CONFIG_CIFS_POSIX=y
+CONFIG_CIFS_DEBUG=y
+# CONFIG_CIFS_DEBUG2 is not set
+# CONFIG_CIFS_DEBUG_DUMP_KEYS is not set
+CONFIG_CIFS_DFS_UPCALL=y
+# CONFIG_CIFS_SMB_DIRECT is not set
+# CONFIG_CIFS_FSCACHE is not set
+# CONFIG_CODA_FS is not set
+CONFIG_AFS_FS=m
+CONFIG_AFS_DEBUG=y
+CONFIG_AFS_FSCACHE=y
+CONFIG_AFS_DEBUG_CURSOR=y
+CONFIG_9P_FS=m
+CONFIG_9P_FSCACHE=y
+CONFIG_9P_FS_POSIX_ACL=y
+# CONFIG_9P_FS_SECURITY is not set
+CONFIG_NLS=y
+CONFIG_NLS_DEFAULT="utf8"
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_CODEPAGE_737=m
+CONFIG_NLS_CODEPAGE_775=m
+CONFIG_NLS_CODEPAGE_850=m
+CONFIG_NLS_CODEPAGE_852=m
+CONFIG_NLS_CODEPAGE_855=m
+CONFIG_NLS_CODEPAGE_857=m
+CONFIG_NLS_CODEPAGE_860=m
+CONFIG_NLS_CODEPAGE_861=m
+CONFIG_NLS_CODEPAGE_862=m
+CONFIG_NLS_CODEPAGE_863=m
+CONFIG_NLS_CODEPAGE_864=m
+CONFIG_NLS_CODEPAGE_865=m
+CONFIG_NLS_CODEPAGE_866=m
+CONFIG_NLS_CODEPAGE_869=m
+CONFIG_NLS_CODEPAGE_936=m
+CONFIG_NLS_CODEPAGE_950=m
+CONFIG_NLS_CODEPAGE_932=m
+CONFIG_NLS_CODEPAGE_949=m
+CONFIG_NLS_CODEPAGE_874=m
+CONFIG_NLS_ISO8859_8=m
+CONFIG_NLS_CODEPAGE_1250=m
+CONFIG_NLS_CODEPAGE_1251=m
+CONFIG_NLS_ASCII=y
+CONFIG_NLS_ISO8859_1=m
+CONFIG_NLS_ISO8859_2=m
+CONFIG_NLS_ISO8859_3=m
+CONFIG_NLS_ISO8859_4=m
+CONFIG_NLS_ISO8859_5=m
+CONFIG_NLS_ISO8859_6=m
+CONFIG_NLS_ISO8859_7=m
+CONFIG_NLS_ISO8859_9=m
+CONFIG_NLS_ISO8859_13=m
+CONFIG_NLS_ISO8859_14=m
+CONFIG_NLS_ISO8859_15=m
+CONFIG_NLS_KOI8_R=m
+CONFIG_NLS_KOI8_U=m
+CONFIG_NLS_MAC_ROMAN=m
+CONFIG_NLS_MAC_CELTIC=m
+CONFIG_NLS_MAC_CENTEURO=m
+CONFIG_NLS_MAC_CROATIAN=m
+CONFIG_NLS_MAC_CYRILLIC=m
+CONFIG_NLS_MAC_GAELIC=m
+CONFIG_NLS_MAC_GREEK=m
+CONFIG_NLS_MAC_ICELAND=m
+CONFIG_NLS_MAC_INUIT=m
+CONFIG_NLS_MAC_ROMANIAN=m
+CONFIG_NLS_MAC_TURKISH=m
+CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
+CONFIG_DLM_DEBUG=y
+# CONFIG_UNICODE is not set
+# end of File systems
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_COMPAT=y
+CONFIG_KEYS_REQUEST_CACHE=y
+CONFIG_PERSISTENT_KEYRINGS=y
+CONFIG_BIG_KEYS=y
+CONFIG_TRUSTED_KEYS=y
+CONFIG_ENCRYPTED_KEYS=y
+# CONFIG_KEY_DH_OPERATIONS is not set
+# CONFIG_SECURITY_DMESG_RESTRICT is not set
+CONFIG_SECURITY=y
+CONFIG_SECURITY_WRITABLE_HOOKS=y
+CONFIG_SECURITYFS=y
+CONFIG_SECURITY_NETWORK=y
+CONFIG_PAGE_TABLE_ISOLATION=y
+# CONFIG_SECURITY_INFINIBAND is not set
+CONFIG_SECURITY_NETWORK_XFRM=y
+CONFIG_SECURITY_PATH=y
+CONFIG_INTEL_TXT=y
+CONFIG_LSM_MMAP_MIN_ADDR=65535
+CONFIG_HAVE_HARDENED_USERCOPY_ALLOCATOR=y
+CONFIG_HARDENED_USERCOPY=y
+CONFIG_HARDENED_USERCOPY_FALLBACK=y
+# CONFIG_HARDENED_USERCOPY_PAGESPAN is not set
+# CONFIG_FORTIFY_SOURCE is not set
+# CONFIG_STATIC_USERMODEHELPER is not set
+CONFIG_SECURITY_SELINUX=y
+CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+CONFIG_SECURITY_SELINUX_DISABLE=y
+CONFIG_SECURITY_SELINUX_DEVELOP=y
+CONFIG_SECURITY_SELINUX_AVC_STATS=y
+CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1
+# CONFIG_SECURITY_SMACK is not set
+# CONFIG_SECURITY_TOMOYO is not set
+# CONFIG_SECURITY_APPARMOR is not set
+# CONFIG_SECURITY_LOADPIN is not set
+# CONFIG_SECURITY_YAMA is not set
+# CONFIG_SECURITY_SAFESETID is not set
+# CONFIG_SECURITY_LOCKDOWN_LSM is not set
+CONFIG_INTEGRITY=y
+CONFIG_INTEGRITY_SIGNATURE=y
+CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y
+CONFIG_INTEGRITY_TRUSTED_KEYRING=y
+CONFIG_INTEGRITY_AUDIT=y
+CONFIG_IMA=y
+CONFIG_IMA_MEASURE_PCR_IDX=10
+CONFIG_IMA_LSM_RULES=y
+# CONFIG_IMA_TEMPLATE is not set
+CONFIG_IMA_NG_TEMPLATE=y
+# CONFIG_IMA_SIG_TEMPLATE is not set
+CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng"
+CONFIG_IMA_DEFAULT_HASH_SHA1=y
+# CONFIG_IMA_DEFAULT_HASH_SHA256 is not set
+CONFIG_IMA_DEFAULT_HASH="sha1"
+# CONFIG_IMA_WRITE_POLICY is not set
+# CONFIG_IMA_READ_POLICY is not set
+CONFIG_IMA_APPRAISE=y
+# CONFIG_IMA_ARCH_POLICY is not set
+# CONFIG_IMA_APPRAISE_BUILD_POLICY is not set
+CONFIG_IMA_APPRAISE_BOOTPARAM=y
+# CONFIG_IMA_APPRAISE_MODSIG is not set
+CONFIG_IMA_TRUSTED_KEYRING=y
+# CONFIG_IMA_BLACKLIST_KEYRING is not set
+# CONFIG_IMA_LOAD_X509 is not set
+CONFIG_EVM=y
+CONFIG_EVM_ATTR_FSUUID=y
+# CONFIG_EVM_ADD_XATTRS is not set
+# CONFIG_EVM_LOAD_X509 is not set
+CONFIG_DEFAULT_SECURITY_SELINUX=y
+# CONFIG_DEFAULT_SECURITY_DAC is not set
+CONFIG_LSM="yama,loadpin,safesetid,integrity,selinux,smack,tomoyo,apparmor"
+
+#
+# Kernel hardening options
+#
+
+#
+# Memory initialization
+#
+CONFIG_INIT_STACK_NONE=y
+# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
+# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
+# end of Memory initialization
+# end of Kernel hardening options
+# end of Security options
+
+CONFIG_XOR_BLOCKS=m
+CONFIG_ASYNC_CORE=m
+CONFIG_ASYNC_MEMCPY=m
+CONFIG_ASYNC_XOR=m
+CONFIG_ASYNC_PQ=m
+CONFIG_ASYNC_RAID6_RECOV=m
+CONFIG_CRYPTO=y
+
+#
+# Crypto core or helper
+#
+CONFIG_CRYPTO_ALGAPI=y
+CONFIG_CRYPTO_ALGAPI2=y
+CONFIG_CRYPTO_AEAD=y
+CONFIG_CRYPTO_AEAD2=y
+CONFIG_CRYPTO_BLKCIPHER=y
+CONFIG_CRYPTO_BLKCIPHER2=y
+CONFIG_CRYPTO_HASH=y
+CONFIG_CRYPTO_HASH2=y
+CONFIG_CRYPTO_RNG=y
+CONFIG_CRYPTO_RNG2=y
+CONFIG_CRYPTO_RNG_DEFAULT=y
+CONFIG_CRYPTO_AKCIPHER2=y
+CONFIG_CRYPTO_AKCIPHER=y
+CONFIG_CRYPTO_KPP2=y
+CONFIG_CRYPTO_KPP=m
+CONFIG_CRYPTO_ACOMP2=y
+CONFIG_CRYPTO_MANAGER=y
+CONFIG_CRYPTO_MANAGER2=y
+CONFIG_CRYPTO_USER=m
+# CONFIG_CRYPTO_MANAGER_DISABLE_TESTS is not set
+# CONFIG_CRYPTO_MANAGER_EXTRA_TESTS is not set
+CONFIG_CRYPTO_GF128MUL=y
+CONFIG_CRYPTO_NULL=y
+CONFIG_CRYPTO_NULL2=y
+CONFIG_CRYPTO_PCRYPT=m
+CONFIG_CRYPTO_CRYPTD=m
+CONFIG_CRYPTO_AUTHENC=m
+CONFIG_CRYPTO_TEST=m
+CONFIG_CRYPTO_SIMD=m
+CONFIG_CRYPTO_GLUE_HELPER_X86=m
+CONFIG_CRYPTO_ENGINE=m
+
+#
+# Public-key cryptography
+#
+CONFIG_CRYPTO_RSA=y
+CONFIG_CRYPTO_DH=m
+CONFIG_CRYPTO_ECC=m
+CONFIG_CRYPTO_ECDH=m
+CONFIG_CRYPTO_ECRDSA=m
+
+#
+# Authenticated Encryption with Associated Data
+#
+CONFIG_CRYPTO_CCM=m
+CONFIG_CRYPTO_GCM=y
+CONFIG_CRYPTO_CHACHA20POLY1305=m
+CONFIG_CRYPTO_AEGIS128=m
+CONFIG_CRYPTO_AEGIS128_AESNI_SSE2=m
+CONFIG_CRYPTO_SEQIV=y
+CONFIG_CRYPTO_ECHAINIV=m
+
+#
+# Block modes
+#
+CONFIG_CRYPTO_CBC=y
+CONFIG_CRYPTO_CFB=m
+CONFIG_CRYPTO_CTR=y
+CONFIG_CRYPTO_CTS=m
+CONFIG_CRYPTO_ECB=y
+CONFIG_CRYPTO_LRW=m
+CONFIG_CRYPTO_OFB=m
+CONFIG_CRYPTO_PCBC=m
+CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_KEYWRAP=m
+CONFIG_CRYPTO_NHPOLY1305=m
+CONFIG_CRYPTO_NHPOLY1305_SSE2=m
+CONFIG_CRYPTO_NHPOLY1305_AVX2=m
+CONFIG_CRYPTO_ADIANTUM=m
+CONFIG_CRYPTO_ESSIV=m
+
+#
+# Hash modes
+#
+CONFIG_CRYPTO_CMAC=m
+CONFIG_CRYPTO_HMAC=y
+CONFIG_CRYPTO_XCBC=m
+CONFIG_CRYPTO_VMAC=m
+
+#
+# Digest
+#
+CONFIG_CRYPTO_CRC32C=y
+CONFIG_CRYPTO_CRC32C_INTEL=m
+CONFIG_CRYPTO_CRC32=m
+CONFIG_CRYPTO_CRC32_PCLMUL=m
+CONFIG_CRYPTO_XXHASH=m
+CONFIG_CRYPTO_CRCT10DIF=y
+CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m
+CONFIG_CRYPTO_GHASH=y
+CONFIG_CRYPTO_POLY1305=m
+CONFIG_CRYPTO_POLY1305_X86_64=m
+CONFIG_CRYPTO_MD4=m
+CONFIG_CRYPTO_MD5=y
+CONFIG_CRYPTO_MICHAEL_MIC=m
+CONFIG_CRYPTO_RMD128=m
+CONFIG_CRYPTO_RMD160=m
+CONFIG_CRYPTO_RMD256=m
+CONFIG_CRYPTO_RMD320=m
+CONFIG_CRYPTO_SHA1=y
+CONFIG_CRYPTO_SHA1_SSSE3=m
+CONFIG_CRYPTO_SHA256_SSSE3=m
+CONFIG_CRYPTO_SHA512_SSSE3=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_SHA256=y
+CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SHA3=m
+CONFIG_CRYPTO_SM3=m
+CONFIG_CRYPTO_STREEBOG=m
+CONFIG_CRYPTO_TGR192=m
+CONFIG_CRYPTO_WP512=m
+CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL=m
+
+#
+# Ciphers
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_AES=y
+CONFIG_CRYPTO_AES_TI=m
+CONFIG_CRYPTO_AES_NI_INTEL=m
+CONFIG_CRYPTO_ANUBIS=m
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARC4=m
+CONFIG_CRYPTO_BLOWFISH=m
+CONFIG_CRYPTO_BLOWFISH_COMMON=m
+CONFIG_CRYPTO_BLOWFISH_X86_64=m
+CONFIG_CRYPTO_CAMELLIA=m
+CONFIG_CRYPTO_CAMELLIA_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX_X86_64=m
+CONFIG_CRYPTO_CAMELLIA_AESNI_AVX2_X86_64=m
+CONFIG_CRYPTO_CAST_COMMON=m
+CONFIG_CRYPTO_CAST5=m
+CONFIG_CRYPTO_CAST5_AVX_X86_64=m
+CONFIG_CRYPTO_CAST6=m
+CONFIG_CRYPTO_CAST6_AVX_X86_64=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_DES=m
+CONFIG_CRYPTO_DES3_EDE_X86_64=m
+CONFIG_CRYPTO_FCRYPT=m
+CONFIG_CRYPTO_KHAZAD=m
+CONFIG_CRYPTO_SALSA20=m
+CONFIG_CRYPTO_CHACHA20=m
+CONFIG_CRYPTO_CHACHA20_X86_64=m
+CONFIG_CRYPTO_SEED=m
+CONFIG_CRYPTO_SERPENT=m
+CONFIG_CRYPTO_SERPENT_SSE2_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX_X86_64=m
+CONFIG_CRYPTO_SERPENT_AVX2_X86_64=m
+CONFIG_CRYPTO_SM4=m
+CONFIG_CRYPTO_TEA=m
+CONFIG_CRYPTO_TWOFISH=m
+CONFIG_CRYPTO_TWOFISH_COMMON=m
+CONFIG_CRYPTO_TWOFISH_X86_64=m
+CONFIG_CRYPTO_TWOFISH_X86_64_3WAY=m
+CONFIG_CRYPTO_TWOFISH_AVX_X86_64=m
+
+#
+# Compression
+#
+CONFIG_CRYPTO_DEFLATE=m
+CONFIG_CRYPTO_LZO=y
+CONFIG_CRYPTO_842=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
+CONFIG_CRYPTO_ZSTD=m
+
+#
+# Random Number Generation
+#
+CONFIG_CRYPTO_ANSI_CPRNG=m
+CONFIG_CRYPTO_DRBG_MENU=y
+CONFIG_CRYPTO_DRBG_HMAC=y
+CONFIG_CRYPTO_DRBG_HASH=y
+CONFIG_CRYPTO_DRBG_CTR=y
+CONFIG_CRYPTO_DRBG=y
+CONFIG_CRYPTO_JITTERENTROPY=y
+CONFIG_CRYPTO_USER_API=y
+CONFIG_CRYPTO_USER_API_HASH=y
+CONFIG_CRYPTO_USER_API_SKCIPHER=y
+CONFIG_CRYPTO_USER_API_RNG=m
+CONFIG_CRYPTO_USER_API_AEAD=m
+# CONFIG_CRYPTO_STATS is not set
+CONFIG_CRYPTO_HASH_INFO=y
+CONFIG_CRYPTO_HW=y
+CONFIG_CRYPTO_DEV_PADLOCK=m
+CONFIG_CRYPTO_DEV_PADLOCK_AES=m
+CONFIG_CRYPTO_DEV_PADLOCK_SHA=m
+CONFIG_CRYPTO_DEV_ATMEL_I2C=m
+CONFIG_CRYPTO_DEV_ATMEL_ECC=m
+CONFIG_CRYPTO_DEV_ATMEL_SHA204A=m
+CONFIG_CRYPTO_DEV_CCP=y
+CONFIG_CRYPTO_DEV_CCP_DD=m
+CONFIG_CRYPTO_DEV_SP_CCP=y
+CONFIG_CRYPTO_DEV_CCP_CRYPTO=m
+CONFIG_CRYPTO_DEV_SP_PSP=y
+# CONFIG_CRYPTO_DEV_CCP_DEBUGFS is not set
+CONFIG_CRYPTO_DEV_QAT=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCC=m
+CONFIG_CRYPTO_DEV_QAT_C3XXX=m
+CONFIG_CRYPTO_DEV_QAT_C62X=m
+CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m
+CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m
+CONFIG_CRYPTO_DEV_QAT_C62XVF=m
+CONFIG_CRYPTO_DEV_NITROX=m
+CONFIG_CRYPTO_DEV_NITROX_CNN55XX=m
+CONFIG_CRYPTO_DEV_CHELSIO=m
+# CONFIG_CHELSIO_IPSEC_INLINE is not set
+CONFIG_CRYPTO_DEV_CHELSIO_TLS=m
+CONFIG_CRYPTO_DEV_VIRTIO=m
+CONFIG_CRYPTO_DEV_SAFEXCEL=m
+CONFIG_ASYMMETRIC_KEY_TYPE=y
+CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
+CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
+CONFIG_X509_CERTIFICATE_PARSER=y
+CONFIG_PKCS8_PRIVATE_KEY_PARSER=m
+CONFIG_TPM_KEY_PARSER=m
+CONFIG_PKCS7_MESSAGE_PARSER=y
+# CONFIG_PKCS7_TEST_KEY is not set
+# CONFIG_SIGNED_PE_FILE_VERIFICATION is not set
+
+#
+# Certificates for signature checking
+#
+CONFIG_SYSTEM_TRUSTED_KEYRING=y
+CONFIG_SYSTEM_TRUSTED_KEYS=""
+# CONFIG_SYSTEM_EXTRA_CERTIFICATE is not set
+# CONFIG_SECONDARY_TRUSTED_KEYRING is not set
+# CONFIG_SYSTEM_BLACKLIST_KEYRING is not set
+# end of Certificates for signature checking
+
+CONFIG_BINARY_PRINTF=y
+
+#
+# Library routines
+#
+CONFIG_RAID6_PQ=m
+# CONFIG_RAID6_PQ_BENCHMARK is not set
+# CONFIG_PACKING is not set
+CONFIG_BITREVERSE=y
+CONFIG_GENERIC_STRNCPY_FROM_USER=y
+CONFIG_GENERIC_STRNLEN_USER=y
+CONFIG_GENERIC_NET_UTILS=y
+CONFIG_GENERIC_FIND_FIRST_BIT=y
+CONFIG_CORDIC=m
+CONFIG_RATIONAL=y
+CONFIG_GENERIC_PCI_IOMAP=y
+CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
+CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
+CONFIG_CRC_CCITT=y
+CONFIG_CRC16=y
+CONFIG_CRC_T10DIF=y
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32=y
+# CONFIG_CRC32_SELFTEST is not set
+CONFIG_CRC32_SLICEBY8=y
+# CONFIG_CRC32_SLICEBY4 is not set
+# CONFIG_CRC32_SARWATE is not set
+# CONFIG_CRC32_BIT is not set
+CONFIG_CRC64=m
+CONFIG_CRC4=m
+CONFIG_CRC7=m
+CONFIG_LIBCRC32C=m
+CONFIG_CRC8=m
+CONFIG_XXHASH=y
+# CONFIG_RANDOM32_SELFTEST is not set
+CONFIG_842_COMPRESS=m
+CONFIG_842_DECOMPRESS=m
+CONFIG_ZLIB_INFLATE=y
+CONFIG_ZLIB_DEFLATE=y
+CONFIG_LZO_COMPRESS=y
+CONFIG_LZO_DECOMPRESS=y
+CONFIG_LZ4_COMPRESS=m
+CONFIG_LZ4HC_COMPRESS=m
+CONFIG_LZ4_DECOMPRESS=y
+CONFIG_ZSTD_COMPRESS=m
+CONFIG_ZSTD_DECOMPRESS=m
+CONFIG_XZ_DEC=y
+CONFIG_XZ_DEC_X86=y
+CONFIG_XZ_DEC_POWERPC=y
+CONFIG_XZ_DEC_IA64=y
+CONFIG_XZ_DEC_ARM=y
+CONFIG_XZ_DEC_ARMTHUMB=y
+CONFIG_XZ_DEC_SPARC=y
+CONFIG_XZ_DEC_BCJ=y
+# CONFIG_XZ_DEC_TEST is not set
+CONFIG_DECOMPRESS_GZIP=y
+CONFIG_DECOMPRESS_BZIP2=y
+CONFIG_DECOMPRESS_LZMA=y
+CONFIG_DECOMPRESS_XZ=y
+CONFIG_DECOMPRESS_LZO=y
+CONFIG_DECOMPRESS_LZ4=y
+CONFIG_GENERIC_ALLOCATOR=y
+CONFIG_REED_SOLOMON=m
+CONFIG_REED_SOLOMON_ENC8=y
+CONFIG_REED_SOLOMON_DEC8=y
+CONFIG_TEXTSEARCH=y
+CONFIG_TEXTSEARCH_KMP=m
+CONFIG_TEXTSEARCH_BM=m
+CONFIG_TEXTSEARCH_FSM=m
+CONFIG_BTREE=y
+CONFIG_INTERVAL_TREE=y
+CONFIG_XARRAY_MULTI=y
+CONFIG_ASSOCIATIVE_ARRAY=y
+CONFIG_HAS_IOMEM=y
+CONFIG_HAS_IOPORT_MAP=y
+CONFIG_HAS_DMA=y
+CONFIG_NEED_SG_DMA_LENGTH=y
+CONFIG_NEED_DMA_MAP_STATE=y
+CONFIG_ARCH_DMA_ADDR_T_64BIT=y
+CONFIG_DMA_VIRT_OPS=y
+CONFIG_SWIOTLB=y
+# CONFIG_DMA_API_DEBUG is not set
+CONFIG_SGL_ALLOC=y
+CONFIG_IOMMU_HELPER=y
+CONFIG_CHECK_SIGNATURE=y
+CONFIG_CPUMASK_OFFSTACK=y
+CONFIG_CPU_RMAP=y
+CONFIG_DQL=y
+CONFIG_GLOB=y
+# CONFIG_GLOB_SELFTEST is not set
+CONFIG_NLATTR=y
+CONFIG_LRU_CACHE=m
+CONFIG_CLZ_TAB=y
+CONFIG_IRQ_POLL=y
+CONFIG_MPILIB=y
+CONFIG_SIGNATURE=y
+CONFIG_DIMLIB=y
+CONFIG_OID_REGISTRY=y
+CONFIG_UCS2_STRING=y
+CONFIG_HAVE_GENERIC_VDSO=y
+CONFIG_GENERIC_GETTIMEOFDAY=y
+CONFIG_FONT_SUPPORT=y
+# CONFIG_FONTS is not set
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
+CONFIG_SG_POOL=y
+CONFIG_ARCH_HAS_PMEM_API=y
+CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE=y
+CONFIG_ARCH_HAS_UACCESS_MCSAFE=y
+CONFIG_ARCH_STACKWALK=y
+CONFIG_SBITMAP=y
+# CONFIG_STRING_SELFTEST is not set
+# end of Library routines
+
+#
+# Kernel hacking
+#
+
+#
+# printk and dmesg options
+#
+CONFIG_PRINTK_TIME=y
+# CONFIG_PRINTK_CALLER is not set
+CONFIG_CONSOLE_LOGLEVEL_DEFAULT=7
+CONFIG_CONSOLE_LOGLEVEL_QUIET=4
+CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
+CONFIG_BOOT_PRINTK_DELAY=y
+CONFIG_DYNAMIC_DEBUG=y
+# end of printk and dmesg options
+
+#
+# Compile-time checks and compiler options
+#
+CONFIG_DEBUG_INFO=y
+# CONFIG_DEBUG_INFO_REDUCED is not set
+# CONFIG_DEBUG_INFO_SPLIT is not set
+# CONFIG_DEBUG_INFO_DWARF4 is not set
+# CONFIG_DEBUG_INFO_BTF is not set
+# CONFIG_GDB_SCRIPTS is not set
+CONFIG_ENABLE_MUST_CHECK=y
+CONFIG_FRAME_WARN=2048
+CONFIG_STRIP_ASM_SYMS=y
+# CONFIG_READABLE_ASM is not set
+CONFIG_DEBUG_FS=y
+# CONFIG_HEADERS_INSTALL is not set
+CONFIG_OPTIMIZE_INLINING=y
+CONFIG_DEBUG_SECTION_MISMATCH=y
+CONFIG_SECTION_MISMATCH_WARN_ONLY=y
+CONFIG_FRAME_POINTER=y
+CONFIG_STACK_VALIDATION=y
+# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set
+# end of Compile-time checks and compiler options
+
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_MAGIC_SYSRQ_DEFAULT_ENABLE=0x1
+CONFIG_MAGIC_SYSRQ_SERIAL=y
+CONFIG_DEBUG_KERNEL=y
+CONFIG_DEBUG_MISC=y
+
+#
+# Memory Debugging
+#
+# CONFIG_PAGE_EXTENSION is not set
+# CONFIG_DEBUG_PAGEALLOC is not set
+# CONFIG_PAGE_OWNER is not set
+# CONFIG_PAGE_POISONING is not set
+# CONFIG_DEBUG_PAGE_REF is not set
+# CONFIG_DEBUG_RODATA_TEST is not set
+# CONFIG_DEBUG_OBJECTS is not set
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
+CONFIG_HAVE_DEBUG_KMEMLEAK=y
+# CONFIG_DEBUG_KMEMLEAK is not set
+# CONFIG_DEBUG_STACK_USAGE is not set
+# CONFIG_DEBUG_VM is not set
+CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y
+# CONFIG_DEBUG_VIRTUAL is not set
+CONFIG_DEBUG_MEMORY_INIT=y
+# CONFIG_DEBUG_PER_CPU_MAPS is not set
+CONFIG_HAVE_ARCH_KASAN=y
+CONFIG_KASAN_STACK=1
+# end of Memory Debugging
+
+CONFIG_ARCH_HAS_KCOV=y
+CONFIG_DEBUG_SHIRQ=y
+
+#
+# Debug Lockups and Hangs
+#
+CONFIG_LOCKUP_DETECTOR=y
+CONFIG_SOFTLOCKUP_DETECTOR=y
+# CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC is not set
+CONFIG_BOOTPARAM_SOFTLOCKUP_PANIC_VALUE=0
+CONFIG_HARDLOCKUP_DETECTOR_PERF=y
+CONFIG_HARDLOCKUP_CHECK_TIMESTAMP=y
+CONFIG_HARDLOCKUP_DETECTOR=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC=y
+CONFIG_BOOTPARAM_HARDLOCKUP_PANIC_VALUE=1
+CONFIG_DETECT_HUNG_TASK=y
+CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=120
+# CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
+CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
+# CONFIG_WQ_WATCHDOG is not set
+# end of Debug Lockups and Hangs
+
+CONFIG_PANIC_ON_OOPS=y
+CONFIG_PANIC_ON_OOPS_VALUE=1
+CONFIG_PANIC_TIMEOUT=0
+CONFIG_SCHED_DEBUG=y
+CONFIG_SCHED_INFO=y
+CONFIG_SCHEDSTATS=y
+# CONFIG_SCHED_STACK_END_CHECK is not set
+# CONFIG_DEBUG_TIMEKEEPING is not set
+
+#
+# Lock Debugging (spinlocks, mutexes, etc...)
+#
+CONFIG_LOCK_DEBUGGING_SUPPORT=y
+# CONFIG_PROVE_LOCKING is not set
+# CONFIG_LOCK_STAT is not set
+# CONFIG_DEBUG_RT_MUTEXES is not set
+# CONFIG_DEBUG_SPINLOCK is not set
+# CONFIG_DEBUG_MUTEXES is not set
+# CONFIG_DEBUG_WW_MUTEX_SLOWPATH is not set
+# CONFIG_DEBUG_RWSEMS is not set
+# CONFIG_DEBUG_LOCK_ALLOC is not set
+# CONFIG_DEBUG_ATOMIC_SLEEP is not set
+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set
+# CONFIG_LOCK_TORTURE_TEST is not set
+# CONFIG_WW_MUTEX_SELFTEST is not set
+# end of Lock Debugging (spinlocks, mutexes, etc...)
+
+CONFIG_STACKTRACE=y
+# CONFIG_WARN_ALL_UNSEEDED_RANDOM is not set
+# CONFIG_DEBUG_KOBJECT is not set
+CONFIG_DEBUG_BUGVERBOSE=y
+CONFIG_DEBUG_LIST=y
+# CONFIG_DEBUG_PLIST is not set
+# CONFIG_DEBUG_SG is not set
+# CONFIG_DEBUG_NOTIFIERS is not set
+# CONFIG_DEBUG_CREDENTIALS is not set
+
+#
+# RCU Debugging
+#
+# CONFIG_RCU_PERF_TEST is not set
+# CONFIG_RCU_TORTURE_TEST is not set
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
+# CONFIG_RCU_TRACE is not set
+# CONFIG_RCU_EQS_DEBUG is not set
+# end of RCU Debugging
+
+# CONFIG_DEBUG_WQ_FORCE_RR_CPU is not set
+# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set
+# CONFIG_CPU_HOTPLUG_STATE_CONTROL is not set
+# CONFIG_NOTIFIER_ERROR_INJECTION is not set
+CONFIG_FUNCTION_ERROR_INJECTION=y
+# CONFIG_FAULT_INJECTION is not set
+# CONFIG_LATENCYTOP is not set
+CONFIG_USER_STACKTRACE_SUPPORT=y
+CONFIG_NOP_TRACER=y
+CONFIG_HAVE_FUNCTION_TRACER=y
+CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y
+CONFIG_HAVE_DYNAMIC_FTRACE=y
+CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y
+CONFIG_HAVE_SYSCALL_TRACEPOINTS=y
+CONFIG_HAVE_FENTRY=y
+CONFIG_HAVE_C_RECORDMCOUNT=y
+CONFIG_TRACER_MAX_TRACE=y
+CONFIG_TRACE_CLOCK=y
+CONFIG_RING_BUFFER=y
+CONFIG_EVENT_TRACING=y
+CONFIG_CONTEXT_SWITCH_TRACER=y
+CONFIG_RING_BUFFER_ALLOW_SWAP=y
+CONFIG_TRACING=y
+CONFIG_GENERIC_TRACER=y
+CONFIG_TRACING_SUPPORT=y
+CONFIG_FTRACE=y
+CONFIG_FUNCTION_TRACER=y
+CONFIG_FUNCTION_GRAPH_TRACER=y
+# CONFIG_PREEMPTIRQ_EVENTS is not set
+# CONFIG_IRQSOFF_TRACER is not set
+CONFIG_SCHED_TRACER=y
+# CONFIG_HWLAT_TRACER is not set
+CONFIG_FTRACE_SYSCALLS=y
+CONFIG_TRACER_SNAPSHOT=y
+# CONFIG_TRACER_SNAPSHOT_PER_CPU_SWAP is not set
+CONFIG_BRANCH_PROFILE_NONE=y
+# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set
+# CONFIG_PROFILE_ALL_BRANCHES is not set
+CONFIG_STACK_TRACER=y
+CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBE_EVENTS=y
+# CONFIG_KPROBE_EVENTS_ON_NOTRACE is not set
+CONFIG_UPROBE_EVENTS=y
+CONFIG_BPF_EVENTS=y
+CONFIG_DYNAMIC_EVENTS=y
+CONFIG_PROBE_EVENTS=y
+CONFIG_DYNAMIC_FTRACE=y
+CONFIG_DYNAMIC_FTRACE_WITH_REGS=y
+CONFIG_FUNCTION_PROFILER=y
+# CONFIG_BPF_KPROBE_OVERRIDE is not set
+CONFIG_FTRACE_MCOUNT_RECORD=y
+# CONFIG_FTRACE_STARTUP_TEST is not set
+# CONFIG_MMIOTRACE is not set
+# CONFIG_HIST_TRIGGERS is not set
+# CONFIG_TRACEPOINT_BENCHMARK is not set
+CONFIG_RING_BUFFER_BENCHMARK=m
+# CONFIG_RING_BUFFER_STARTUP_TEST is not set
+# CONFIG_PREEMPTIRQ_DELAY_TEST is not set
+# CONFIG_TRACE_EVAL_MAP_FILE is not set
+CONFIG_PROVIDE_OHCI1394_DMA_INIT=y
+# CONFIG_RUNTIME_TESTING_MENU is not set
+# CONFIG_MEMTEST is not set
+# CONFIG_BUG_ON_DATA_CORRUPTION is not set
+# CONFIG_SAMPLES is not set
+CONFIG_HAVE_ARCH_KGDB=y
+CONFIG_KGDB=y
+CONFIG_KGDB_SERIAL_CONSOLE=y
+CONFIG_KGDB_TESTS=y
+# CONFIG_KGDB_TESTS_ON_BOOT is not set
+CONFIG_KGDB_LOW_LEVEL_TRAP=y
+CONFIG_KGDB_KDB=y
+CONFIG_KDB_DEFAULT_ENABLE=0x1
+CONFIG_KDB_KEYBOARD=y
+CONFIG_KDB_CONTINUE_CATASTROPHIC=0
+CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
+# CONFIG_UBSAN is not set
+CONFIG_UBSAN_ALIGNMENT=y
+CONFIG_ARCH_HAS_DEVMEM_IS_ALLOWED=y
+CONFIG_STRICT_DEVMEM=y
+# CONFIG_IO_STRICT_DEVMEM is not set
+CONFIG_TRACE_IRQFLAGS_SUPPORT=y
+CONFIG_EARLY_PRINTK_USB=y
+# CONFIG_X86_VERBOSE_BOOTUP is not set
+CONFIG_EARLY_PRINTK=y
+CONFIG_EARLY_PRINTK_DBGP=y
+# CONFIG_EARLY_PRINTK_USB_XDBC is not set
+# CONFIG_X86_PTDUMP is not set
+# CONFIG_EFI_PGT_DUMP is not set
+# CONFIG_DEBUG_WX is not set
+CONFIG_DOUBLEFAULT=y
+# CONFIG_DEBUG_TLBFLUSH is not set
+# CONFIG_IOMMU_DEBUG is not set
+CONFIG_HAVE_MMIOTRACE_SUPPORT=y
+CONFIG_X86_DECODER_SELFTEST=y
+CONFIG_IO_DELAY_0X80=y
+# CONFIG_IO_DELAY_0XED is not set
+# CONFIG_IO_DELAY_UDELAY is not set
+# CONFIG_IO_DELAY_NONE is not set
+CONFIG_DEBUG_BOOT_PARAMS=y
+# CONFIG_CPA_DEBUG is not set
+# CONFIG_DEBUG_ENTRY is not set
+# CONFIG_DEBUG_NMI_SELFTEST is not set
+# CONFIG_X86_DEBUG_FPU is not set
+# CONFIG_PUNIT_ATOM_DEBUG is not set
+# CONFIG_UNWINDER_ORC is not set
+CONFIG_UNWINDER_FRAME_POINTER=y
+# CONFIG_UNWINDER_GUESS is not set
+# end of Kernel hacking
diff --git a/lt-qcom-linux/aosp_publishers.sh b/lt-qcom-linux/aosp_publishers.sh
new file mode 100644
index 0000000000..1193e22715
--- /dev/null
+++ b/lt-qcom-linux/aosp_publishers.sh
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+set -ex
+
+# make sure there are no left over files
+rm -rf out/
+# copy files which can be published, if needed
+mkdir out
+cp ${WORKSPACE}/linux/vmlinux ${WORKSPACE}/linux/arch/${ARCH}/boot/Image.gz out
+cp ${WORKSPACE}/linux/.config out/kernel.config
+KERNEL_CONFIGS=KERNEL_CONFIGS_$ARCH
+for f in ${!KERNEL_CONFIGS}; do
+    ff=$(find ${WORKSPACE}/linux/arch/${ARCH}/configs/ ${WORKSPACE}/linux/kernel/configs/ -name $f)
+    cp $ff out;
+done
+for f in ${KERNEL_DTBS}; do
+    cp ${WORKSPACE}/linux/arch/${ARCH}/boot/dts/$f out;
+done
+
+if [ -e ${WORKSPACE}/boot-db410c.img ]; then
+    cp ${WORKSPACE}/boot-db410c.img out
+fi
+
+# Create MD5SUMS file
+(cd out && md5sum * > MD5SUMS.txt)
+
+wget -q ${BUILD_URL}consoleText -O out/build-log-$(echo ${JOB_NAME}|sed -e 's/[^A-Za-z0-9._-]/_/g')-${BUILD_NUMBER}.txt
+
+# Publish to snapshots
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+
+if [[ -z ${CLO_MIGRATION} ]]; then
+    time python3 ${HOME}/bin/linaro-cp.py \
+         --link-latest \
+         out ${PUB_DEST}
+else
+    cd out
+    time ${HOME}/bin/jfrog rt u \
+         --flat=false --include-dirs=true --symlinks=true --detailed-summary \
+         --apikey ${LT_QCOM_CLO_API_KEY} \
+         --url ${PUBLISH_SERVER} \
+         "*" ${PUB_DEST}/
+fi
diff --git a/lt-qcom-linux/builders-deps.sh b/lt-qcom-linux/builders-deps.sh
new file mode 100644
index 0000000000..73f46b6256
--- /dev/null
+++ b/lt-qcom-linux/builders-deps.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -ex
+
+sudo apt-get update
+sudo apt-get install -y ccache bc kmod cpio chrpath gawk texinfo libsdl1.2-dev whiptail diffstat libssl-dev build-essential libgmp-dev libmpc-dev python3 python3-pip python3-setuptools yamllint libyaml-dev swig rsync python3-dev python3-setuptools-scm python3-wheel
+
+pip3 install --user dtschema
+
+# install jflog client tool, v1, used for publishing artifacts
+(mkdir -p $HOME/bin && cd $HOME/bin && curl -fL https://getcli.jfrog.io | sh)
diff --git a/lt-qcom-linux/builders.sh b/lt-qcom-linux/builders.sh
index 19295b776c..774ee11137 100644
--- a/lt-qcom-linux/builders.sh
+++ b/lt-qcom-linux/builders.sh
@@ -1,24 +1,55 @@
 #!/bin/bash
 
-set -ex
+if [ ! -d "${WORKSPACE}" ]; then
+    set -x
+    WORKSPACE=$(pwd)
+    BUILD_NUMBER=0
+else
+    set -ex
+fi
 
-echo "Starting ${JOB_NAME} with the following parameters:"
-echo "KERNEL_DESCRIBE: ${KERNEL_DESCRIBE}"
-echo "KERNEL_VERSION: ${KERNEL_VERSION}"
-echo "KERNEL_BRANCH: ${KERNEL_BRANCH}"
-echo "GIT_COMMIT: ${GIT_COMMIT}"
-echo "GIT_BRANCH: ${GIT_BRANCH}"
-
-toolchain_url_arm=http://releases.linaro.org/components/toolchain/binaries/6.3-2017.02/arm-linux-gnueabihf/gcc-linaro-6.3.1-2017.02-x86_64_arm-linux-gnueabihf.tar.xz
-toolchain_url_arm64=http://releases.linaro.org/components/toolchain/binaries/6.3-2017.02/aarch64-linux-gnu/gcc-linaro-6.3.1-2017.02-x86_64_aarch64-linux-gnu.tar.xz
-toolchain_url=toolchain_url_$ARCH
-toolchain_url=${!toolchain_url}
+cd ${WORKSPACE}/linux
 
-tcdir=${HOME}/srv/toolchain
-tcbindir="${tcdir}/$(basename $toolchain_url .tar.xz)/bin"
+KERNEL_REPO="$GIT_URL"
+KERNEL_COMMIT="$GIT_COMMIT"
+KERNEL_BRANCH="$GIT_BRANCH"
+if [ -z "${ARCH}" ]; then
+    export ARCH=arm64
+    export KERNEL_CONFIGS_arm64="defconfig distro.config"
+fi
+if [ -z "${KERNEL_VERSION}" ]; then
+    KERNEL_VERSION=$(make kernelversion)
+fi
+if [ -z "${KERNEL_DESCRIBE}" ]; then
+    git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git
+    git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
+    KERNEL_DESCRIBE=$(git describe --always)
+fi
+if [ -z "${KDEB_CHANGELOG_DIST}" ]; then
+    KDEB_CHANGELOG_DIST="unstable"
+fi
+if [ -z "${KERNEL_BUILD_TARGET}" ]; then
+    KERNEL_BUILD_TARGET="deb-pkg"
+fi
+KERNEL_CONFIGS=KERNEL_CONFIGS_$ARCH
 
+# tcbindir from install-gcc-toolchain.sh
 export CROSS_COMPILE="ccache $(basename $(ls -1 ${tcbindir}/*-gcc) gcc)"
 export PATH=${tcbindir}:$PATH
+KERNEL_TOOLCHAIN="$(ccache aarch64-none-linux-gnu-gcc --version | head -1)"
+
+cat << EOF > ${WORKSPACE}/kernel_parameters
+KERNEL_REPO=${KERNEL_REPO}
+KERNEL_COMMIT=${KERNEL_COMMIT}
+KERNEL_BRANCH=${KERNEL_BRANCH}
+KERNEL_CONFIG=${!KERNEL_CONFIGS}
+KERNEL_VERSION=${KERNEL_VERSION}
+KERNEL_DESCRIBE=${KERNEL_DESCRIBE}
+KERNEL_TOOLCHAIN=${KERNEL_TOOLCHAIN}
+EOF
+
+echo "Starting ${JOB_NAME} with the following parameters:"
+cat ${WORKSPACE}/kernel_parameters
 
 # SRCVERSION is the main kernel version, e.g. <version>.<patchlevel>.0.
 # PKGVERSION is similar to make kernelrelease, but reimplemented, since it requires setting up the build (and all tags).
@@ -27,23 +58,31 @@ export PATH=${tcbindir}:$PATH
 SRCVERSION=$(echo ${KERNEL_VERSION} | sed 's/\(.*\)\..*/\1.0/')
 PKGVERSION=$(echo ${KERNEL_VERSION} | sed -e 's/\.0-rc/\.0~rc/')$(echo ${KERNEL_DESCRIBE} | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}')
 
-cd ${WORKSPACE}/linux
-
-KERNEL_CONFIGS=KERNEL_CONFIGS_$ARCH
+make distclean
 make ${!KERNEL_CONFIGS}
-make savedefconfig
-cp defconfig arch/${ARCH}/configs
-
-make KERNELRELEASE=${SRCVERSION}-qcomlt-${ARCH} \
-     KDEB_PKGVERSION=${PKGVERSION}-${BUILD_NUMBER} \
-     KDEB_CHANGELOG_DIST=${KDEB_CHANGELOG_DIST} \
-     DEBEMAIL="dragonboard@lists.96boards.org" \
-     DEBFULLNAME="Linaro Qualcomm Landing Team" \
-     -j$(nproc) ${KERNEL_BUILD_TARGET}
+if [ "${UPDATE_DEFCONFIG}" ]; then
+	make savedefconfig
+	cp defconfig arch/${ARCH}/configs
+fi
 
-cd ..
+# We only want to build deb OBS packages on release branches not in linux-integration and linux-mainline.
+if [ "${KERNEL_DEBIAN}" ]; then
+    make KERNELRELEASE=${SRCVERSION}-qcomlt-${ARCH} \
+         KDEB_SOURCENAME=${KERNEL_DEBIAN}-${SRCVERSION}-qcomlt-${ARCH} \
+         KDEB_PKGVERSION=${PKGVERSION}-${BUILD_NUMBER} \
+         KDEB_CHANGELOG_DIST=${KDEB_CHANGELOG_DIST} \
+         DEBEMAIL="dragonboard@lists.96boards.org" \
+         DEBFULLNAME="Linaro Qualcomm Landing Team" \
+         -j$(nproc) ${KERNEL_BUILD_TARGET}
 
-cat > params <<EOF
-source=${JOB_URL}/ws/$(echo *.dsc)
-repo=${TARGET_REPO}
+    cat > ${WORKSPACE}/params <<EOF
+    source=${JOB_URL}/ws/$(echo ../*.dsc | sed 's/\.\.\///')
+    repo=${TARGET_REPO}
 EOF
+else
+    make KERNELRELEASE=${SRCVERSION}-qcomlt-${ARCH} -j$(nproc)
+fi
+
+make KERNELRELEASE=${SRCVERSION}-qcomlt-${ARCH} -j$(nproc) INSTALL_MOD_STRIP=1 INSTALL_MOD_PATH=./INSTALL_MOD_PATH modules_install
+
+cd ..
diff --git a/lt-qcom-linux/builders_linaro_ci.sh b/lt-qcom-linux/builders_linaro_ci.sh
new file mode 100644
index 0000000000..bdebed5a32
--- /dev/null
+++ b/lt-qcom-linux/builders_linaro_ci.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+
+if [ ! -d "${WORKSPACE}" ]; then
+    set -x
+    WORKSPACE=$(pwd)
+else
+    set -ex
+fi
+if [ -z "${ARCH}" ]; then
+    export ARCH=arm64
+fi
+
+mkdir -p out
+(cd linux/INSTALL_MOD_PATH && find . | cpio -R 0:0 -ov -H newc | gzip > ${WORKSPACE}/out/kernel-modules.cpio.gz)
+(cd linux/INSTALL_MOD_PATH && tar cJvf ${WORKSPACE}/out/kernel-modules.tar.xz .)
+cp linux/.config ${WORKSPACE}/out/kernel.config
+cp linux/{System.map,vmlinux} ${WORKSPACE}/out/
+cp linux/arch/$ARCH/boot/Image* ${WORKSPACE}/out/
+(mkdir -p out/dtbs && cd linux/arch/$ARCH/boot/dts && cp -a --parents $(find . -name '*.dtb') ${WORKSPACE}/out/dtbs)
+
+cat > ${WORKSPACE}/out/HEADER.textile << EOF
+h4. QC LT kernel build
+
+Build description:
+* Build URL: "$BUILD_URL":$BUILD_URL
+* KERNEL_REPO: ${KERNEL_REPO}
+* KERNEL_COMMIT: ${KERNEL_COMMIT}
+* KERNEL_BRANCH: ${KERNEL_BRANCH}
+* KERNEL_CONFIG: ${KERNEL_CONFIG}
+* KERNEL_VERSION: ${KERNEL_VERSION}
+* KERNEL_DESCRIBE: ${KERNEL_DESCRIBE}
+* KERNEL_TOOLCHAIN: ${KERNEL_TOOLCHAIN}
+EOF
+
+# Set publication destination into snapshots.linaro.org
+BRANCH_NAME_URL=$(echo ${KERNEL_BRANCH} | sed -e 's/[^A-Za-z0-9._-]/_/g')
+PUBLISH_SERVER=https://snapshots.linaro.org/
+PUB_DEST="member-builds/qcomlt/kernel/${BRANCH_NAME_URL}/${BUILD_NUMBER}/${ARCH}"
+echo "PUB_DEST=${PUB_DEST}" > pub_dest_parameters
+
+# Create test_params to trigger lt-qcom-linux-test- builds only for arm64 builds
+if [ "${ARCH}" = "arm64" ]; then
+    cat > ${WORKSPACE}/test_params << EOF
+    KERNEL_IMAGE_URL=${PUBLISH_SERVER}${PUB_DEST}/Image
+    KERNEL_MODULES_URL=${PUBLISH_SERVER}${PUB_DEST}/kernel-modules.tar.xz
+    KERNEL_DT_URL=${PUBLISH_SERVER}${PUB_DEST}/dtbs
+    KERNEL_REPO=${KERNEL_REPO}
+    KERNEL_COMMIT=${KERNEL_COMMIT}
+    KERNEL_BRANCH=${KERNEL_BRANCH}
+    KERNEL_CONFIG=${KERNEL_CONFIG}
+    KERNEL_VERSION=${KERNEL_VERSION}
+    KERNEL_DESCRIBE=${KERNEL_DESCRIBE}
+    KERNEL_TOOLCHAIN=${KERNEL_TOOLCHAIN}
+EOF
+fi
diff --git a/lt-qcom-linux/publishers.sh b/lt-qcom-linux/publishers.sh
deleted file mode 100644
index 0f1f6ed41e..0000000000
--- a/lt-qcom-linux/publishers.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# copy files which can be published, if needed
-mkdir out
-cp ${WORKSPACE}/linux/vmlinux ${WORKSPACE}/linux/arch/${ARCH}/boot/Image.gz out
-cp ${WORKSPACE}/linux/.config out/kernel.config
-cp ${WORKSPACE}/linux/arch/${ARCH}/configs/defconfig out
-for f in ${KERNEL_DTBS}; do
-    cp ${WORKSPACE}/linux/arch/${ARCH}/boot/dts/$f out;
-done
-
-if [ -e ${WORKSPACE}/boot-db410c.img ]; then
-    cp ${WORKSPACE}/boot-db410c.img out
-fi
-
-# Create MD5SUMS file
-(cd out && md5sum * > MD5SUMS.txt)
-
-wget -q ${BUILD_URL}consoleText -O out/build-log-$(echo ${JOB_NAME}|sed -e 's/[^A-Za-z0-9._-]/_/g')-${BUILD_NUMBER}.txt
-
-# Publish to snapshots
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-     --server ${PUBLISH_SERVER} \
-     --link-latest \
-     out ${PUB_DEST}
diff --git a/lt-qcom-openembedded-rpb-rocko.yaml b/lt-qcom-openembedded-rpb-rocko.yaml
deleted file mode 100644
index 1371323b05..0000000000
--- a/lt-qcom-openembedded-rpb-rocko.yaml
+++ /dev/null
@@ -1,114 +0,0 @@
-- job:
-    name: lt-qcom-openembedded-rpb-rocko
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image rpb-console-image-test rpb-initramfs-image-test'
-        - string:
-            name: IMAGES_RPB
-            default: 'rpb-desktop-image rpb-desktop-image-test'
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: 'rpb-weston-image rpb-weston-image-test'
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH_PREFIX
-            default: 'qcom/'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'rocko'
-        - string:
-            name: BASE_URL
-            default: 'https://snapshots.linaro.org/'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-    disabled: false
-    node: master
-    display-name: 'Qualcomm OpenEmbedded RPB (rocko)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'dragonboard-820c'
-                - 'sd-600eval'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-                - rpb-wayland
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # some machine names we use on 96boards are slightly different
-            case "${MACHINE}" in
-              dragonboard-410c)
-                MACHINE=dragonboard410c
-                ;;
-              dragonboard-820c)
-                MACHINE=dragonboard820c
-                ;;
-            esac
-
-            echo "PUB_DEST=96boards/${MACHINE}/linaro/openembedded/${MANIFEST_BRANCH}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
-        - inject:
-            properties-file: pub_dest_parameters
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-        - shell:
-            !include-raw: lt-qcom-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, nicolas.dechesne@linaro.org, anibal.limon@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/lt-qcom-openembedded/submit_for_testing.sh b/lt-qcom-openembedded/submit_for_testing.sh
deleted file mode 100755
index 821847b010..0000000000
--- a/lt-qcom-openembedded/submit_for_testing.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-
-rm -rf configs
-git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-# Install jinja2-cli and ruamel.yaml, required by submit_for_testing.py
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
-
-# main parameters
-export DEPLOY_OS=oe
-export OS_INFO=openembedded-${DISTRO}-${MANIFEST_BRANCH}
-export BOOT_OS_PROMPT=\'root@dragonboard-410c:~#\'
-
-# boot and rootfs parameters, BOOT_URL comes from builders.sh
-# and has not compression
-export BOOT_URL_COMP=
-export LXC_BOOT_FILE=$(basename ${BOOT_URL})
-
-export RESIZE_ROOTFS=
-
-case "${MACHINE}" in
-  dragonboard-410c)
-    export DEVICE_TYPE="${MACHINE}"
-    case "${DISTRO}" in
-      rpb)
-        export ROOTFS_URL=${ROOTFS_SPARSE_BUILD_URL}
-        export ROOTFS_URL_COMP="gz"
-        export LXC_ROOTFS_FILE=$(basename ${ROOTFS_URL} .gz)
-        python configs/openembedded-lkft/submit_for_testing.py \
-            --device-type ${DEVICE_TYPE} \
-            --build-number ${BUILD_NUMBER} \
-            --lava-server ${LAVA_SERVER} \
-            --qa-server ${QA_SERVER} \
-            --qa-server-team qcomlt \
-            --qa-server-project openembedded-rpb-${MANIFEST_BRANCH} \
-            --env-suffix="-${DISTRO}" \
-            --git-commit ${BUILD_NUMBER} \
-            --template-path configs/lt-qcom/lava-job-definitions \
-            --template-base-pre base_template.yaml \
-            --template-names template.yaml template-wifi.yaml template-bt.yaml template-ptest.yaml
-
-        export ROOTFS_URL=${ROOTFS_DESKTOP_SPARSE_BUILD_URL}
-        export ROOTFS_URL_COMP="gz"
-        export LXC_ROOTFS_FILE=$(basename ${ROOTFS_URL} .gz)
-        python configs/openembedded-lkft/submit_for_testing.py \
-            --device-type ${DEVICE_TYPE} \
-            --build-number ${BUILD_NUMBER} \
-            --lava-server ${LAVA_SERVER} \
-            --qa-server ${QA_SERVER} \
-            --qa-server-team qcomlt \
-            --qa-server-project openembedded-rpb-${MANIFEST_BRANCH} \
-            --env-suffix="-${DISTRO}" \
-            --git-commit ${BUILD_NUMBER} \
-            --template-path configs/lt-qcom/lava-job-definitions \
-            --template-base-pre base_template.yaml \
-            --template-names template-desktop.yaml template-gst-validate.yaml
-      ;;
-      rpb-wayland)
-        echo "Currently no tests for rpb-wayland"
-      ;;
-    esac
-    ;;
-  *)
-    echo "Skip DEVICE_TYPE for ${MACHINE}"
-    ;;
-esac
diff --git a/lt-qcom/builders-deps.sh b/lt-qcom/builders-deps.sh
new file mode 100644
index 0000000000..7ebdf99b75
--- /dev/null
+++ b/lt-qcom/builders-deps.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -ex
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+	echo "INFO: apt update error - try again in a moment"
+	sleep 15
+	sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+
+pkg_list="tar gzip pigz cpio xz-utils wget skales e2fsprogs e2tools simg2img img2simg python-pip curl dpkg ccache bc kmod cpio libssl-dev python3 python3-pip python3-setuptools"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+	echo "INFO: apt install error - try again in a moment"
+	sleep 15
+	sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+export GZ=pigz
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+pip3 install --user python-dateutil beautifulsoup4
+
+# install jflog client tool, v1, used for publishing artifacts
+(mkdir -p $HOME/bin && cd $HOME/bin && curl -fL https://getcli.jfrog.io | sh)
+
diff --git a/lt-qcom/install-gcc-toolchain.sh b/lt-qcom/install-gcc-toolchain.sh
new file mode 100644
index 0000000000..3dba932fbc
--- /dev/null
+++ b/lt-qcom/install-gcc-toolchain.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+if [ -z "${ARCH}" ]; then
+	ARCH=arm64
+fi
+if [ "${TOOLCHAIN_ARCH}" ]; then
+	ARCH="${TOOLCHAIN_ARCH}"
+fi
+
+toolchain_url_arm=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-arm-none-eabi.tar.xz
+toolchain_url_arm64=https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64-none-linux-gnu.tar.xz
+toolchain_url=toolchain_url_$ARCH
+toolchain_url=${!toolchain_url}
+
+export tcdir=${HOME}/srv/toolchain
+export tcbindir="${tcdir}/$(basename $toolchain_url .tar.xz)/bin"
+if [ ! -d "${tcbindir}" ]; then
+	wget -q "${toolchain_url}"
+	sudo mkdir -p "${tcdir}"
+	sudo tar -xf "$(basename ${toolchain_url})" -C "${tcdir}"
+fi
+
+export PATH=$tcbindir:$PATH
+
+echo tcbindir="${tcbindir}" > gcc_toolchain_env
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/base_template.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/base_template.yaml
deleted file mode 100644
index 561f66924b..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/base_template.yaml
+++ /dev/null
@@ -1,136 +0,0 @@
-protocols:
-  lava-lxc:
-    name: lxc-dragonboard410c-test
-    template: debian
-    distribution: debian
-    release: stretch
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 5
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    - img2simg
-    - simg2img
-    - e2fsprogs
-    - gzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - 'root@linaro-developer:~#'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: download
-    namespace: dragonboard410c
-    images:
-      boot:
-        url: ${BOOT_URL}
-        compression: ${BOOT_URL_COMP}
-      rootfs:
-        url: ${ROOTFS_URL}
-        compression: ${ROOTFS_URL_COMP}
-    os: ${DEPLOY_OS}
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 30
-    definitions:
-    - from: inline
-      name: db410c-resize-rootfs
-      path: inline/db410c-resize-rootfs.yaml
-      repository:
-        metadata:
-          description: db410c resize rootfs image for test overlay
-          format: Lava-Test Test Definition 1.0
-          name: db410c-resize-rootfs
-        run:
-          steps:
-          - if [ -z "${RESIZE_ROOTFS}" ]
-          - then
-          -     echo "resize_rootfs:" "skip"
-          - else
-          -     cd /lava-lxc
-          -     overlay_file=/lava-lxc/overlays/dragonboard410c/overlay.tar.gz
-          -     overlay_size=$$(gzip -l $$overlay_file | tail -1 | awk '{print $$2}')
-          -     overlay_size=$$(( $$overlay_size / 1024 ))
-          -     simg2img ${LXC_ROOTFS_FILE} ${LXC_ROOTFS_FILE}.ext4
-          -     fsck_code=$$(e2fsck -y -f ${LXC_ROOTFS_FILE}.ext4)
-          -     block_count=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block count" | awk '{print $$3}')
-          -     block_size=$$(dumpe2fs -h ${LXC_ROOTFS_FILE}.ext4 | grep "Block size" | awk '{print $$3}')
-          -     current_size=$$(( $$block_size * $$block_count / 1024 ))
-          -     final_size=$$(( $$current_size + $$overlay_size + 32768 ))
-          -     resize2fs ${LXC_ROOTFS_FILE}.ext4 "$$final_size"K
-          -     img2simg ${LXC_ROOTFS_FILE}.ext4 ${LXC_ROOTFS_FILE}
-          -     echo "resize_rootfs:" "pass"
-          - fi
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.2-linux.zip
-          - unzip platform-tools_r26.0.2-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 40
-    to: fastboot
-    namespace: dragonboard410c
-    images:
-      boot:
-        url: lxc:///${LXC_BOOT_FILE}
-      rootfs:
-        url: lxc:///${LXC_ROOTFS_FILE}
-        apply-overlay: true
-    os: ${DEPLOY_OS}
-    protocols:
-        lava-lxc:
-        - action: fastboot-deploy
-          request: pre-power-command
-          timeout:
-              minutes: 2
-
-- boot:
-    namespace: dragonboard410c
-    auto_login:
-      login_prompt: 'login:'
-      username: 'root'
-    prompts:
-    - 'root@(.*):/#'
-    - ${BOOT_OS_PROMPT}
-    timeout:
-      minutes: 15
-    method: fastboot
-    protocols:
-      lava-lxc:
-      - action: auto-login-action
-        request: pre-os-command
-        timeout:
-          minutes: 2
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template-bt.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template-bt.yaml
deleted file mode 100644
index 10dcfcd6bc..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template-bt.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-bt
-    timeout:
-      minutes: 5
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/hci-smoke/hci-smoke.yaml
-      params:
-              BOOT: auto
-      name: linux-hci-smoke
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-bt-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 90
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template-bt.yaml
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template-desktop.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template-desktop.yaml
deleted file mode 100644
index 22cd577dc8..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template-desktop.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-desktop
-    timeout:
-      minutes: 105
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/piglit/piglit.yaml
-      name: linux-piglit
-      params:
-              OPTIONS: "-l dummy -x streaming-texture-leak -x glx -x tex3d-maxsize -x max-texture-size -1"
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-desktop-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 135
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template-desktop.yaml
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template-gst-validate.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template-gst-validate.yaml
deleted file mode 100644
index 56cafa6b26..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template-gst-validate.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-gst-validate
-    timeout:
-      minutes: 120
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/gst-validate/gst-validate.yaml
-      name: linux-gst-validate
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-gst-validate-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 150
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template-gst-validate.yaml
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template-pmwg.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template-pmwg.yaml
deleted file mode 100644
index 4793eeebb1..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template-pmwg.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- test:
-    namespace: dragonboard410c
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: ssh-enable-target-login
-          description: "Enable SSH Root login on Target"
-        run:
-          steps:
-          - echo -ne "linaro123\nlinaro123\n" | passwd root
-          - echo PermitRootLogin yes >> /etc/ssh/sshd_config
-          - systemctl restart ssh.service
-      name: ssh-enable-target-login-inline
-      path: inline/ssh-enable-target-login.yaml
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - repository: https://git.linaro.org/lava-team/refactoring.git
-      from: git
-      path: testdefs/arm-probe.yaml
-      name: arm-probe
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 60
-    definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: prep-tests
-          description: "Download energy-probe-ext instrumentation"
-        run:
-          steps:
-          - apt-get update
-          - apt-get -y install trace-cmd git
-          - cd /root
-          - git clone https://git.linaro.org/power/energy-probe-ext.git /energy-probe-ext
-          - export TARGET_IP=$(lava-target-ip)
-          - echo $TARGET_IP lava-target-ip >> /etc/hosts
-      name: prep-inline
-      path: inline/prep.yaml
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/workload-automation/workload-automation.yaml
-      params:
-        CONFIG: config/generic-linux-remote.py
-        AGENDA: agenda/qcomlt/linux-workloads-db410c.yaml
-        WA_EXTENSION_PATHS: /energy-probe-ext
-        ARTIFACTORIAL_URL: https://archive.validation.linaro.org/artifacts/team/qcomlt/
-      name: linux-pmwg
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-pmwg-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 90
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: group
-
-secrets:
-  ARTIFACTORIAL_TOKEN: "${ARTIFACTORIAL_TOKEN}"
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template-pmwg.yaml
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template-ptest.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template-ptest.yaml
deleted file mode 100644
index 7a258beba8..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template-ptest.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-ptest
-    timeout:
-      minutes: 160
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/ptest/ptest.yaml
-      name: linux-ptest
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-ptest-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 160
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template-ptest.yaml
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template-wifi.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template-wifi.yaml
deleted file mode 100644
index f9dde48e17..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template-wifi.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-wifi
-    timeout:
-      minutes: 5
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/wlan-smoke/wlan-smoke.yaml
-      name: linux-wlan-smoke
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-wifi-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 90
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template-wifi.yaml
-
-
diff --git a/lt-qcom/lava-job-definitions/dragonboard-410c/template.yaml b/lt-qcom/lava-job-definitions/dragonboard-410c/template.yaml
deleted file mode 100644
index 164d6f01c2..0000000000
--- a/lt-qcom/lava-job-definitions/dragonboard-410c/template.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-# XXX: This test manfiests are the same of qcomlt test plans
-# used in test-runner, the LAVA dispatcher currently doesn't support
-# test plans.
-#
-# git.linaro.org/qa/test-definitions.git - plans/qcomlt
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-smoke
-    timeout:
-      minutes: 5
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/smoke/smoke.yaml
-      name: linux-smoke
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/usb-smoke/usb-smoke-test.yaml
-      name: linux-usb-smoke
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/toolchain-smoke/toolchain-smoke.yaml
-      name: linux-toolchain-smoke
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/device-tree/device-tree.yaml
-      name: linux-device-tree
-
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-bench
-    timeout:
-      minutes: 65
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/dd-wr-speed/dd-wr-speed.yaml
-      name: linux-dd-wr-speed
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/sysbench/sysbench.yaml
-      params:
-              NUM_THREADS: 4
-              TESTS: cpu memory threads mutex
-      name: linux-sysbench
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/device-read-perf/device-read-perf.yaml
-      name: linux-device-read-perf
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/hackbench/hackbench.yaml
-      name: linux-hackbench
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/linpack/linpack.yaml
-      name: linux-linpack
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/openssl/openssl-speed.yaml
-      name: linux-openssl-speed
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/stream/stream-uniprocessor.yaml
-      name: linux-stream-uniprocessor
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/pi-stress/pi-stress.yaml
-      name: linux-pi-stress
-
-- test:
-    namespace: dragonboard410c
-    name: qcomlt-pm-qa
-    timeout:
-      minutes: 15
-    definitions:
-    - repository: https://git.linaro.org/qa/test-definitions.git
-      from: git
-      path: automated/linux/pm-qa/pm-qa.yaml
-      name: linux-pm-qa
-
-device_type: ${DEVICE_TYPE}
-job_name: lt-qcom-${OS_INFO}-${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 110
-  action:
-    minutes: 15
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-metadata:
-  source: https://git.linaro.org/ci/job/configs.git
-  path: lt-qcom/lava-job-definitions/dragonboard-410c/template.yaml
diff --git a/lt-qcom/publishers.sh b/lt-qcom/publishers.sh
new file mode 100644
index 0000000000..d3008421dd
--- /dev/null
+++ b/lt-qcom/publishers.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -ex
+
+if [ ! -d "out" ]; then
+    echo "Avoid publishing, not out directory exists."
+    exit 0
+fi
+
+# Create MD5SUMS file
+(cd out && md5sum $(find . -type f) > MD5SUMS.txt)
+
+wget -q ${BUILD_URL}consoleText -O out/build-log-$(echo ${JOB_NAME}|sed -e 's/[^A-Za-z0-9._-]/_/g')-${BUILD_NUMBER}.txt
+
+# Publish to snapshots
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+
+time python3 ${HOME}/bin/linaro-cp.py \
+     --link-latest \
+     out ${PUB_DEST}
diff --git a/ltp-upstream.yaml b/ltp-upstream.yaml
deleted file mode 100644
index a11c1378f7..0000000000
--- a/ltp-upstream.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-- job:
-    name: ltp-upstream
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: SRCREV_ltp
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: IMAGES_RPB
-            default: ''
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: ''
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'rocko'
-        - string:
-            name: BASE_URL
-            default: 'http://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/ltp/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'rpb-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'rpb'
-    disabled: false
-    node: master
-    display-name: 'LTP upstream (master)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'hikey'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              *)
-                echo "Skip DEVICE_TYPE for ${MACHINE}"
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: rpb-openembedded/builders-ltp.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-#        - shell:
-#            !include-raw: rpb-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - openembedded-lkft/postbuild.groovy
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/luajit-aarch64.yaml b/luajit-aarch64.yaml
deleted file mode 100644
index d41de2a590..0000000000
--- a/luajit-aarch64.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- job:
-    name: luajit-aarch64
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - bool:
-            name: CI_DEBUG
-            default: true
-            description: 'Whether to print debug message'
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'LuaJIT CI (Aarch64)'
-    scm:
-        - git:
-            url: https://github.com/cbaylis/luajit-aarch64/
-            refspec: +refs/heads/aarch64-v2.1-new:refs/remotes/origin/aarch64-v2.1-new
-            name: origin
-            branches:
-                - refs/heads/aarch64-v2.1-new
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell:
-            !include-raw: luajit-aarch64/builders.sh
diff --git a/luajit-aarch64/builders.sh b/luajit-aarch64/builders.sh
deleted file mode 100755
index 0d418d1852..0000000000
--- a/luajit-aarch64/builders.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-########## Helper functions ##########
-
-# Message prefix
-_msg_prefix () {
-  echo "[$(date +%H:%M:%S)]$(hostname):"
-}
-
-# Report a message
-msg () {
-  echo "$(_msg_prefix):MSG: $*"
-}
-
-# Report an error and terminate the script
-err () {
-  echo "$(_msg_prefix):ERR: $*"
-  exit 1
-}
-
-# Verbose-debug message
-dbg () {
-  # Don't print debug message if CI_DEBUG is 'false'.
-  if [ "$CI_DEBUG" = "false" ]; then
-    return
-  fi
-  echo "$(_msg_prefix):DBG: $*"
-}
-
-# run [command] [args ...]
-run () {
-  dbg Running : "$@"
-  "$@"
-}
-
-# 'safe [command]' executes [command] and terminates if the exit code is
-# nonzero. An alternative to "set -e"
-safe () {
-  run "$@"
-  local err_num=$?
-  if [ $err_num -ne 0 ]; then
-    err "Error [$err_num] while doing [$*]"
-  fi
-}
-
-# Suggested number of parallel tasks
-njobs () {
-  local cpus=$(nproc)
-  if [ $cpus -le 1 ]; then
-    echo 1
-  else
-    echo $(($cpus - 1))
-  fi
-}
-
-########## LuaJIT build and test ##########
-
-# Build and install
-safe make CCDEBUG="-DUSE_LUA_ASSERT" PREFIX="${WORKSPACE}"/install install -j "$(njobs)"
-safe export LUA_PATH="$(ls -d "${WORKSPACE}"/install/share/luajit*)/?.lua;;"
-
-# Run a simple test
-safe ./src/luajit -jdump -e "x=0; for i=1,100 do x=x+i end; print(x)"
-
-# Additional internal test which doesn't exist everywhere
-if make -n test > /dev/null; then
-  safe make test
-fi
diff --git a/mbl-openembedded-master.yaml b/mbl-openembedded-master.yaml
deleted file mode 100644
index e65633c98c..0000000000
--- a/mbl-openembedded-master.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-- job:
-    name: mbl-openembedded-master
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            mbl-ci-users:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'mbl-console-image-test'
-        - string:
-            name: BASE_URL
-            default: 'https://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/mbl/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'mbl'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'mbl'
-    disabled: false
-    node: master
-    display-name: 'MBL - OpenEmbedded (master)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MANIFEST_BRANCH
-            values:
-                - 'linaro-master'
-                - 'linaro-master-pinned'
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'imx7s-warp-mbl'
-                - 'raspberrypi3'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - mbl
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'MBL'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell:
-            !include-raw: mbl-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            cat > ${WORKSPACE}/BUILD-INFO.txt << EOF
-            Format-Version: 0.5
-
-            Files-Pattern: *
-            License-Type: protected
-            Auth-Groups: mbl-ci-users
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info ${WORKSPACE}/BUILD-INFO.txt \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --make-link \
-              $(dirname ${PUB_DEST})
-        - shell:
-            !include-raw: mbl-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, ryan.harkin@linaro.org, paul.liu@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/mbl-openembedded-pyro.yaml b/mbl-openembedded-pyro.yaml
deleted file mode 100644
index 08e029e392..0000000000
--- a/mbl-openembedded-pyro.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-- job:
-    name: mbl-openembedded-pyro
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-            mbl-ci-users:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: BASE_URL
-            default: 'https://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/mbl/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'mbl'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'mbl'
-    disabled: false
-    node: master
-    display-name: 'MBL - OpenEmbedded (pyro)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MANIFEST_BRANCH
-            values:
-                - 'linaro-pyro'
-                - 'linaro-pyro-pinned'
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'imx7s-warp'
-                - 'raspberrypi3'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'MBL'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell:
-            !include-raw: mbl-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            cat > ${WORKSPACE}/BUILD-INFO.txt << EOF
-            Format-Version: 0.5
-
-            Files-Pattern: *
-            License-Type: protected
-            Auth-Groups: mbl-ci-users
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info ${WORKSPACE}/BUILD-INFO.txt \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --make-link \
-              $(dirname ${PUB_DEST})
-        - shell:
-            !include-raw: mbl-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, ryan.harkin@linaro.org, paul.liu@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/mbl-openembedded/builders.sh b/mbl-openembedded/builders.sh
deleted file mode 100755
index 3c2f15c97f..0000000000
--- a/mbl-openembedded/builders.sh
+++ /dev/null
@@ -1,188 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# workaround EDK2 is confused by the long path used during the build
-# and truncate files name expected by VfrCompile
-sudo mkdir -p /srv/oe
-sudo chown buildslave:buildslave /srv/oe
-cd /srv/oe
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    echo "Running cleanup_exit..."
-}
-
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
-  echo "INFO: apt update error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
-fi
-pkg_list="virtualenv python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-crypto python-requests texinfo vim-tiny whiptail libelf-dev"
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
-  echo "INFO: apt install error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
-fi
-
-# Install jinja2-cli and ruamel.yaml
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
-
-set -ex
-
-mkdir -p ${HOME}/bin
-curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-chmod a+x ${HOME}/bin/repo
-export PATH=${HOME}/bin:${PATH}
-
-# initialize repo if not done already
-if [ ! -e ".repo/manifest.xml" ]; then
-  ssh-keyscan github.com >> ${HOME}/.ssh/known_hosts
-
-  MANIFEST_FILE=default.xml
-  case "${MANIFEST_BRANCH}" in
-    linaro-*-pinned)
-      MANIFEST_FILE=pinned-manifest.xml
-      ;;
-  esac
-
-  repo init -u git@github.com:ARMmbed/mbl-manifest.git -b ${MANIFEST_BRANCH_PREFIX}${MANIFEST_BRANCH} -m ${MANIFEST_FILE}
-
-  # link to shared downloads on persistent disk
-  # our builds config is expecting downloads and sstate-cache, here.
-  # DL_DIR = "${OEROOT}/sources/downloads"
-  # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
-  mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
-  mkdir -p build
-  ln -s ${HOME}/srv/oe/downloads
-  ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
-fi
-
-repo sync
-cp .repo/manifest.xml source-manifest.xml
-repo manifest -r -o pinned-manifest.xml
-MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
-
-# record changes since last build, if available
-MANIFEST_URL=${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml
-if wget -q ${MANIFEST_URL} -O pinned-manifest-latest.xml; then
-    repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
-else
-    echo "latest build published does not have pinned-manifest.xml, skipping diff report"
-fi
-
-# the setup-environment will create auto.conf and site.conf
-# make sure we get rid of old config.
-# let's remove the previous TMPDIR as well.
-# we want to preserve build/buildhistory though.
-rm -rf build/conf build/tmp-*glibc/
-
-# Accept EULA if/when needed
-export EULA_dragonboard410c=1
-export EULA_stih410b2260=1
-source setup-environment build
-
-# Add job BUILD_NUMBER to output files names
-cat << EOF >> conf/auto.conf
-IMAGE_NAME_append = "-${BUILD_NUMBER}"
-KERNEL_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-MODULE_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-DT_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-BOOT_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-EOF
-
-# get build stats to make sure that we use sstate properly
-cat << EOF >> conf/auto.conf
-INHERIT += "buildstats buildstats-summary"
-EOF
-
-# Set the image types to use
-case ${DISTRO} in
-  rpb)
-    distro_conf=$(find ../layers/meta-rpb/conf/distro -name rpb.inc)
-    cat << EOF >> ${distro_conf}
-IMAGE_FSTYPES_remove_imx7s-warp = "ext4"
-IMAGE_FSTYPES_append_imx7s-warp = " ext4.gz"
-IMAGE_FSTYPES_remove_raspberrypi3 = "tar.bz2"
-IMAGE_FSTYPES_remove_raspberrypi3 = "ext3"
-IMAGE_FSTYPES_append_raspberrypi3 = " ext3.gz"
-EOF
-    ;;
-esac
-
-# add useful debug info
-cat conf/{site,auto}.conf
-
-case "${MACHINE}" in
-  imx7s-warp*)
-    # Temporary sstate cleanup to force warp7 firmware to be re-generated each time
-    set +e
-    bitbake -c cleansstate u-boot-fslc mbl-boot-scr
-    set -e
-    ;;
-esac
-
-time bitbake ${IMAGES}
-
-DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
-
-# Prepare files to publish
-rm -f ${DEPLOY_DIR_IMAGE}/*.txt
-find ${DEPLOY_DIR_IMAGE} -type l -delete
-mv /srv/oe/{source,pinned}-manifest.xml ${DEPLOY_DIR_IMAGE}
-cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
-
-# FIXME: IMAGE_FSTYPES_remove doesn't work
-rm -f ${DEPLOY_DIR_IMAGE}/*.rootfs.ext?
-
-# FIXME: Sparse images here, until it gets done by OE
-case "${MACHINE}" in
-  juno|stih410-b2260|imx7s-warp*|raspberrypi3)
-    ;;
-  *)
-    for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
-      gunzip -k ${rootfs}
-      sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
-      rm -f ${rootfs%.gz}
-      gzip -9 ${rootfs%.ext4.gz}.img
-    done
-    ;;
-esac
-
-# Create MD5SUMS file
-find ${DEPLOY_DIR_IMAGE} -type f | xargs md5sum > MD5SUMS.txt
-sed -i "s|${DEPLOY_DIR_IMAGE}/||" MD5SUMS.txt
-mv MD5SUMS.txt ${DEPLOY_DIR_IMAGE}
-
-# Build information
-cat > ${DEPLOY_DIR_IMAGE}/HEADER.textile << EOF
-
-h4. MBL Build - OpenEmbedded
-
-Build description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* Manifest URL: "https://github.com/ARMmbed/mbl-manifest.git":https://github.com/ARMmbed/mbl-manifest.git
-* Manifest branch: ${MANIFEST_BRANCH_PREFIX}${MANIFEST_BRANCH}
-* Manifest commit: "${MANIFEST_COMMIT}":https://github.com/ARMmbed/mbl-manifest/commit/${MANIFEST_COMMIT}
-EOF
-
-if [ -e "/srv/oe/manifest-changes.txt" ]; then
-  # the space after pre.. tag is on purpose
-  cat > ${DEPLOY_DIR_IMAGE}/README.textile << EOF
-
-h4. Manifest changes
-
-pre.. 
-EOF
-  cat /srv/oe/manifest-changes.txt >> ${DEPLOY_DIR_IMAGE}/README.textile
-  mv /srv/oe/manifest-changes.txt ${DEPLOY_DIR_IMAGE}
-fi
-
-# Note: the main job script allows to override the default value for
-#       BASE_URL and PUB_DEST, typically used for OE RPB builds
-cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
-MANIFEST_COMMIT=${MANIFEST_COMMIT}
-EOF
diff --git a/mbl-openembedded/lava-job-definitions/imx7s-warp/template.yaml b/mbl-openembedded/lava-job-definitions/imx7s-warp/template.yaml
deleted file mode 100644
index 7d70591a49..0000000000
--- a/mbl-openembedded/lava-job-definitions/imx7s-warp/template.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-device_type: imx7s-warp
-
-job_name: MBL ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 10
-  action:
-    minutes: 5
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-actions:
-- deploy:
-    timeout:
-      minutes: 5
-    to: u-boot-ums
-    os: oe
-    image:
-      url: ${IMAGE_URL}
-      compression: gz
-      root_partition: 2
-
-- boot:
-    method: u-boot
-    commands: ums
-    auto_login:
-      login_prompt: 'imx7s-warp-mbl login:'
-      username: 'root'
-    prompts:
-      - 'root@imx7s-warp-mbl:~#'
-    timeout:
-      minutes: 20
-- test:
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: mbl-test
-          description: "MBL basic test"
-        run:
-          steps:
-            - uname -a
-      name: mbl-test
-      path: inline/mbl-test.yaml
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/mbl-openembedded/lava-job-definitions/rpi3-b-32/template.yaml b/mbl-openembedded/lava-job-definitions/rpi3-b-32/template.yaml
deleted file mode 100644
index 48eb9a246c..0000000000
--- a/mbl-openembedded/lava-job-definitions/rpi3-b-32/template.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-device_type: rpi3-b-32
-
-job_name: MBL ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-timeouts:
-  job:
-    minutes: 10
-  action:
-    minutes: 5
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  extra_kernel_args: " 8250.nr_uarts=1"
-  console_device: "ttyS0"
-
-actions:
-- deploy:
-    timeout:
-      minutes: 5
-    to: tftp
-    os: oe
-    kernel:
-      url: ${KERNEL_URL}
-      type: uimage
-    modules:
-      url: ${MODULES_URL}
-      compression: gz
-    nfsrootfs:
-      url: ${NFSROOTFS_URL}
-      compression: xz
-    dtb:
-      url: ${DTB_URL}
-
-- boot:
-    method: u-boot
-    commands: nfs
-    auto_login:
-      login_prompt: 'login:'
-      username: root
-    prompts:
-    - 'root@raspberrypi3:~#'
-    timeout:
-      minutes: 5
-
-- test:
-    timeout:
-      minutes: 5
-    definitions:
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: mbl-test
-          description: "MBL basic test"
-        run:
-          steps:
-            - uname -a
-      name: mbl-test
-      path: inline/mbl-test.yaml
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${PUBLISH_SERVER}${PUB_DEST}
-
-notify:
-    recipients:
-    - to:
-        method: email
-        email: ryan.harkin@linaro.org
-    criteria:
-        status: complete
-    verbosity: verbose
diff --git a/mbl-openembedded/submit_for_testing.sh b/mbl-openembedded/submit_for_testing.sh
deleted file mode 100755
index 7cf10fa103..0000000000
--- a/mbl-openembedded/submit_for_testing.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-# Need different files for each machine
-KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "?Image-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
-MODULES_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "modules-*-${MACHINE}-*-${BUILD_NUMBER}.tgz" | xargs -r basename)
-ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "${IMAGES}-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
-DISK_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "${IMAGES}-${MACHINE}-*-${BUILD_NUMBER}.rootfs.wic.gz" | xargs -r basename)
-
-# Mapping for MACHINE -> DEVICE_TYPE
-case "${MACHINE}" in
-  imx7s-warp*)
-    export DEVICE_TYPE=imx7s-warp
-    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "?Image-*-${MACHINE}-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
-    ;;
-  raspberrypi3)
-    export DEVICE_TYPE=rpi3-b-32
-    RPI_MODEL=bcm2710-rpi-3-b
-    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "?Image-*-${RPI_MODEL}-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
-    ;;
-esac
-
-export KERNEL_URL=${PUBLISH_SERVER}${PUB_DEST}/${KERNEL_IMG}
-export MODULES_URL=${PUBLISH_SERVER}${PUB_DEST}/${MODULES_IMG}
-export NFSROOTFS_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_TARXZ_IMG}
-export DTB_URL=${PUBLISH_SERVER}${PUB_DEST}/${DTB_IMG}
-export IMAGE_URL=${PUBLISH_SERVER}${PUB_DEST}/${DISK_IMG}
-
-rm -rf configs
-git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-# Install jinja2-cli and ruamel.yaml
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
-
-[ -z "${DEVICE_TYPE}" ] || \
-python configs/openembedded-lkft/submit_for_testing.py \
-  --device-type ${DEVICE_TYPE} \
-  --build-number ${BUILD_NUMBER} \
-  --lava-server ${LAVA_SERVER} \
-  --qa-server ${QA_SERVER} \
-  --qa-server-team ${QA_SERVER_TEAM} \
-  --qa-server-project ${QA_SERVER_PROJECT} \
-  --git-commit ${MANIFEST_COMMIT} \
-  --template-path configs/mbl-openembedded/lava-job-definitions \
-  --template-names template.yaml
diff --git a/milo-kbuilder.yaml b/milo-kbuilder.yaml
deleted file mode 100644
index 7c0052cb02..0000000000
--- a/milo-kbuilder.yaml
+++ /dev/null
@@ -1,234 +0,0 @@
-- job:
-    name: milo-kbuilder
-    project-type: matrix
-    defaults: global
-    parameters:
-        - string:
-            name: ARCH_LIST
-            default: 'arm'
-        - string:
-            name: DEFCONFIG_LIST
-            default: 'defconfig'
-        - string:
-            name: TREE
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
-        - string:
-            name: BRANCH
-            default: 'master'
-        - string:
-            name: COMMIT_ID
-            default: ''
-        - string:
-            name: TREE_NAME
-            default: 'milo-test'
-        - bool:
-            name: PUBLISH
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            khilman@kernel.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-            milo.casagrande@linaro.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 3
-            num-to-keep: 5
-        - throttle:
-            max-total: 6
-            option: project
-        - inject
-    disabled: false
-    node: x86_64
-    retry-count: 3
-    child-workspace: .
-    display-name: 'milo - kbuilder'
-    auth-token: ${AUTH_TOKEN}
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - kernel_build_vps
-        - axis:
-            type: dynamic
-            name: arch
-            values:
-                - ARCH_LIST
-        - axis:
-            type: dynamic
-            name: defconfig
-            values:
-                - DEFCONFIG_LIST
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: x86_64
-        - timeout:
-            timeout: 45
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-
-            # local copy of build scripts
-            if [ ! -d local ]; then
-              mkdir -p local
-              (cd local; git clone --depth=1 https://github.com/MiloCasagrande/kernelci-build.git)
-            fi
-
-            (cd local/kernelci-build; git pull)
-            export PATH=${WORKSPACE}/local/kernelci-build:${PATH}
-
-            # Ensure TREE URL is decoded
-            TREE=`python -c "import urllib, sys; print urllib.unquote(sys.argv[1])" ${TREE}`
-            BRANCH=`python -c "import urllib, sys; print urllib.unquote(sys.argv[1])" ${BRANCH}`
-
-            #
-            # Kernel tree -- clone Linus' tree and add ${TREE} as remote.  This takes advantage
-            # of all the tags in Linus' tree for more useful git-describe output.
-            #
-            MIRROR=/srv/mirrors/linux.git
-            REFSPEC=+refs/heads/${BRANCH}:refs/remotes/origin/${BRANCH}
-            if [ -e ${TREE_NAME} ]; then
-                cd ${TREE_NAME} && \
-                timeout --preserve-status -k 10s 5m git fetch --tags linus && \
-                timeout --preserve-status -k 10s 5m git fetch --tags ${TREE} ${REFSPEC}
-            else
-              git clone -o linus --reference ${MIRROR} https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ${TREE_NAME}
-              cd ${TREE_NAME} && \
-              git remote add origin ${TREE} && \
-              timeout --preserve-status -k 10s 5m git fetch origin
-            #   (cd ${TREE_NAME}; git remote add origin ${TREE}; git fetch origin ${REFSPEC})
-            fi
-            if [ $? != 0 ]; then
-              exit 1
-            fi
-
-            cd ${TREE_NAME}
-            #rm -rf _install_
-            git clean -df
-            timeout --preserve-status -k 10s 5m git fetch origin ${REFSPEC}
-            if [ $? != 0 ]; then
-              exit 1
-            fi
-            if [ -z ${COMMIT_ID} ]; then
-              git checkout -f origin/${BRANCH}
-            else
-              git checkout -f origin/${BRANCH}
-              git branch -D local/${BRANCH}
-              git checkout -b local/${BRANCH} -f ${COMMIT_ID}
-            fi
-            if [ $? != 0 ]; then
-              exit 1
-            fi
-
-            # Ensure abbrev SHA1s are 12 chars
-            git config --global core.abbrev 12
-
-            # Only use v3.x tags in arm-soc tree
-            unset describe_args
-            [ ${TREE_NAME} = "arm-soc" ] && describe_args="--match=v\*"
-            GIT_DESCRIBE=$(eval git describe $describe_args)
-            GIT_DESCRIBE=${GIT_DESCRIBE//\//_}  # replace any '/' with '_'
-            echo GIT_DESCRIBE=${GIT_DESCRIBE} > env.properties
-
-            #export CCACHE_DISABLE=true
-
-            # Convert defconfig of form "foo+bar" into "foo -c bar"
-            defconfig_translated=`echo ${defconfig} | sed 's/\+/ \-c /g'`
-
-            # Build kernel/modules and install (default: ./_install_ dir)
-            export LANG=C
-            export ARCH=${arch}
-            if [ $PUBLISH != true ]; then
-                buildv2.py -i -q -d -c ${defconfig_translated}
-            else
-                buildv2.py -i -q -d -p production -c ${defconfig_translated}
-            fi
-            RC=$?
-
-            # Remove the build output (important stuff in _install_ dir)
-            rm -rf build
-
-            echo "Kernel build result: ${RC}"
-            echo ${RC} > build.result
-
-            # Always return success here so pass/fail results can still be published
-            exit 0
-
-        - inject:
-            properties-file: ${TREE_NAME}/env.properties
-
-        - shell: |
-            #!/bin/bash
-            #
-            # This script determines overall result of jenkins job
-            #
-            exit `cat ${TREE_NAME}/build.result`
-
-            echo "Old build number"
-            echo $PREV_BUILD_NUMBER
-
-            BUILD_DIR=${TREE_NAME}/_install_/${GIT_DESCRIBE}/${arch}-${defconfig}
-            BUILD_META=${BUILD_DIR}/build.meta
-
-            grep build_result: ${BUILD_META} |grep -cq PASS
-            RC=$?
-
-            exit $RC
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.getEnvironment(manager.listener)['BUILD_NUMBER']
-                def tree_name = manager.build.getEnvironment(manager.listener)['TREE_NAME']
-                def branch = manager.build.getEnvironment(manager.listener)["BRANCH"]
-                def description = manager.build.getEnvironment(manager.listener)['GIT_DESCRIBE']
-                def arch = manager.build.getEnvironment(manager.listener)['ARCH_LIST']
-                def publish = manager.build.getEnvironment(manager.listener)['PUBLISH']
-                def resultsUrl="https://kernelci.org/build/${tree_name}/kernel/${description}/"
-
-                def jobDescription = "&nbsp;ARCH: ${arch}"
-                // FIXME: resultsURL is only valid when PUBLISH = "true"
-                jobDescription = jobDescription + ",&nbsp;<a href='${resultsUrl}'>Results db</a>"
-
-                manager.build.setDisplayName("#" + build_number + "-" + tree_name + '/' + branch + "-" + description)
-                manager.build.setDescription(jobDescription)
-
-                def cause = manager.build.getAction(hudson.model.CauseAction.class).getCauses()
-                def upstreamBuild = cause[0].upstreamBuild
-                def upstreamProject = cause[0].upstreamProject
-                def jobName = upstreamProject
-                def jobConfiguration = upstreamProject
-
-                // Multi-configuration project
-                if (upstreamProject.contains("/")) {
-                  jobName = upstreamProject.split("/")[0]
-                  jobConfiguration = upstreamProject.split("/")[1]
-                }
-
-                def jobs = hudson.model.Hudson.instance.getItem(jobName).getAllJobs()
-
-                for (job in jobs) {
-                  if(job.name == jobConfiguration) {
-                    job.getLastBuild().setDisplayName("#" + build_number + "-" + tree_name + '/' + branch + "-" + description)
-                    job.getLastBuild().setDescription(jobDescription)
-                  }
-                }
-        - trigger-parameterized-builds:
-            - project: milo-kernel-build-complete
-              property-file: ${TREE_NAME}/env.properties
-              condition: ALWAYS
-              predefined-parameters: |
-                  PUBLISH=${PUBLISH}
-                  TREE_NAME=${TREE_NAME}
-                  ARCH_LIST=${ARCH_LIST}
-                  GIT_DESCRIBE=${GIT_DESCRIBE}
diff --git a/milo-kernel-build-complete.yaml b/milo-kernel-build-complete.yaml
deleted file mode 100644
index 46738022ce..0000000000
--- a/milo-kernel-build-complete.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- job:
-    name: milo-kernel-build-complete
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 5
-        numToKeep: 5
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            milo.casagrande@linaro.org:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: TREE_NAME
-            default: ''
-        - string:
-            name: PUBLISH
-            default: ''
-        - string:
-            name: GIT_DESCRIBE
-            default: ''
-        - string:
-            name: ARCH_LIST
-            default: ''
-        - text:
-            name: RESULTS
-            default: 'No Results'
-    disabled: false
-    node: kci-x86_64-build-complete-01
-    display-name: 'milo - Kernel build complete'
-    scm:
-        - git:
-            url: https://github.com/MiloCasagrande/kernelci-build-complete.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: local/kernelci-build
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            bash -x ./local/kernelci-build/build-complete.sh
diff --git a/ml-benchmarks.yaml b/ml-benchmarks.yaml
new file mode 100644
index 0000000000..c43eca3093
--- /dev/null
+++ b/ml-benchmarks.yaml
@@ -0,0 +1,131 @@
+- job:
+    name: ml-benchmarks
+    project-type: freestyle
+    defaults: global
+    description: |
+        Benchmarks for ML applications, including TVM, Tensorflow, ONNX, and ARMNN
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://github.com/tom-gall/tvm-bench
+
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+    disabled: false
+    node: docker-bionic-arm64
+    display-name: 'ML-Bench Benchmarks'
+
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash -ex
+
+            export DEVICE_TYPE=hi960-hikey
+
+           
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=ml-bench
+            PROJECT=projects/ml-bench/
+            BOOT_URL=http://snapshots.linaro.org/96boards/hikey/linaro/debian/30/boot-linaro-stretch-developer-hikey-20190420-30.img.gz
+            BOOT_URL_COMP=gz
+            ROOTFS_URL=http://snapshots.linaro.org/96boards/hikey/linaro/debian/30/rootfs-linaro-stretch-developer-hikey-20190420-30.img.gz
+            ROOTFS_URL_COMP=gz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            BUILD_NUMBER=${BUILD_NUMBER}
+            EOF
+
+            git clone --depth 1 https://github.com/Linaro/lava-test-plans.git
+
+            # submit tests to LAVA
+            rm -rf venv | true
+            virtualenv -p python3 venv
+            source ./venv/bin/activate
+
+            # fix for setuptools v50
+            export SETUPTOOLS_USE_DISTUTILS="stdlib"
+            cd lava-test-plans
+            pip3 install -r requirements.txt
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan ml-bench \
+              --qa-server-team armnn \
+              --qa-server-project ml-bench \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
+
+            export DEVICE_TYPE=synquacer
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=ml-bench
+            PROJECT=projects/ml-bench/
+            AUTO_LOGIN_PASSWORD_PROMPT='Password:'
+            AUTO_LOGIN_PASSWORD='Linaro123'
+            KERNEL_URL=http://images.validation.linaro.org/synquacer/hc/vmlinuz
+            RAMDISK_URL=http://images.validation.linaro.org/synquacer/hc/initrd.img
+            RAMDISK_URL_COMP=gz
+            ROOTFS_URL=http://images.validation.linaro.org/synquacer/hc/rootfs.tar.xz
+            ROOTFS_URL_COMP=xz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            EOF
+
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan ml-bench \
+              --qa-server-team armnn \
+              --qa-server-project ml-bench \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
+
+            export DEVICE_TYPE=dragonboard-845c
+
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            LAVA_JOB_PRIORITY=50
+            PROJECT_NAME=ml-bench
+            PROJECT=projects/ml-bench/
+            PTABLE_URL=https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/28/dragonboard-845c-bootloader-ufs-linux-28/gpt_both0.bin
+            BOOT_URL=http://images.validation.linaro.org/releases.linaro.org/96boards/dragonboard845c/linaro/debian/19.09/boot-linaro-buster-dragonboard-845c-58.img.gz
+            BOOT_URL_COMP=gz
+            ROOTFS_URL=http://images.validation.linaro.org/releases.linaro.org/96boards/dragonboard845c/linaro/debian/19.09/linaro-buster-alip-dragonboard-845c-58.img.gz
+            ROOTFS_URL_COMP=gz
+            DEPLOY_OS=debian
+            OS_INFO=debian
+            DEVICE_TYPE=${DEVICE_TYPE}
+            BUILD_NUMBER=${BUILD_NUMBER}
+            EOF
+
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type ${DEVICE_TYPE} \
+              --test-plan ml-bench \
+              --qa-server-team armnn \
+              --qa-server-project ml-bench \
+              --lava-server ${LAVA_SERVER} \
+              --build-id ${LAVA_ID}
diff --git a/mmwg-openembedded-dunfell.yaml b/mmwg-openembedded-dunfell.yaml
new file mode 100644
index 0000000000..b3318f317a
--- /dev/null
+++ b/mmwg-openembedded-dunfell.yaml
@@ -0,0 +1,108 @@
+- job:
+    name: mmwg-openembedded-dunfell
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'lhg-westeros-wpe-image'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'dunfell'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/pre-built/mmwg/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'openembedded-dunfell'
+
+    disabled: true
+    node: lhg
+    display-name: 'MMWG - OpenEmbedded (Dunfell)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - imx8mqevk
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb-wayland
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-stretch-amd64-lhg
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
+              am57xx-evm)
+                DEVICE_TYPE=am57xx-evm
+                ;;
+              *)
+                echo "Skip DEVICE_TYPE for ${MACHINE}"
+                ;;
+            esac
+
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - shell:
+            !include-raw: lhg-oe-build/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - inject:
+            properties-file: submit_for_testing_parameters
+        - shell:
+            !include-raw: lhg-oe-build/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'out/*'
+        - email:
+            recipients: 'andrey.konovalov@linaro.org peter.griffin@linaro.org manikandan.krishnasamy@linaro.org'
diff --git a/mmwg-openembedded-widevine-dunfell.yaml b/mmwg-openembedded-widevine-dunfell.yaml
new file mode 100644
index 0000000000..eddd4a4be9
--- /dev/null
+++ b/mmwg-openembedded-widevine-dunfell.yaml
@@ -0,0 +1,78 @@
+- job:
+    name: mmwg-openembedded-widevine-dunfell
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            everyone-flat:
+                - job-read
+            private-security-widevine:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'rpb-console-widevine lhg-westeros-wpe-image'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/linaro-mmwg/lhg-oe-manifests.git'
+        - string:
+            name: MANIFEST_BRANCH_PREFIX
+            default: 'drm/'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'dunfell'
+        - string:
+            name: BASE_URL
+            default: 'http://snapshots.linaro.org/'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/pre-built/mmwg-widevine/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
+        - string:
+            name: GIT_SSH_COMMAND
+            default: 'ssh -F ${HOME}/lhg-review.sshconfig'
+        - string:
+            name: AUTH_GROUPS
+            default: 'private-security-widevine'
+    disabled: true
+    node: master
+    display-name: 'MMWG Widevine - OpenEmbedded (Dunfell)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'imx8mqevk'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - rpb-wayland
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-stretch-amd64-lhg
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '8ed98f80-b4d8-4861-9a8a-15f1e89ba083'
+    builders:
+        - shell:
+            !include-raw: rpb-openembedded/builders-lhg.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/buildinfo-protected.sh
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
diff --git a/netlib-java.yaml b/netlib-java.yaml
deleted file mode 100644
index 0605636d9a..0000000000
--- a/netlib-java.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-- job:
-    name: netlib-java
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'netlib-java'
-    scm:
-        - git:
-            url: https://github.com/fommil/netlib-java.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: netlib-java
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell:
-            !include-raw: netlib-java/builder.sh
-    publishers:
-        - archive:
-            artifacts: 'com/github/fommil/**'
diff --git a/netlib-java/builder.sh b/netlib-java/builder.sh
deleted file mode 100755
index 47e7695458..0000000000
--- a/netlib-java/builder.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash
-
-set -e
-
-# install pre-requisites
-sudo apt-get -q=2 update
-sudo apt-get -q=2 install -y --no-install-recommends \
-  build-essential \
-  gfortran \
-  git \
-  libblas-dev \
-  liblapack-dev
-
-# download jniloader
-git clone --depth 1 https://github.com/fommil/jniloader.git
-
-# download OpenJDK 8 and Maven 3.3.9 explicitely
-wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL}
-tar -Jxf jdk*.tar.xz
-tar -zxf apache-maven-*.tar.gz
-
-# replace cacerts with distro-supplied
-cd jdk*/jre/lib/security/
-rm -f cacerts
-ln -s /etc/ssl/certs/java/cacerts
-
-# set JAVA_HOME
-cd ${WORKSPACE}/jdk*
-export JAVA_HOME=${PWD}
-
-# set M3_HOME
-cd ${WORKSPACE}/apache-maven-*
-export M3_HOME=${PWD}
-
-# set PATH
-export PATH=${JAVA_HOME}/bin:${M3_HOME}/bin:${PATH}
-java -version
-mvn -version
-
-# build and hookup jniloader
-cd ${WORKSPACE}/jniloader
-mvn -B -Dgpg.skip clean install
-
-cat << EOF > ${WORKSPACE}/netlib-java/bump-lombok-jniloader-version.patch
---- a/pom.xml
-+++ b/pom.xml
-@@ -181,7 +181,7 @@
-             <dependency>
-                 <groupId>org.projectlombok</groupId>
-                 <artifactId>lombok</artifactId>
--                <version>1.12.2</version>
-+                <version>1.12.6</version>
-                 <scope>provided</scope>
-             </dependency>
-             <dependency>
-@@ -209,7 +209,7 @@
-             <dependency>
-                 <groupId>com.github.fommil</groupId>
-                 <artifactId>jniloader</artifactId>
--                <version>1.1</version>
-+                <version>1.2-SNAPSHOT</version>
-             </dependency>
-             <dependency>
-                 <groupId>net.sf.opencsv</groupId>
-EOF
-
-# build and hookup netlib-java
-ARCH=$(uname -m)
-(cd ${WORKSPACE}/netlib-java && patch -p1 < bump-lombok-jniloader-version.patch)
-(cd ${WORKSPACE}/netlib-java/generator && mvn -B -Dgpg.skip clean install)
-(cd ${WORKSPACE}/netlib-java/core && mvn -B -Dgpg.skip clean install)
-(cd ${WORKSPACE}/netlib-java && mvn -B -Dgpg.skip -P${ARCH}-profile clean install)
-(cd ${WORKSPACE}/netlib-java/native_ref/xbuilds && mvn -B -Dgpg.skip -P${ARCH}-profile clean install)
-(cd ${WORKSPACE}/netlib-java/native_system/xbuilds && mvn -B -Dgpg.skip -P${ARCH}-profile clean install)
-
-# prepare to archive the build artifacts
-rm -rf ${WORKSPACE}/com && mkdir -p ${WORKSPACE}/com/github
-cp -a ${HOME}/.m2/repository/com/github/fommil ${WORKSPACE}/com/github/
diff --git a/odp-dpdk-ofp-nginx-httperf.yaml b/odp-dpdk-ofp-nginx-httperf.yaml
deleted file mode 100644
index d67e99b6e9..0000000000
--- a/odp-dpdk-ofp-nginx-httperf.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-- job:
-    name: odp-dpdk-ofp-nginx-httperf
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 30
-    parameters:
-        - string:
-            name: LAVA_SERVER
-            default: 'lng.validation.linaro.org/RPC2/'
-        - string:
-            name: DEB_REPO_URL
-            default: 'http://deb.opendataplane.org'
-    disabled: false
-    node: master
-    display-name: 'NGiNX port to OFP ODP-DPDK performance testing'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            sed -e "s|\${DEB_REPO_URL}|${DEB_REPO_URL}|" \
-                configs/odp/lava-job-definitions/x86/odp-dpdk-ofp-nginx.yaml \
-                > custom_lava_job_definition.yaml
-
-            cat << EOF > post_build_lava_parameters
-            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
-            DEVICE_TYPE=x86
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org josep.puigdemont@linaro.org'
diff --git a/odpi-bigtop-deb.yaml b/odpi-bigtop-deb.yaml
deleted file mode 100644
index 7d3a9e088e..0000000000
--- a/odpi-bigtop-deb.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: odpi-bigtop-deb
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: ANT_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-        - string:
-            name: SCALA_URL
-            default: 'http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz'
-        - string:
-            name: NODE_URL
-            default: 'https://nodejs.org/dist/v4.2.1/node-v4.2.1.tar.gz'
-        - string:
-            name: PROTOBUF_URL
-            default: 'https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz'
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'ODPi BigTop (deb)'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # number of CPU_CORES to build with
-            export CPU_CORES=$(getconf _NPROCESSORS_ONLN)
-
-            # install pre-requisites
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends \
-              ant \
-              asciidoc \
-              chrpath \
-              cmake \
-              fuse \
-              libcppunit-dev \
-              libfuse-dev \
-              libjansson-dev \
-              libkrb5-dev \
-              libldap2-dev \
-              liblzo2-dev \
-              libmysqlclient-dev \
-              libsasl2-dev \
-              libsnappy-dev \
-              libsqlite3-dev \
-              libssl-dev \
-              libxml2-dev \
-              libxslt1-dev \
-              libzip-dev \
-              pkg-config \
-              python-dev \
-              python-setuptools \
-              rsync \
-              sharutils \
-              subversion \
-              xmlto
-
-            # download OpenJDK and Maven explicitely
-            wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL} ${SCALA_URL} ${NODE_URL} ${PROTOBUF_URL}
-            tar -Jxf jdk*.tar.xz
-            tar -zxf apache-maven-*.tar.gz
-            tar -zxf scala-*.tgz
-            tar -zxf node-*.tar.gz
-            tar -zxf protobuf-*.tar.gz
-
-            # replace cacerts with distro-supplied
-            cd jdk*/jre/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            # set JAVA_HOME
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            # set M3_HOME
-            cd ${WORKSPACE}/apache-maven-*
-            export M3_HOME=${PWD}
-
-            # FIXME switch to nexus.linaro.org
-            # hack to use archiva
-            #wget -q http://people.linaro.org/~fathi.boudra/settings.xml -O conf/settings.xml
-            #mkdir ~/.m2
-            #cp -a conf/settings.xml ~/.m2/settings.xml
-
-            # set SCALA_HOME
-            cd ${WORKSPACE}/scala-*
-            export SCALA_HOME=${PWD}
-
-            # set PATH
-            export PATH=${JAVA_HOME}/bin:${M3_HOME}/bin:${PATH}
-            java -version
-            mvn -version
-
-            # build and hookup nodejs
-            cd ${WORKSPACE}/node-*
-            ./configure --prefix=${WORKSPACE}/node
-            make -j${CPU_CORES} install
-            export PATH=${WORKSPACE}/node/bin/:${PATH}
-
-            # build and hookup protobuf compiler
-            cd ${WORKSPACE}/protobuf-*
-            ./configure --prefix=${WORKSPACE}/protobuf
-            make -j${CPU_CORES} install
-            export PATH=${WORKSPACE}/protobuf/bin:${PATH}
-            export PKG_CONFIG_PATH=${WORKSPACE}/protobuf/lib/pkgconfig
-
-            # clone the ODPi BigTop definitions
-            git clone --depth 1 https://git.linaro.org/leg/bigdata/bigtop-trunk.git -b erp17.08 ${WORKSPACE}/odpi-bigtop
-            cd ${WORKSPACE}/odpi-bigtop
-
-            # FIXME Upstream protobuf version 2.5.0 does not support AArch64. Bump up to 2.6.1.
-            git config --global user.name "Linaro CI"
-            git config --global user.email "ci_notify@linaro.org"
-            git remote add scapper https://git.linaro.org/people/steve.capper/odpi-bigtop.git
-            git fetch scapper
-            git cherry-pick 3033ede8c0a0ede0323c4e8c946d1293ed64729c
-            git cherry-pick a4ef371718fc32d25cc01137e559da4079368773
-
-            # okay everything is in place, this build will take a while
-            ./gradlew clean hadoop-deb spark-deb hive-deb \
-              -Pdist,native-win \
-              -DskipTests \
-              -Dtar \
-              -Dmaven.javadoc.skip=true \
-              -PHadoop-2.7 \
-              -Pyarn \
-              -Phadoop.version=2.7.0 \
-              -Dscala-2.11 \
-              --debug
-    publishers:
-        - archive:
-            artifacts: 'odpi-bigtop/output/**'
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/odpi-bigtop-hadoop-rpm.yaml b/odpi-bigtop-hadoop-rpm.yaml
deleted file mode 100644
index 264cb5afdf..0000000000
--- a/odpi-bigtop-hadoop-rpm.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- job:
-    name: odpi-bigtop-hadoop-rpm
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            leg-developers:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ANT_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-        - string:
-            name: SCALA_URL
-            default: 'http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz'
-        - string:
-            name: NODE_URL
-            default: 'https://nodejs.org/dist/v4.2.1/node-v4.2.1.tar.gz'
-        - string:
-            name: PROTOBUF_URL
-            default: 'https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz'
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'ODPi BigTop Hadoop (rpm)'
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw:
-                - odpi-bigtop-rpm/common/builders.sh
-                - odpi-bigtop-rpm/hadoop/builders.sh
-    publishers:
-        - archive:
-            artifacts: 'odpi-bigtop/output/**'
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/odpi-bigtop-hive-rpm.yaml b/odpi-bigtop-hive-rpm.yaml
deleted file mode 100644
index 72ce04e4e5..0000000000
--- a/odpi-bigtop-hive-rpm.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- job:
-    name: odpi-bigtop-hive-rpm
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ANT_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-        - string:
-            name: SCALA_URL
-            default: 'http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz'
-        - string:
-            name: NODE_URL
-            default: 'https://nodejs.org/dist/v4.2.1/node-v4.2.1.tar.gz'
-        - string:
-            name: PROTOBUF_URL
-            default: 'https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz'
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'ODPi BigTop Hive (rpm)'
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw:
-                - odpi-bigtop-rpm/common/builders.sh
-                - odpi-bigtop-rpm/hive/builders.sh
-    publishers:
-        - archive:
-            artifacts: 'odpi-bigtop/output/**'
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/odpi-bigtop-rpm.yaml b/odpi-bigtop-rpm.yaml
deleted file mode 100644
index 05c109bc3d..0000000000
--- a/odpi-bigtop-rpm.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- job:
-    name: odpi-bigtop-rpm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: master
-    display-name: 'Trigger ODPi BigTop (rpm)'
-    builders:
-        - trigger-builds:
-            - project:
-                - 'odpi-bigtop-hadoop-rpm'
-                - 'odpi-bigtop-hive-rpm'
-                - 'odpi-bigtop-spark-rpm'
diff --git a/odpi-bigtop-rpm/common/builders.sh b/odpi-bigtop-rpm/common/builders.sh
deleted file mode 100755
index 0bb6d3ea68..0000000000
--- a/odpi-bigtop-rpm/common/builders.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-# number of CPU_CORES to build with
-export CPU_CORES=$(getconf _NPROCESSORS_ONLN)
-
-# install pre-requisites
-sudo yum install -y \
-  apache-ivy \
-  ant \
-  asciidoc \
-  chrpath \
-  cmake \
-  cppunit-devel \
-  cyrus-sasl-devel \
-  fuse \
-  fuse-devel \
-  gcc-c++ \
-  jansson-devel \
-  krb5-devel \
-  lcms2-devel \
-  libtool \
-  libxml2-devel \
-  libxslt-devel \
-  libyaml-devel \
-  libzip-devel \
-  lzo-devel \
-  make \
-  mariadb-devel \
-  java-1.8.0-openjdk \
-  openldap-devel \
-  openssl-devel \
-  pkgconfig \
-  python-devel \
-  python-setuptools \
-  rpm-build \
-  rsync \
-  sharutils \
-  snappy-devel \
-  sqlite-devel \
-  subversion \
-  unzip \
-  wget \
-  xmlto
-
-# download some dependencies explicitely
-wget --progress=dot -e dotbytes=2M ${MAVEN_URL} ${SCALA_URL} ${NODE_URL} ${PROTOBUF_URL}
-tar -zxf apache-maven-*.tar.gz
-tar -zxf scala-*.tgz
-tar -zxf node-*.tar.gz
-tar -zxf protobuf-*.tar.gz
-
-# set M3_HOME
-cd ${WORKSPACE}/apache-maven-*
-export M3_HOME=${PWD}
-
-# FIXME switch to nexus.linaro.org
-# hack to use archiva
-#wget -q http://people.linaro.org/~fathi.boudra/settings.xml -O conf/settings.xml
-#mkdir ~/.m2
-#cp -a conf/settings.xml ~/.m2/settings.xml
-
-# set SCALA_HOME
-cd ${WORKSPACE}/scala-*
-export SCALA_HOME=${PWD}
-
-# set PATH
-export PATH=${M3_HOME}/bin:${PATH}
-java -version
-mvn -version
-
-# build and hookup nodejs
-cd ${WORKSPACE}/node-*
-./configure --prefix=${WORKSPACE}/node
-make -j${CPU_CORES} install
-export PATH=${WORKSPACE}/node/bin/:${PATH}
-
-# build and hookup protobuf compiler
-cd ${WORKSPACE}/protobuf-*
-./configure --prefix=${WORKSPACE}/protobuf
-make -j${CPU_CORES} install
-export PATH=${WORKSPACE}/protobuf/bin:${PATH}
-export PKG_CONFIG_PATH=${WORKSPACE}/protobuf/lib/pkgconfig
-
-# clone the ODPi BigTop definitions
-git clone --depth 1 https://git.linaro.org/leg/bigdata/bigtop-trunk.git -b erp17.08 ${WORKSPACE}/odpi-bigtop
-cd ${WORKSPACE}/odpi-bigtop
-
-# FIXME Upstream protobuf version 2.5.0 does not support AArch64. Bump up to 2.6.1.
-git config --global user.name "Linaro CI"
-git config --global user.email "ci_notify@linaro.org"
-git remote add scapper https://git.linaro.org/people/steve.capper/odpi-bigtop.git
-git fetch scapper
-git cherry-pick 3033ede8c0a0ede0323c4e8c946d1293ed64729c
-git cherry-pick a4ef371718fc32d25cc01137e559da4079368773
diff --git a/odpi-bigtop-rpm/hadoop/builders.sh b/odpi-bigtop-rpm/hadoop/builders.sh
deleted file mode 100755
index 0628a982a9..0000000000
--- a/odpi-bigtop-rpm/hadoop/builders.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-# okay everything is in place, this build will take a while
-./gradlew clean hadoop-rpm \
-  -Pdist,native-win \
-  -DskipTests \
-  -Dtar \
-  -Dmaven.javadoc.skip=true \
-  --debug
diff --git a/odpi-bigtop-rpm/hive/builders.sh b/odpi-bigtop-rpm/hive/builders.sh
deleted file mode 100755
index 66bb92bb07..0000000000
--- a/odpi-bigtop-rpm/hive/builders.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-# okay everything is in place, this build will take a while
-./gradlew clean hive-rpm \
-  -Pdist,native-win \
-  -DskipTests \
-  -Dtar \
-  -Dmaven.javadoc.skip=true \
-  -PHadoop-2.7 \
-  -Phadoop.version=2.7.3 \
-  --debug
diff --git a/odpi-bigtop-rpm/spark/builders.sh b/odpi-bigtop-rpm/spark/builders.sh
deleted file mode 100755
index 83566c10be..0000000000
--- a/odpi-bigtop-rpm/spark/builders.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-# okay everything is in place, this build will take a while
-./gradlew clean spark-rpm \
-  -Pdist,native-win \
-  -DskipTests \
-  -Dtar \
-  -Dmaven.javadoc.skip=true \
-  -PHadoop-2.7 \
-  -Pyarn \
-  -Phadoop.version=2.7.3 \
-  -Dscala-2.11 \
-  --debug
diff --git a/odpi-bigtop-spark-rpm.yaml b/odpi-bigtop-spark-rpm.yaml
deleted file mode 100644
index 927af6b379..0000000000
--- a/odpi-bigtop-spark-rpm.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-- job:
-    name: odpi-bigtop-spark-rpm
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: ANT_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_OPTS
-            default: '-Xmx8G'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-        - string:
-            name: SCALA_URL
-            default: 'http://downloads.typesafe.com/scala/2.11.7/scala-2.11.7.tgz'
-        - string:
-            name: NODE_URL
-            default: 'https://nodejs.org/dist/v4.2.1/node-v4.2.1.tar.gz'
-        - string:
-            name: PROTOBUF_URL
-            default: 'https://github.com/google/protobuf/releases/download/v2.6.1/protobuf-2.6.1.tar.gz'
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'ODPi BigTop Spark (rpm)'
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw:
-                - odpi-bigtop-rpm/common/builders.sh
-                - odpi-bigtop-rpm/spark/builders.sh
-    publishers:
-        - archive:
-            artifacts: 'odpi-bigtop/output/**'
-        - email-ext:
-            recipients: 'leg-bigdata@linaro.org, fathi.boudra@linaro.org'
diff --git a/ofp-perf-tests.yaml b/ofp-perf-tests.yaml
deleted file mode 100644
index 423a47f212..0000000000
--- a/ofp-perf-tests.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-- job:
-    name: ofp-perf-tests
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 30
-    parameters:
-        - string:
-            name: LAVA_SERVER
-            default: 'lng.validation.linaro.org/RPC2/'
-    disabled: false
-    node: master
-    display-name: 'OFP performance tests'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            rm -rf ofp_ci
-            git clone --depth 1 http://git.linaro.org/lng/ofp_ci.git
-
-            cat << EOF > ofp_fpm_burstmode_x86_dpdk_4_cores
-            CUSTOM_YAML_URL=${JOB_URL}/ws/ofp_ci/ofp_fpm_burstmode/ofp_fpm_burstmode_x86_dpdk_4_cores.yaml
-            DEVICE_TYPE=x86
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: ofp_fpm_burstmode_x86_dpdk_4_cores
-              block: true
-        - shell: |
-            #!/bin/bash -e
-
-            cat << EOF > ofp_udp_fwd_socket_x86_dpdk_2_cores
-            CUSTOM_YAML_URL=${JOB_URL}/ws/ofp_ci/ofp_udp_fwd_socket/ofp_udp_fwd_socket_x86_dpdk_2_cores.yaml
-            DEVICE_TYPE=x86
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: ofp_udp_fwd_socket_x86_dpdk_2_cores
-              block: true
-        - shell: |
-            #!/bin/bash -e
-
-            cat << EOF > ofp_webserver2_x86_dpdk_4_cores_direct_rss
-            CUSTOM_YAML_URL=${JOB_URL}/ws/ofp_ci/ofp_webserver2/ofp_webserver2_x86_dpdk_4_cores_direct_rss.yaml
-            DEVICE_TYPE=x86
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: ofp_webserver2_x86_dpdk_4_cores_direct_rss
-              block: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org bogdan.pricope@linaro.org'
diff --git a/openembedded-armv7a-pre-built-images.yaml b/openembedded-armv7a-pre-built-images.yaml
index 954e002068..4dabe42195 100644
--- a/openembedded-armv7a-pre-built-images.yaml
+++ b/openembedded-armv7a-pre-built-images.yaml
@@ -20,7 +20,7 @@
         - string:
             name: gcc_version
             default: '5.2'
-    disabled: false
+    disabled: true
     node: master
     child-workspace: .
     display-name: 'OpenEmbedded pre-built images (ARMv7-A)'
@@ -84,7 +84,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER} openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}
@@ -119,6 +119,7 @@
             python daily-prebuilt-images/lava-submit.py
     publishers:
         - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org'
+            recipients: 'fathi.boudra@linaro.org'
             attach-build-log: true
             matrix-trigger: both
+
diff --git a/openembedded-armv7a-rootfs.yaml b/openembedded-armv7a-rootfs.yaml
deleted file mode 100644
index e54c7546aa..0000000000
--- a/openembedded-armv7a-rootfs.yaml
+++ /dev/null
@@ -1,96 +0,0 @@
-- job:
-    name: openembedded-armv7a-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'OpenEmbedded rootfs (ARMv7-A)'
-    scm:
-        - git:
-            url: https://git.linaro.org/openembedded/jenkins-setup.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - timed: '@weekly'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: gcc_version
-            values:
-                - 6.2
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - lamp
-                - minimal
-                - minimal-initramfs
-                - toolchain-benchmark
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'rootfs=="minimal"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export PATH="$HOME/bin:$PATH"
-
-            # we clean build and populate it from cache
-            bash -x pre-build-do-cleanup.sh
-
-            # set init-and-build flags based on image type
-            init_flags=
-            [ "${rootfs}" = "lng" ] && init_flags="-p"
-            build_image="linaro-image-${rootfs}"
-            [ "${rootfs}" = "alip" ] && build_image="${build_image} linaro-sysroot-alip"
-            # do a build
-            bash -x init-and-build.sh -a armv7a -g ${gcc_version} ${init_flags} ${build_image}
-
-            cd ${WORKSPACE}
-
-            bash -x post-build-create-image-manifest.sh
-            bash -x post-build-sort-out-downloads.sh
-
-            # Capture what we're building in the build output.
-            repo manifest -r
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/ openembedded/images/${rootfs}-armv7a-gcc-${gcc_version}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
diff --git a/openembedded-armv7ab-pre-built-images.yaml b/openembedded-armv7ab-pre-built-images.yaml
index 93c5dd57ac..83d2effc86 100644
--- a/openembedded-armv7ab-pre-built-images.yaml
+++ b/openembedded-armv7ab-pre-built-images.yaml
@@ -20,7 +20,7 @@
         - string:
             name: gcc_version
             default: '5.2'
-    disabled: false
+    disabled: true
     node: master
     child-workspace: .
     display-name: 'OpenEmbedded pre-built images (ARMv7-A big-endian)'
@@ -76,7 +76,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER} openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}
@@ -105,6 +105,7 @@
             python daily-prebuilt-images/lava-submit.py
     publishers:
         - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org'
+            recipients: 'fathi.boudra@linaro.org'
             attach-build-log: true
             matrix-trigger: both
+
diff --git a/openembedded-armv7ab-rootfs.yaml b/openembedded-armv7ab-rootfs.yaml
deleted file mode 100644
index b38e5c37c6..0000000000
--- a/openembedded-armv7ab-rootfs.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-- job:
-    name: openembedded-armv7ab-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'OpenEmbedded rootfs (ARMv7-A big-endian)'
-    scm:
-        - git:
-            url: https://git.linaro.org/openembedded/jenkins-setup.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - timed: '@weekly'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: gcc_version
-            values:
-                - 6.2
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - minimal
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'rootfs=="minimal"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export PATH="$HOME/bin:$PATH"
-
-            # we clean build and populate it from cache
-            bash -x pre-build-do-cleanup.sh
-
-            # set init-and-build flags based on image type
-            init_flags=
-            [ "${rootfs}" = "lng" ] && init_flags="-p"
-            # do a build
-            bash -x init-and-build.sh -a armv7ab -g ${gcc_version} ${init_flags} linaro-image-${rootfs}
-
-            cd ${WORKSPACE}
-
-            bash -x post-build-create-image-manifest.sh
-            bash -x post-build-sort-out-downloads.sh
-
-            # Capture what we're building in the build output.
-            repo manifest -r
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/ openembedded/images/${rootfs}-armv7ab-gcc-${gcc_version}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
diff --git a/openembedded-armv8-ilp32-rootfs.yaml b/openembedded-armv8-ilp32-rootfs.yaml
deleted file mode 100644
index 76bc2db0c7..0000000000
--- a/openembedded-armv8-ilp32-rootfs.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-- job:
-    name: openembedded-armv8-ilp32-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'OpenEmbedded ARMv8 ILP32 rootfs'
-    scm:
-        - git:
-            url: https://git.linaro.org/openembedded/jenkins-setup.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: gcc_version
-            values:
-                - 7.1
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - minimal
-                - minimal-initramfs
-                - minimal-ltp
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'rootfs=="minimal"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export PATH="$HOME/bin:$PATH"
-
-            # we clean build and populate it from cache
-            bash -x pre-build-do-cleanup.sh
-
-            if [ `date +%u` = "6" ] && [ "${rootfs}" = "minimal" ]
-            then
-              echo "manual hard cleanup on day 6"
-              bash periodic-cleanup.sh hard
-            fi
-
-            # do a build
-            if [ "${rootfs}" = "lamp" ]
-            then
-                MACHINE=genericarmv8-ilp32 bash -x init-and-build.sh -a armv8 -g ${gcc_version} linaro-image-${rootfs}
-            else
-                MACHINE=genericarmv8-ilp32 bash -x init-and-build.sh -a armv8 -g ${gcc_version} linaro-image-${rootfs}
-            fi
-
-            cd ${WORKSPACE}
-
-            MACHINE=genericarmv8-ilp32 bash -x post-build-create-image-manifest.sh
-            MACHINE=genericarmv8-ilp32 bash -x post-build-sort-out-downloads.sh
-
-            # Capture what we're building in the build output.
-            repo manifest -r
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/ openembedded/images/${rootfs}-armv8-ilp32-gcc-${gcc_version}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org'
diff --git a/openembedded-armv8-ilp32.yaml b/openembedded-armv8-ilp32.yaml
index 499cdb30c0..83f3e1b063 100644
--- a/openembedded-armv8-ilp32.yaml
+++ b/openembedded-armv8-ilp32.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -123,7 +123,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out/ ${PUB_DEST}
@@ -160,4 +160,4 @@
                       block: true
     publishers:
         - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org daniel.diaz@linaro.org'
+            recipients: 'fathi.boudra@linaro.org daniel.diaz@linaro.org'
diff --git a/openembedded-armv8-luv-netboot-next.yaml b/openembedded-armv8-luv-netboot-next.yaml
new file mode 100644
index 0000000000..c726ead16f
--- /dev/null
+++ b/openembedded-armv8-luv-netboot-next.yaml
@@ -0,0 +1,77 @@
+- job:
+    name: openembedded-armv8-luv-netboot-next
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: MACHINE
+            default: 'qemuarm64'
+        - string:
+            name: DISTRO
+            default: 'luv-netboot'
+        - string:
+            name: BRANCH
+            default: 'next'
+        - string:
+            name: IMAGE
+            default: 'luv-netboot-image'
+    disabled: false
+    node: build
+    display-name: 'Linux UEFI Validation Operating System Netboot (luvOS) for ARMv8 - next'
+    scm:
+        - git:
+            url: https://github.com/01org/luv-yocto.git
+            refspec: +refs/heads/${BRANCH}:refs/remotes/origin/${BRANCH}
+            name: origin
+            branches:
+                - refs/heads/${BRANCH}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - linaro-publish-token
+        - shell:
+            !include-raw: openembedded-armv8-luvos/builders.sh
+        - shell: |
+            #!/bin/bash -e
+
+            rm -rf configs
+            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+            sed -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
+                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
+                -e "s|\${BRANCH}|${BRANCH}|" \
+                -e "s|\${GIT_COMMIT}|${GIT_COMMIT}|" \
+                < configs/openembedded-armv8-luvos/lava-job-definitions/qemu/template.yaml \
+                > custom_lava_job_definition.yaml
+
+            cat << EOF > post_build_lava_parameters
+            DEVICE_TYPE=qemu
+            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
+            LAVA_SERVER=validation.linaro.org/RPC2/
+            EOF
+        - trigger-builds:
+            - project: 'post-build-lava'
+              property-file: post_build_lava_parameters
+              block: true
+    publishers:
+        - email:
+            recipients: 'fathi.boudra@linaro.org naresh.bhat@linaro.org milosz.wasilewski@linaro.org'
diff --git a/openembedded-armv8-luvos-master.yaml b/openembedded-armv8-luvos-master.yaml
index 08e542dcf2..fe9bd81818 100644
--- a/openembedded-armv8-luvos-master.yaml
+++ b/openembedded-armv8-luvos-master.yaml
@@ -11,7 +11,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -26,6 +26,9 @@
         - string:
             name: BRANCH
             default: 'master'
+        - string:
+            name: IMAGE
+            default: 'luv-live-image'
     disabled: false
     node: build
     display-name: 'Linux UEFI Validation Operating System (luvOS) for ARMv8 - master'
diff --git a/openembedded-armv8-luvos-next.yaml b/openembedded-armv8-luvos-next.yaml
index 7abe1aac1f..c52d15d01d 100644
--- a/openembedded-armv8-luvos-next.yaml
+++ b/openembedded-armv8-luvos-next.yaml
@@ -11,7 +11,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -26,9 +26,12 @@
         - string:
             name: BRANCH
             default: 'next'
+        - string:
+            name: IMAGE
+            default: 'luv-live-image'
     disabled: false
     node: build
-    display-name: 'Linux UEFI Validation Operating System (luvOS) for ARMv8 (next)'
+    display-name: 'Linux UEFI Validation Operating System (luvOS) for ARMv8 - next'
     scm:
         - git:
             url: https://github.com/01org/luv-yocto.git
diff --git a/openembedded-armv8-luvos/builders.sh b/openembedded-armv8-luvos/builders.sh
index fd27b5f66e..8325716c55 100755
--- a/openembedded-armv8-luvos/builders.sh
+++ b/openembedded-armv8-luvos/builders.sh
@@ -11,10 +11,8 @@ cleanup_exit()
 }
 
 # Build
-source oe-init-build-env
-echo "BBLAYERS += \" ${WORKSPACE}/meta-oe\"" >> conf/bblayers.conf
-echo "BBLAYERS += \" ${WORKSPACE}/meta-luv\"" >> conf/bblayers.conf
-bitbake luv-live-image
+source luv-setup
+bitbake ${IMAGE}
 
 rm -f ${WORKSPACE}/build/tmp/deploy/images/qemuarm64/*.txt
 find ${WORKSPACE}/build/tmp/deploy/images/qemuarm64 -type l -delete
@@ -22,7 +20,7 @@ find ${WORKSPACE}/build/tmp/deploy/images/qemuarm64 -type l -delete
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --api_version 3 \
   --link-latest \
   ${WORKSPACE}/build/tmp/deploy/images/qemuarm64 openembedded/pre-built/luvos/${BRANCH}/${BUILD_NUMBER}
diff --git a/openembedded-armv8-pre-built-images-lsk-vexpress64.yaml b/openembedded-armv8-pre-built-images-lsk-vexpress64.yaml
index 0bcd3fc5b2..a1d620b0ed 100644
--- a/openembedded-armv8-pre-built-images-lsk-vexpress64.yaml
+++ b/openembedded-armv8-pre-built-images-lsk-vexpress64.yaml
@@ -25,7 +25,7 @@
         - string:
             name: gcc_version
             default: '5.2'
-    disabled: false
+    disabled: true
     node: docker-stretch-amd64
     child-workspace: .
     display-name: 'OpenEmbedded pre-built images (ARMv8-A - LSK)'
@@ -63,7 +63,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER} openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}
@@ -153,4 +153,5 @@
         - archive:
             artifacts: '*.json'
         - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
+            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
+
diff --git a/openembedded-armv8-pre-built-images-lt-vexpress64.yaml b/openembedded-armv8-pre-built-images-lt-vexpress64.yaml
index 8ef57cd2d6..6995a6cd85 100644
--- a/openembedded-armv8-pre-built-images-lt-vexpress64.yaml
+++ b/openembedded-armv8-pre-built-images-lt-vexpress64.yaml
@@ -25,7 +25,7 @@
         - string:
             name: gcc_version
             default: '5.2'
-    disabled: false
+    disabled: true
     node: docker-stretch-amd64
     child-workspace: .
     display-name: 'OpenEmbedded pre-built images (ARMv8-A - LT)'
@@ -65,7 +65,7 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER} openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}
@@ -121,4 +121,5 @@
         - archive:
             artifacts: '*.json'
         - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
+            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
+
diff --git a/openembedded-armv8-pre-built-images-vexpress64.yaml b/openembedded-armv8-pre-built-images-vexpress64.yaml
deleted file mode 100644
index cb2e90806e..0000000000
--- a/openembedded-armv8-pre-built-images-vexpress64.yaml
+++ /dev/null
@@ -1,227 +0,0 @@
-- job:
-    name: openembedded-armv8-pre-built-images-vexpress64
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    parameters:
-        - password:
-            name: LAVA_USER
-            default: ${LAVA_USER}
-        - password:
-            name: LAVA_TOKEN
-            default: ${LAVA_TOKEN}
-        - string:
-            name: hwpack
-            default: 'vexpress64'
-        - string:
-            name: gcc_version
-            default: '5.2'
-    disabled: false
-    node: docker-stretch-amd64
-    child-workspace: .
-    display-name: 'OpenEmbedded pre-built images (ARMv8-A)'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo apt-get update
-            sudo apt-get install -y bzr
-
-            rm -rf daily-prebuilt-images
-            git clone git://git.linaro.org/ci/daily-prebuilt-images.git
-
-            export BOOTLOADER="uefi"
-            DELETEDIR=1 ./daily-prebuilt-images/build-images -w ${hwpack} -b minimal-armv8-gcc-${gcc_version} -p openembedded -f
-            REUSE=1 ./daily-prebuilt-images/build-images -w ${hwpack} -b lamp-armv8-gcc-${gcc_version} -p openembedded -f
-
-            export HWPACK_JOB_NAME=${JOB_NAME}
-            export BUNDLE_STREAM_NAME="/public/team/linaro/pre-built-${hwpack}/"
-
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_minimal-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-            export HWPACK_BUILD_NUMBER=`echo ${HWPACK_FILE_NAME} |cut -d'_' -f3 |cut -d'-' -f2`
-            export HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER%%.img.gz}
-
-            # Add md5sums for all build artefacts that don't have one yet.
-            for f in $(find ${WORKSPACE}/out | grep -v md5) ; do
-                if [ -f "$f" ] ; then
-                    md5sum $f | awk -F/ '{print $1 $NF}' > ${f}.md5
-                fi
-            done
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER} openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}
-
-            cat << EOF > env_var_parameters
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            HWPACK_JOB_NAME=${HWPACK_JOB_NAME}
-            HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER}
-            EOF
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export BOOTLOADER="uefi"
-            export DEVICE_TYPE=rtsm_fvp_base-aemv8a
-
-            export ROOTFS_TYPE=minimal-armv8-gcc-${gcc_version}
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_minimal-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-            python daily-prebuilt-images/lava-submit.py
-
-            export ROOTFS_TYPE=lamp-armv8-gcc-${gcc_version}
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_lamp-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-            python daily-prebuilt-images/lava-submit.py
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            cat << EOF > ${WORKSPACE}/deploy_image_parameters.json
-            {
-                "bootloadertype": "uefi"
-            }
-            EOF
-
-            cat << EOF > ${WORKSPACE}/metadata.json
-            {
-              "hwpack.type": "${hwpack}"
-            }
-            EOF
-
-            cat << EOF > ${WORKSPACE}/boot_image_parameters.json
-            {
-              "options": [
-                "cluster0.NUM_CORES=2",
-                "cluster1.NUM_CORES=3"]
-            }
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export DEVICE_TYPE=rtsm_fvp_base-aemv8a
-
-            export ROOTFS_TYPE=lamp-armv8-gcc-${gcc_version}
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_lamp-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            HWPACK_JOB_NAME=${HWPACK_JOB_NAME}
-            HWPACK_FILE_NAME=${HWPACK_FILE_NAME}
-            HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER}
-            LAVA_TEST_PLAN='busybox device-tree ethernet kernel-version mysql perf phpinfo phpmysql pwrmgmt sdkhelloc sdkhellocxx toolchain'
-            IMAGE_URL=http://snapshots.linaro.org/openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}/${HWPACK_FILE_NAME}
-            DEPLOY_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/deploy_image_parameters.json
-            METADATA_URL=${JOB_URL}/ws/metadata.json
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export DEVICE_TYPE=rtsm_fvp_base-aemv8a
-
-            export ROOTFS_TYPE=minimal-armv8-gcc-${gcc_version}
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_minimal-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            HWPACK_JOB_NAME=${HWPACK_JOB_NAME}
-            HWPACK_FILE_NAME=${HWPACK_FILE_NAME}
-            HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER}
-            LAVA_TEST_PLAN='busybox device-tree ethernet kernel-version perf toolchain'
-            IMAGE_URL=http://snapshots.linaro.org/openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}/${HWPACK_FILE_NAME}
-            DEPLOY_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/deploy_image_parameters.json
-            METADATA_URL=${JOB_URL}/ws/metadata.json
-            BOOT_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/boot_image_parameters.json
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export DEVICE_TYPE=rtsm_fvp_base_cortex-a57x4-a53x4
-
-            export ROOTFS_TYPE=lamp-armv8-gcc-${gcc_version}
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_lamp-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            HWPACK_JOB_NAME=${HWPACK_JOB_NAME}
-            HWPACK_FILE_NAME=${HWPACK_FILE_NAME}
-            HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER}
-            LAVA_TEST_PLAN='busybox device-tree ethernet kernel-version mysql perf phpinfo phpmysql pwrmgmt sdkhelloc sdkhellocxx toolchain'
-            IMAGE_URL=http://snapshots.linaro.org/openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}/${HWPACK_FILE_NAME}
-            DEPLOY_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/deploy_image_parameters.json
-            METADATA_URL=${JOB_URL}/ws/metadata.json
-            BOOT_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/boot_image_parameters.json
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export DEVICE_TYPE=rtsm_fvp_base_cortex-a57x1-a53x1
-
-            export ROOTFS_TYPE=minimal-armv8-gcc-${gcc_version}
-            export HWPACK_FILE_NAME=`find out/pre-built -type f -name "*_minimal-armv8-gcc-${gcc_version}_*.img.gz" |xargs basename`
-
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            HWPACK_JOB_NAME=${HWPACK_JOB_NAME}
-            HWPACK_FILE_NAME=${HWPACK_FILE_NAME}
-            HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER}
-            LAVA_TEST_PLAN='busybox device-tree ethernet kernel-version perf toolchain'
-            IMAGE_URL=http://snapshots.linaro.org/openembedded/pre-built/${hwpack}/${HWPACK_BUILD_NUMBER}/${HWPACK_FILE_NAME}
-            DEPLOY_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/deploy_image_parameters.json
-            METADATA_URL=${JOB_URL}/ws/metadata.json
-            BOOT_IMAGE_PARAMETERS_URL=${JOB_URL}/ws/boot_image_parameters.json
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - archive:
-            artifacts: '*.json'
-        - trigger:
-            project: 'openembedded-armv8-hugepages-lavatest'
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
diff --git a/openembedded-armv8-rootfs.yaml b/openembedded-armv8-rootfs.yaml
deleted file mode 100644
index a6ee19850c..0000000000
--- a/openembedded-armv8-rootfs.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-- job:
-    name: openembedded-armv8-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'OpenEmbedded rootfs (ARMv8-A)'
-    scm:
-        - git:
-            url: https://git.linaro.org/openembedded/jenkins-setup.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - timed: '@weekly'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: gcc_version
-            values:
-                - 6.2
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - lamp
-                - minimal
-                - minimal-initramfs
-                - toolchain-benchmark
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'rootfs=="minimal"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export PATH="$HOME/bin:$PATH"
-
-            # we clean build and populate it from cache
-            bash -x pre-build-do-cleanup.sh
-
-            if [ `date +%u` = "6" ] && [ "${rootfs}" = "minimal" ]
-            then
-              echo "manual hard cleanup on day 6"
-              bash -x periodic-cleanup.sh hard
-            fi
-
-            # setup some init-and-build flags based on image type
-            init_flags=
-            [ "${rootfs}" = "lng" ] && init_flags="-p"
-            # do a build
-            bash -x init-and-build.sh -a armv8 -g ${gcc_version} ${init_flags} linaro-image-${rootfs}
-
-            cd ${WORKSPACE}
-
-            bash -x post-build-create-image-manifest.sh
-            bash -x post-build-sort-out-downloads.sh
-
-            # Capture what we're building in the build output.
-            repo manifest -r
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/ openembedded/images/${rootfs}-armv8-gcc-${gcc_version}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
diff --git a/openembedded-armv8/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml b/openembedded-armv8/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml
index 615b537a5c..88bc8b28a7 100644
--- a/openembedded-armv8/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml
+++ b/openembedded-armv8/lava-job-definitions/hi6220-hikey/master-template-ltp.yaml
@@ -26,7 +26,7 @@ protocols:
     distribution: debian
     release: jessie
     arch: amd64
-    mirror: http://mirror.bytemark.co.uk/debian
+    mirror: http://deb.debian.org/debian
 
 actions:
 - deploy:
@@ -53,21 +53,12 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2600
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip'
 
 - deploy:
     timeout:
@@ -140,7 +131,7 @@ actions:
           - cat /sys/class/thermal/thermal_zone0/policy || true
           - echo "power_allocator" > /sys/class/thermal/thermal_zone0/policy || true
           - cat /sys/class/thermal/thermal_zone0/policy || true
-          - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies  | awk '{ print $$(NF-1) }'  > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
+          - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies  | awk '{ print $(NF-1) }'  > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
           - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq || true
       name: prep-inline
       path: inline/prep.yaml
diff --git a/openembedded-armv8b-rootfs.yaml b/openembedded-armv8b-rootfs.yaml
deleted file mode 100644
index 8de01d7065..0000000000
--- a/openembedded-armv8b-rootfs.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-- job:
-    name: openembedded-armv8b-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'OpenEmbedded rootfs (ARMv8-A big-endian)'
-    scm:
-        - git:
-            url: https://git.linaro.org/openembedded/jenkins-setup.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - timed: '@weekly'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: gcc_version
-            values:
-                - 6.2
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - minimal
-                - minimal-initramfs
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'rootfs=="minimal"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export PATH="$HOME/bin:$PATH"
-
-            # we clean build and populate it from cache
-            bash -x pre-build-do-cleanup.sh
-
-            # set init-and-build flags based on image type
-            init_flags=
-            [ "${rootfs}" = "lng" ] && init_flags="-p"
-            # do a build
-            bash -x init-and-build.sh -a armv8b -g ${gcc_version} ${init_flags} linaro-image-${rootfs}
-
-            cd ${WORKSPACE}
-
-            bash -x post-build-create-image-manifest.sh
-            bash -x post-build-sort-out-downloads.sh
-
-            # Capture what we're building in the build output.
-            repo manifest -r
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/ openembedded/images/${rootfs}-armv8b-gcc-${gcc_version}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
diff --git a/openembedded-core-upstream-master.yaml b/openembedded-core-upstream-master.yaml
deleted file mode 100644
index 14c284ca21..0000000000
--- a/openembedded-core-upstream-master.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-- job:
-    name: openembedded-core-upstream-master
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'core-image-minimal'
-        - string:
-            name: BRANCH
-            default: 'master'
-    disabled: false
-    node: master
-    display-name: 'OpenEmbedded Core upstream (master)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - qemux86
-#                - qemux86-64
-                - qemuarm
-                - qemuarm64
-        - axis:
-            type: slave
-            name: label
-            values:
-#                - docker-stretch-amd64
-                - docker-jessie-arm64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - shell:
-            !include-raw: openembedded-core-upstream/builders.sh
-        - inject:
-            properties-file: post_build_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ \
-              openembedded/pre-built/upstream/${BRANCH}/${MACHINE}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org nicolas.dechesne@linaro.org'
diff --git a/openembedded-core-upstream/builders.sh b/openembedded-core-upstream/builders.sh
deleted file mode 100644
index df307e455a..0000000000
--- a/openembedded-core-upstream/builders.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
-  echo "INFO: apt update error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
-fi
-pkg_list="python-requests chrpath gawk texinfo libsdl1.2-dev whiptail diffstat cpio libssl-dev android-tools-fsutils"
-if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
-  echo "INFO: apt install error - try again in a moment"
-  sleep 15
-  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
-fi
-
-set -ex
-
-rm -rf oe-core
-git clone --depth 1 -b ${BRANCH} https://github.com/openembedded/openembedded-core oe-core
-git clone --depth 1 -b ${BRANCH} https://github.com/openembedded/bitbake oe-core/bitbake
-
-COMMIT_OE_CORE=$(cd oe-core && git rev-parse --short HEAD)
-COMMIT_BITBAKE=$(cd oe-core/bitbake && git rev-parse --short HEAD)
-
-# make sure we get rid of old config.
-# let's remove the previous TMPDIR as well.
-# we want to preserve build/buildhistory though.
-rm -rf conf tmp-*glibc
-
-# build folder is outside of oe-core, so that we can clean them separately
-source oe-core/oe-init-build-env build
-
-# light customizations
-cat << EOF >> conf/auto.conf
-IMAGE_NAME_append = "-${BUILD_NUMBER}"
-KERNEL_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-MODULE_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-MACHINE = "${MACHINE}"
-INHERIT += "rm_work buildhistory image-buildinfo buildstats buildstats-summary"
-BUILDHISTORY_COMMIT = "1"
-EOF
-
-cat << EOF >> conf/site.conf
-SSTATE_DIR = "${HOME}/srv/oe/sstate-cache"
-DL_DIR = "${HOME}/srv/oe/downloads"
-EOF
-
-# add useful debug info
-cat conf/{site,auto}.conf
-
-time bitbake ${IMAGES}
-DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
-
-# Prepare files to publish
-rm -f ${DEPLOY_DIR_IMAGE}/*.txt
-rm -rf ${DEPLOY_DIR_IMAGE}/bootloader
-find ${DEPLOY_DIR_IMAGE} -type l -delete
-
-# Create MD5SUMS file
-(cd ${DEPLOY_DIR_IMAGE} && md5sum * > MD5SUMS.txt)
-
-# Build information
-cat > ${DEPLOY_DIR_IMAGE}/HEADER.textile << EOF
-
-h4. OpenEmbedded Core Upstream Build
-
-Build description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* Branch: ${BRANCH}
-* OE Core commit: "${COMMIT_OE_CORE}":https://github.com/openembedded/openembedded-core/commit/${COMMIT_OE_CORE}
-* Bitbake commit: "${COMMIT_BITBAKE}":https://github.com/openembedded/bitbake/commit/${COMMIT_BITBAKE}
-EOF
-
-# Ignore error as we always want to create post_build_lava_parameters
-set +e
-
-cat << EOF > ${WORKSPACE}/post_build_parameters
-DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
-EOF
diff --git a/openembedded-lkft-android-common-4.4-n-release.yaml b/openembedded-lkft-android-common-4.4-n-release.yaml
index 2814ae7208..11925acef4 100644
--- a/openembedded-lkft-android-common-4.4-n-release.yaml
+++ b/openembedded-lkft-android-common-4.4-n-release.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -110,22 +110,16 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-android-common-4.4-n.yaml b/openembedded-lkft-android-common-4.4-n.yaml
index 25b647ca4f..c5a83e6ed9 100644
--- a/openembedded-lkft-android-common-4.4-n.yaml
+++ b/openembedded-lkft-android-common-4.4-n.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -110,22 +110,16 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-android-common-4.4-o-release.yaml b/openembedded-lkft-android-common-4.4-o-release.yaml
index 550d74b587..d81a4f2bc8 100644
--- a/openembedded-lkft-android-common-4.4-o-release.yaml
+++ b/openembedded-lkft-android-common-4.4-o-release.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -110,22 +110,16 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-android-common-4.4-o.yaml b/openembedded-lkft-android-common-4.4-o.yaml
index 03b95f6b1d..00c191a258 100644
--- a/openembedded-lkft-android-common-4.4-o.yaml
+++ b/openembedded-lkft-android-common-4.4-o.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -110,22 +110,16 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-android-common-4.9-o-release.yaml b/openembedded-lkft-android-common-4.9-o-release.yaml
index c778495c35..5bdaa1ec6d 100644
--- a/openembedded-lkft-android-common-4.9-o-release.yaml
+++ b/openembedded-lkft-android-common-4.9-o-release.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -110,22 +110,16 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-android-common-4.9-o.yaml b/openembedded-lkft-android-common-4.9-o.yaml
index fdcd2507eb..eafb103bd1 100644
--- a/openembedded-lkft-android-common-4.9-o.yaml
+++ b/openembedded-lkft-android-common-4.9-o.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -110,22 +110,16 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-aosp-4.14.yaml b/openembedded-lkft-aosp-4.14.yaml
deleted file mode 100644
index 2997196b23..0000000000
--- a/openembedded-lkft-aosp-4.14.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-- job:
-    name: openembedded-lkft-aosp-4.14
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.14'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-hikey-aosp'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.14-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-    disabled: false
-    node: master
-    display-name: 'LKFT - AOSP 4.14 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - 'am57xx-evm'
-                - 'hikey'
-#                - 'intel-core2-32'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-aosp-4.4.yaml b/openembedded-lkft-aosp-4.4.yaml
deleted file mode 100644
index 93ee8e5c42..0000000000
--- a/openembedded-lkft-aosp-4.4.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-- job:
-    name: openembedded-lkft-aosp-4.4
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.4'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-hikey-aosp'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.4-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-    disabled: false
-    node: master
-    display-name: 'LKFT - AOSP 4.4 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - 'am57xx-evm'
-                - 'hikey'
-#                - 'intel-core2-32'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-aosp-4.9.yaml b/openembedded-lkft-aosp-4.9.yaml
deleted file mode 100644
index eced482f30..0000000000
--- a/openembedded-lkft-aosp-4.9.yaml
+++ /dev/null
@@ -1,154 +0,0 @@
-- job:
-    name: openembedded-lkft-aosp-4.9
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.9'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-hikey-aosp'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/hikey-linaro'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'android-hikey-linaro-4.9-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-    disabled: false
-    node: master
-    display-name: 'LKFT - AOSP 4.9 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - 'am57xx-evm'
-                - 'hikey'
-#                - 'intel-core2-32'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-dlezcano-4.14.yaml b/openembedded-lkft-dlezcano-4.14.yaml
new file mode 100644
index 0000000000..8b5edd6d11
--- /dev/null
+++ b/openembedded-lkft-dlezcano-4.14.yaml
@@ -0,0 +1,156 @@
+- job:
+    name: openembedded-lkft-dlezcano-4.14
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: KERNEL_BRANCH
+            default: 'lkft'
+        - string:
+            name: KERNEL_VERSION
+            default: '4.14'
+        - string:
+            name: KERNEL_ARCH
+            default: 'arm64'
+        - string:
+            name: KERNEL_CONFIG
+            default: 'defconfig'
+        - string:
+            name: KERNEL_RECIPE
+            default: 'linux-generic'
+        - string:
+            name: KERNEL_REPO
+            default: 'https://git.linaro.org/people/daniel.lezcano/android.git'
+        - string:
+            name: KERNEL_DESCRIBE
+        - string:
+            name: KERNEL_COMMIT
+        - string:
+            name: MAKE_KERNELVERSION
+        - string:
+            name: IMAGES
+            default: 'rpb-console-image-lkft'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'rocko'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/lkft/${MANIFEST_BRANCH}/dlezcano-hikey/${DISTRO}/${KERNEL_VERSION}/${BUILD_NUMBER}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://lkft.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'android-hikey-dlezcano-4.14-oe'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'people'
+        - string:
+            name: SKIP_LAVA
+            default: ''
+        - string:
+            name: LAVA_JOB_PRIORITY
+            default: 'medium'
+        - string:
+            name: MACHINE
+            default: 'hikey'
+        - string:
+            name: DISTRO
+            default: 'rpb'
+    disabled: true
+    node: docker-stretch-amd64
+    display-name: 'LKFT - AOSP 4.14/dlezcano (OpenEmbedded/rocko)'
+    axes:
+    wrappers:
+        - timeout:
+            timeout: 180
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              hikey)
+                DEVICE_TYPE=hi6220-hikey
+                ;;
+            esac
+
+            cat << EOF > ${WORKSPACE}/custom-kernel-info.inc.tmp
+            KERNEL_COMMIT = "${KERNEL_COMMIT}"
+            KERNEL_REPO = "${KERNEL_REPO/http*:/git:}"
+            KERNEL_BRANCH = "${KERNEL_BRANCH}"
+            KERNEL_CONFIG_aarch64 = "${KERNEL_CONFIG}"
+            KERNEL_CONFIG_arm = "${KERNEL_CONFIG}"
+            KERNEL_CONFIG_x86-64 = "${KERNEL_CONFIG}"
+            EOF
+
+            echo "IMAGES=rpb-console-image" > parameters
+            echo "MANIFEST_URL=https://github.com/96boards/oe-rpb-manifest.git" >> parameters
+            echo "MANIFEST_BRANCH=${MANIFEST_BRANCH}" >> parameters
+            echo "DISTRO=rpb" >> parameters
+            echo "MACHINE=${MACHINE}" >> parameters
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" >> parameters
+            cat parameters
+
+            echo "#${BUILD_NUMBER}-${KERNEL_COMMIT:0:8}" > ${WORKSPACE}/version.txt
+
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - inject:
+            properties-file: parameters
+        - shell:
+            !include-raw: openembedded-lkft/builders-generic.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
+        - shell:
+            !include-raw: openembedded-lkft/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'daniel.lezcano@linaro.org'
+            matrix-trigger: only-configurations
+            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
+            body: |
+                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
+                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
+                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
+                Git branch: ${KERNEL_BRANCH}
+                Git URL: ${KERNEL_REPO}
+                Git commit: ${KERNEL_COMMIT}
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
+            presend-script:
+                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linaro-hikey-stable-4.4.yaml b/openembedded-lkft-linaro-hikey-stable-4.4.yaml
index 54344fa760..3d541dec6e 100644
--- a/openembedded-lkft-linaro-hikey-stable-4.4.yaml
+++ b/openembedded-lkft-linaro-hikey-stable-4.4.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -115,28 +115,17 @@
         - inject:
             properties-file: post_build_lava_parameters
         - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
         - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
+            !include-raw: openembedded-lkft/publishers.sh
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
         - groovy-postbuild:
             script:
-                !include-raw: openembedded-lkft/postbuild.groovy
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+                  - openembedded-lkft/submit_build_result.groovy
         - email-ext:
             recipients: 'lkft-maintainers@lists.linaro.org'
             matrix-trigger: only-configurations
diff --git a/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml b/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
deleted file mode 100644
index 3f3c68f7d0..0000000000
--- a/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
-- job:
-    name: openembedded-lkft-linaro-hikey-stable-rc-4.4
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: ''
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-hikey-lts-rc'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/lkft/arm64-stable-rc.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linaro-hikey-stable-rc-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linaro-hikey-stable-rc-4.4-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
-            name: LAVA_JOB_PRIORITY
-            default: 'high'
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RC 4.4 + HiKey (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'hikey'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-mainline.yaml b/openembedded-lkft-linux-mainline.yaml
deleted file mode 100644
index a91c2742eb..0000000000
--- a/openembedded-lkft-linux-mainline.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-mainline
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'master'
-        - string:
-            name: KERNEL_VERSION
-            default: 'git'
-        - string:
-            name: KERNEL_VERSION_OVERRIDE
-            default: 'mainline'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-mainline'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-mainline/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-mainline-oe'
-        - string:
-            name: KSELFTEST_PATH
-            default: '/opt/kselftests/default-in-kernel/'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Mainline (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_VERSION_OVERRIDE} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-next.yaml b/openembedded-lkft-linux-next.yaml
deleted file mode 100644
index 6ad6c49532..0000000000
--- a/openembedded-lkft-linux-next.yaml
+++ /dev/null
@@ -1,177 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-next
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'master'
-        - string:
-            name: KERNEL_VERSION
-            default: 'git'
-        - string:
-            name: KERNEL_VERSION_OVERRIDE
-            default: 'next'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-next'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-next/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-next-oe'
-        - string:
-            name: KSELFTEST_PATH
-            default: '/opt/kselftests/default-in-kernel/'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Next (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_VERSION_OVERRIDE} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-4.13.yaml b/openembedded-lkft-linux-stable-4.13.yaml
deleted file mode 100644
index 1fe6078fc1..0000000000
--- a/openembedded-lkft-linux-stable-4.13.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-4.13
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.13.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.13'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-4.13-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable 4.13.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-4.14.yaml b/openembedded-lkft-linux-stable-4.14.yaml
deleted file mode 100644
index dc2fdcf028..0000000000
--- a/openembedded-lkft-linux-stable-4.14.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-4.14
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.14.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-4.14-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable 4.14.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-4.15.yaml b/openembedded-lkft-linux-stable-4.15.yaml
deleted file mode 100644
index c546bf6fdb..0000000000
--- a/openembedded-lkft-linux-stable-4.15.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-4.15
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.15.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.15'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-4.15-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable 4.15.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-4.4.yaml b/openembedded-lkft-linux-stable-4.4.yaml
deleted file mode 100644
index 54c47b21a3..0000000000
--- a/openembedded-lkft-linux-stable-4.4.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-4.4
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.4.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-4.4-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable 4.4.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-4.9.yaml b/openembedded-lkft-linux-stable-4.9.yaml
deleted file mode 100644
index 75d008b63b..0000000000
--- a/openembedded-lkft-linux-stable-4.9.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-4.9
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.9.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-4.9-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'medium'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable 4.9.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-4.13.yaml b/openembedded-lkft-linux-stable-rc-4.13.yaml
deleted file mode 100644
index 105afee798..0000000000
--- a/openembedded-lkft-linux-stable-rc-4.13.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rc-4.13
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.13.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.13'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rc'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rc-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-rc-4.13-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'high'
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RC 4.13.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, lkft-triage@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-4.14.yaml b/openembedded-lkft-linux-stable-rc-4.14.yaml
deleted file mode 100644
index 0d0e808abd..0000000000
--- a/openembedded-lkft-linux-stable-rc-4.14.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rc-4.14
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.14.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rc'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rc-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-rc-4.14-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'high'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RC 4.14.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, lkft-triage@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-4.15.yaml b/openembedded-lkft-linux-stable-rc-4.15.yaml
deleted file mode 100644
index d7066408ff..0000000000
--- a/openembedded-lkft-linux-stable-rc-4.15.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rc-4.15
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.15.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.15'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rc'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rc-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-rc-4.15-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'high'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RC 4.15.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, lkft-triage@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-4.4.yaml b/openembedded-lkft-linux-stable-rc-4.4.yaml
deleted file mode 100644
index ebbb2f5b4f..0000000000
--- a/openembedded-lkft-linux-stable-rc-4.4.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rc-4.4
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.4.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rc'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rc-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-rc-4.4-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'high'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RC 4.4.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, lkft-triage@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-4.9.yaml b/openembedded-lkft-linux-stable-rc-4.9.yaml
deleted file mode 100644
index 07ca14d39d..0000000000
--- a/openembedded-lkft-linux-stable-rc-4.9.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rc-4.9
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.9.y'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rc'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rc-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linux-stable-rc-4.9-oe'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'high'
-        - matrix-combinations:
-            name: MATRIX_COMBINATIONS
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RC 4.9.y (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-lkft
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-        - shell:
-            !include-raw: openembedded-lkft/qemu-testjobs.sh
-        - inject:
-            properties-file: qemu_device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, lkft-triage@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-rocko.yaml b/openembedded-lkft-linux-stable-rc-rocko.yaml
new file mode 100644
index 0000000000..aa70433b92
--- /dev/null
+++ b/openembedded-lkft-linux-stable-rc-rocko.yaml
@@ -0,0 +1,291 @@
+- job:
+    name: openembedded-lkft-linux-stable-rc-rocko
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            daniel.diaz@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 365
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'rpb-console-image-lkft'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/96boards/oe-rpb-manifest.git'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'lkft/rocko'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/lkft/lkft/rocko/${MACHINE}/${DISTRO}/linux-stable-rc/${KERNEL_BRANCH}/${BUILD_NUMBER}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://lkft.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://staging-qa-reports.linaro.org'
+        - string:
+            name: KSELFTEST_PATH
+            default: '/opt/kselftests/mainline/'
+        - string:
+            name: SKIP_LAVA
+            default: ''
+        - string:
+            name: LAVA_JOB_PRIORITY
+            default: '35'
+        - string:
+            name: SANITY_LAVA_JOB_PRIORITY
+            default: '80'
+        - string:
+            name: TEST_SUITES
+            default: 'all'
+        - matrix-combinations:
+            name: MATRIX_COMBINATIONS
+            filter: '!(KERNEL_BRANCH == "linux-4.4.y" && (MACHINE == "hikey" | MACHINE == "dragonboard-410c"))'
+    disabled: true
+    node: master
+    display-name: 'LKFT - Linux Stable (OpenEmbedded/rocko)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'am57xx-evm'
+                - 'dragonboard-410c'
+                - 'hikey'
+                - 'intel-core2-32'
+                - 'intel-corei7-64'
+                - 'juno'
+                - 'ls2088ardb'
+        - axis:
+            type: user-defined
+            name: KERNEL_BRANCH
+            values:
+                - 'linux-4.4.y'
+                - 'linux-4.9.y'
+                - 'linux-4.14.y'
+                - 'linux-4.19.y'
+                - 'linux-5.4.y'
+                - 'linux-5.5.y'
+                - 'mainline'
+                - 'next'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - lkft
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-lkft
+    execution-strategy:
+        sequential: false
+    triggers:
+        - timed: '@monthly'
+    wrappers:
+        - timeout:
+            timeout: 180
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash -x
+
+            # Mapping for KERNEL_BRANCH -> KERNEL_VERSION
+            KERNEL_RECIPE=linux-generic-stable-rc
+            case "${KERNEL_BRANCH}" in
+              linux-4.4.y)
+                KERNEL_VERSION=4.4
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.4-oe
+                if [ "${MACHINE}" = "hikey" ]; then
+                  # Not "stable", though...
+                  KERNEL_RECIPE=linux-hikey-lts-rc
+                  KERNEL_REPO=https://git.linaro.org/lkft/arm64-stable-rc.git
+                  QA_SERVER_PROJECT=linaro-hikey-stable-rc-4.4-oe
+                fi
+                ;;
+              linux-4.9.y)
+                KERNEL_VERSION=4.9
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.9-oe
+                ;;
+              linux-4.14.y)
+                KERNEL_VERSION=4.14
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.14-oe
+                ;;
+              linux-4.19.y)
+                KERNEL_VERSION=4.19
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.19-oe
+                ;;
+              linux-4.20.y)
+                KERNEL_VERSION=4.20
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.20-oe
+                ;;
+              linux-5.0.y)
+                KERNEL_VERSION=5.0
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.0-oe
+                ;;
+              linux-5.1.y)
+                KERNEL_VERSION=5.1
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.1-oe
+                ;;
+              linux-5.2.y)
+                KERNEL_VERSION=5.2
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.2-oe
+                ;;
+              linux-5.3.y)
+                KERNEL_VERSION=5.3
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.3-oe
+                ;;
+              linux-5.4.y)
+                KERNEL_VERSION=5.4
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.4-oe
+                ;;
+              linux-5.5.y)
+                KERNEL_VERSION=5.5
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.5-oe
+                ;;
+              mainline)
+                KERNEL_VERSION=git
+                KERNEL_VERSION_OVERRIDE=mainline
+                KERNEL_RECIPE=linux-generic-mainline
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+                GIT_BRANCH=master
+                QA_SERVER_PROJECT=linux-mainline-oe
+                ;;
+              next)
+                KERNEL_VERSION=git
+                KERNEL_VERSION_OVERRIDE=next
+                KERNEL_RECIPE=linux-generic-next
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
+                GIT_BRANCH=master
+                QA_SERVER_PROJECT=linux-next-oe
+                ;;
+            esac
+            KERNEL_VERSION_OVERRIDE=${KERNEL_VERSION_OVERRIDE:-${KERNEL_VERSION}}
+            GIT_BRANCH=${GIT_BRANCH:-${KERNEL_BRANCH}}
+
+            git clone --reference-if-able "${HOME}/srv/linux.git" -o origin "${KERNEL_REPO}" "${WORKSPACE}/linux"
+
+            cd "${WORKSPACE}/linux"
+            git remote add torvalds https://github.com/torvalds/linux.git
+            git remote add linux-stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+            git fetch --multiple torvalds linux-stable
+
+            git checkout "origin/${GIT_BRANCH}"
+            SRCREV_kernel="$(git rev-parse HEAD)"
+            MAKE_KERNELVERSION="$(make kernelversion)"
+            kernel_major="$(echo ${MAKE_KERNELVERSION} | cut -d\. -f1)"
+            kernel_minor="$(echo ${MAKE_KERNELVERSION} | cut -d\. -f2)"
+            if echo "${MAKE_KERNELVERSION}" | grep -q "rc"; then
+              kernel_minor=$((kernel_minor - 1))
+            fi
+            KERNEL_DESCRIBE=$(git describe --always)
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              hikey)
+                DEVICE_TYPE=hi6220-hikey
+                ;;
+              intel-core2-32)
+                DEVICE_TYPE=i386
+                ;;
+              intel-corei7-64)
+                DEVICE_TYPE=x86
+                ;;
+              juno)
+                DEVICE_TYPE=juno-r2
+                ;;
+              am57xx-evm)
+                DEVICE_TYPE=x15
+                ;;
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
+            esac
+
+            BRANCH_PREFIX="${MANIFEST_BRANCH/lkft\//}-"
+            (
+              echo "KERNEL_VERSION=${KERNEL_VERSION}"
+              echo "KERNEL_VERSION_OVERRIDE=${KERNEL_VERSION_OVERRIDE}"
+              echo "KERNEL_RECIPE=${KERNEL_RECIPE}"
+              echo "KERNEL_REPO=${KERNEL_REPO}"
+              echo "DEVICE_TYPE=${DEVICE_TYPE}"
+              echo "KERNEL_DESCRIBE=${BRANCH_PREFIX}${KERNEL_DESCRIBE}"
+              echo "SRCREV_kernel=${SRCREV_kernel}"
+              echo "MAKE_KERNELVERSION=${MAKE_KERNELVERSION}"
+              echo "QA_SERVER_PROJECT=${QA_SERVER_PROJECT}"
+            ) > "${WORKSPACE}/preset_parameters"
+            echo "#${BUILD_NUMBER}-${KERNEL_VERSION}-${SRCREV_kernel:0:8}" > "${WORKSPACE}/version.txt"
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - inject:
+            properties-file: preset_parameters
+        - shell:
+            !include-raw: openembedded-lkft/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
+        - shell:
+            !include-raw: openembedded-lkft/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'daniel.diaz@linaro.org'
+            matrix-trigger: only-configurations
+            aborted: true
+            subject: '[rocko] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
+            body: |
+                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
+                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
+                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
+                Git branch: ${KERNEL_BRANCH}
+                Git URL: ${KERNEL_REPO}
+                Git commit: ${SRCREV_kernel}
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
+            presend-script:
+                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rc-thud.yaml b/openembedded-lkft-linux-stable-rc-thud.yaml
new file mode 100644
index 0000000000..66fc32b98d
--- /dev/null
+++ b/openembedded-lkft-linux-stable-rc-thud.yaml
@@ -0,0 +1,291 @@
+- job:
+    name: openembedded-lkft-linux-stable-rc-thud
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            daniel.diaz@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 365
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'rpb-console-image-lkft'
+        - string:
+            name: MANIFEST_URL
+            default: 'https://github.com/96boards/oe-rpb-manifest.git'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'lkft/thud'
+        - string:
+            name: PUB_DEST
+            default: 'openembedded/lkft/lkft/thud/${MACHINE}/${DISTRO}/linux-stable-rc/${KERNEL_BRANCH}/${BUILD_NUMBER}'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://lkft.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://staging-qa-reports.linaro.org'
+        - string:
+            name: KSELFTEST_PATH
+            default: '/opt/kselftests/mainline/'
+        - string:
+            name: SKIP_LAVA
+            default: ''
+        - string:
+            name: LAVA_JOB_PRIORITY
+            default: '35'
+        - string:
+            name: SANITY_LAVA_JOB_PRIORITY
+            default: '80'
+        - string:
+            name: TEST_SUITES
+            default: 'all'
+        - matrix-combinations:
+            name: MATRIX_COMBINATIONS
+            filter: '!(KERNEL_BRANCH == "linux-4.4.y" && (MACHINE == "hikey" | MACHINE == "dragonboard-410c"))'
+    disabled: true
+    node: master
+    display-name: 'LKFT - Linux Stable (OpenEmbedded/thud)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'am57xx-evm'
+                - 'dragonboard-410c'
+                - 'hikey'
+                - 'intel-core2-32'
+                - 'intel-corei7-64'
+                - 'juno'
+                - 'ls2088ardb'
+        - axis:
+            type: user-defined
+            name: KERNEL_BRANCH
+            values:
+                - 'linux-4.4.y'
+                - 'linux-4.9.y'
+                - 'linux-4.14.y'
+                - 'linux-4.19.y'
+                - 'linux-5.4.y'
+                - 'linux-5.5.y'
+                - 'mainline'
+                - 'next'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - lkft
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-lkft
+    execution-strategy:
+        sequential: false
+    triggers:
+        - timed: '@monthly'
+    wrappers:
+        - timeout:
+            timeout: 180
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'OE_COMMIT_BOT_KEY'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash -x
+
+            # Mapping for KERNEL_BRANCH -> KERNEL_VERSION
+            KERNEL_RECIPE=linux-generic-stable-rc
+            case "${KERNEL_BRANCH}" in
+              linux-4.4.y)
+                KERNEL_VERSION=4.4
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.4-oe
+                if [ "${MACHINE}" = "hikey" ]; then
+                  # Not "stable", though...
+                  KERNEL_RECIPE=linux-hikey-lts-rc
+                  KERNEL_REPO=https://git.linaro.org/lkft/arm64-stable-rc.git
+                  QA_SERVER_PROJECT=linaro-hikey-stable-rc-4.4-oe
+                fi
+                ;;
+              linux-4.9.y)
+                KERNEL_VERSION=4.9
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.9-oe
+                ;;
+              linux-4.14.y)
+                KERNEL_VERSION=4.14
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.14-oe
+                ;;
+              linux-4.19.y)
+                KERNEL_VERSION=4.19
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.19-oe
+                ;;
+              linux-4.20.y)
+                KERNEL_VERSION=4.20
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-4.20-oe
+                ;;
+              linux-5.0.y)
+                KERNEL_VERSION=5.0
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.0-oe
+                ;;
+              linux-5.1.y)
+                KERNEL_VERSION=5.1
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.1-oe
+                ;;
+              linux-5.2.y)
+                KERNEL_VERSION=5.2
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.2-oe
+                ;;
+              linux-5.3.y)
+                KERNEL_VERSION=5.3
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.3-oe
+                ;;
+              linux-5.4.y)
+                KERNEL_VERSION=5.4
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.4-oe
+                ;;
+              linux-5.5.y)
+                KERNEL_VERSION=5.5
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+                QA_SERVER_PROJECT=linux-stable-rc-5.5-oe
+                ;;
+              mainline)
+                KERNEL_VERSION=git
+                KERNEL_VERSION_OVERRIDE=mainline
+                KERNEL_RECIPE=linux-generic-mainline
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+                GIT_BRANCH=master
+                QA_SERVER_PROJECT=linux-mainline-oe
+                ;;
+              next)
+                KERNEL_VERSION=git
+                KERNEL_VERSION_OVERRIDE=next
+                KERNEL_RECIPE=linux-generic-next
+                KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
+                GIT_BRANCH=master
+                QA_SERVER_PROJECT=linux-next-oe
+                ;;
+            esac
+            KERNEL_VERSION_OVERRIDE=${KERNEL_VERSION_OVERRIDE:-${KERNEL_VERSION}}
+            GIT_BRANCH=${GIT_BRANCH:-${KERNEL_BRANCH}}
+
+            git clone --reference-if-able "${HOME}/srv/linux.git" -o origin "${KERNEL_REPO}" "${WORKSPACE}/linux"
+
+            cd "${WORKSPACE}/linux"
+            git remote add torvalds https://github.com/torvalds/linux.git
+            git remote add linux-stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+            git fetch --multiple torvalds linux-stable
+
+            git checkout "origin/${GIT_BRANCH}"
+            SRCREV_kernel="$(git rev-parse HEAD)"
+            MAKE_KERNELVERSION="$(make kernelversion)"
+            kernel_major="$(echo ${MAKE_KERNELVERSION} | cut -d\. -f1)"
+            kernel_minor="$(echo ${MAKE_KERNELVERSION} | cut -d\. -f2)"
+            if echo "${MAKE_KERNELVERSION}" | grep -q "rc"; then
+              kernel_minor=$((kernel_minor - 1))
+            fi
+            KERNEL_DESCRIBE=$(git describe --always)
+
+            # Mapping for MACHINE -> DEVICE_TYPE
+            case "${MACHINE}" in
+              hikey)
+                DEVICE_TYPE=hi6220-hikey
+                ;;
+              intel-core2-32)
+                DEVICE_TYPE=i386
+                ;;
+              intel-corei7-64)
+                DEVICE_TYPE=x86
+                ;;
+              juno)
+                DEVICE_TYPE=juno-r2
+                ;;
+              am57xx-evm)
+                DEVICE_TYPE=x15
+                ;;
+              dragonboard-410c)
+                DEVICE_TYPE=dragonboard-410c
+                ;;
+            esac
+
+            BRANCH_PREFIX="${MANIFEST_BRANCH/lkft\//}-"
+            (
+              echo "KERNEL_VERSION=${KERNEL_VERSION}"
+              echo "KERNEL_VERSION_OVERRIDE=${KERNEL_VERSION_OVERRIDE}"
+              echo "KERNEL_RECIPE=${KERNEL_RECIPE}"
+              echo "KERNEL_REPO=${KERNEL_REPO}"
+              echo "DEVICE_TYPE=${DEVICE_TYPE}"
+              echo "KERNEL_DESCRIBE=${BRANCH_PREFIX}${KERNEL_DESCRIBE}"
+              echo "SRCREV_kernel=${SRCREV_kernel}"
+              echo "MAKE_KERNELVERSION=${MAKE_KERNELVERSION}"
+              echo "QA_SERVER_PROJECT=${QA_SERVER_PROJECT}"
+            ) > "${WORKSPACE}/preset_parameters"
+            echo "#${BUILD_NUMBER}-${KERNEL_VERSION}-${SRCREV_kernel:0:8}" > "${WORKSPACE}/version.txt"
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - inject:
+            properties-file: preset_parameters
+        - shell:
+            !include-raw: openembedded-lkft/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: openembedded-lkft/publishers.sh
+        - shell:
+            !include-raw: openembedded-lkft/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'daniel.diaz@linaro.org'
+            matrix-trigger: only-configurations
+            aborted: true
+            subject: '[thud] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
+            body: |
+                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
+                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
+                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
+                Git branch: ${KERNEL_BRANCH}
+                Git URL: ${KERNEL_REPO}
+                Git commit: ${SRCREV_kernel}
+
+                Errors:
+                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
+            presend-script:
+                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rt-4.4.yaml b/openembedded-lkft-linux-stable-rt-4.4.yaml
deleted file mode 100644
index 6efcc1f1e2..0000000000
--- a/openembedded-lkft-linux-stable-rt-4.4.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rt-4.4
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'v4.4-rt'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rt'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rt-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'TBD'
-        - string:
-            name: SKIP_LAVA
-            default: '1'
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RT 4.4 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-linux-stable-rt-4.9.yaml b/openembedded-lkft-linux-stable-rt-4.9.yaml
deleted file mode 100644
index d59e059057..0000000000
--- a/openembedded-lkft-linux-stable-rt-4.9.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-- job:
-    name: openembedded-lkft-linux-stable-rt-4.9
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'v4.9-rt'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-stable-rt'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.kernel.org/pub/scm/linux/kernel/git/rt/linux-stable-rt.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/linux-stable-rt-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'TBD'
-        - string:
-            name: SKIP_LAVA
-            default: '1'
-    disabled: false
-    node: master
-    display-name: 'LKFT - Linux Stable RT 4.9 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.14-rt-test.yaml b/openembedded-lkft-lsk-4.14-rt-test.yaml
deleted file mode 100644
index f1f545ba32..0000000000
--- a/openembedded-lkft-lsk-4.14-rt-test.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.14-rt-test
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14-rt-test'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-rt-test'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-rt-test/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.14-rt-test-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.14 RT test (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.14-rt.yaml b/openembedded-lkft-lsk-4.14-rt.yaml
deleted file mode 100644
index 1b0fad79d3..0000000000
--- a/openembedded-lkft-lsk-4.14-rt.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.14-rt
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14-rt'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-rt'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-rt/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.14-rt-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.14 RT (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.14-test.yaml b/openembedded-lkft-lsk-4.14-test.yaml
deleted file mode 100644
index edf23c738b..0000000000
--- a/openembedded-lkft-lsk-4.14-test.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.14-test
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14-test'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-test'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-test/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.14-test-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.14 test (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.14.yaml b/openembedded-lkft-lsk-4.14.yaml
deleted file mode 100644
index 03fc2444a5..0000000000
--- a/openembedded-lkft-lsk-4.14.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.14
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.14'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.14-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.14 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.4-rt-test.yaml b/openembedded-lkft-lsk-4.4-rt-test.yaml
deleted file mode 100644
index d00965424b..0000000000
--- a/openembedded-lkft-lsk-4.4-rt-test.yaml
+++ /dev/null
@@ -1,149 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.4-rt-test
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4-rt-test'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-rt-test'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-rt-test/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.4-rt-test-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.4 RT test (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.4-rt.yaml b/openembedded-lkft-lsk-4.4-rt.yaml
deleted file mode 100644
index de7e2df3e7..0000000000
--- a/openembedded-lkft-lsk-4.4-rt.yaml
+++ /dev/null
@@ -1,149 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.4-rt
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4-rt'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-rt'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-rt/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.4-rt-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.4 RT (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.4-test.yaml b/openembedded-lkft-lsk-4.4-test.yaml
deleted file mode 100644
index 02343a9d18..0000000000
--- a/openembedded-lkft-lsk-4.4-test.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.4-test
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4-test'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-test'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-test/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.4-test-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.4 test (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.4.yaml b/openembedded-lkft-lsk-4.4.yaml
deleted file mode 100644
index 0cb1c59b14..0000000000
--- a/openembedded-lkft-lsk-4.4.yaml
+++ /dev/null
@@ -1,149 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.4
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.4-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.4 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.9-rt-test.yaml b/openembedded-lkft-lsk-4.9-rt-test.yaml
deleted file mode 100644
index 2fcd49f15e..0000000000
--- a/openembedded-lkft-lsk-4.9-rt-test.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.9-rt-test
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9-rt-test'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-rt-test'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-rt-test/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.9-rt-test-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.9 RT test (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.9-rt.yaml b/openembedded-lkft-lsk-4.9-rt.yaml
deleted file mode 100644
index ab921075cd..0000000000
--- a/openembedded-lkft-lsk-4.9-rt.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.9-rt
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9-rt'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-rt'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-rt/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.9-rt-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.9 RT (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.9-test.yaml b/openembedded-lkft-lsk-4.9-test.yaml
deleted file mode 100644
index 2f89780fad..0000000000
--- a/openembedded-lkft-lsk-4.9-test.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.9-test
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9-test'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk-test'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}-test/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.9-test-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.9 test (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft-lsk-4.9.yaml b/openembedded-lkft-lsk-4.9.yaml
deleted file mode 100644
index f1b414e9cf..0000000000
--- a/openembedded-lkft-lsk-4.9.yaml
+++ /dev/null
@@ -1,161 +0,0 @@
-- job:
-    name: openembedded-lkft-lsk-4.9
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.9'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lsk'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/kernel/linux-linaro-stable.git'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'openembedded/lkft/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/lsk-${KERNEL_VERSION}/${BUILD_NUMBER}'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'lsk-4.9-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'lsk'
-        - string:
-            name: SKIP_LAVA
-            default: ''
-    disabled: false
-    node: master
-    display-name: 'LKFT - LSK 4.9 (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'dragonboard-410c'
-                - 'hikey'
-                - 'intel-core2-32'
-                - 'juno'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 180
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              intel-core2-32)
-                DEVICE_TYPE=x86
-                ;;
-              juno)
-                DEVICE_TYPE=juno-r2
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/openembedded-lkft/.gitignore b/openembedded-lkft/.gitignore
index 3fec32c842..fbab90152f 100644
--- a/openembedded-lkft/.gitignore
+++ b/openembedded-lkft/.gitignore
@@ -1 +1 @@
-tmp/
+tmp*/
diff --git a/openembedded-lkft/builders-generic.sh b/openembedded-lkft/builders-generic.sh
new file mode 100755
index 0000000000..29303be3fa
--- /dev/null
+++ b/openembedded-lkft/builders-generic.sh
@@ -0,0 +1,393 @@
+#!/bin/bash
+
+set -e
+
+# workaround EDK2 is confused by the long path used during the build
+# and truncate files name expected by VfrCompile
+sudo mkdir -p /srv/oe
+sudo chown buildslave:buildslave /srv/oe
+cd /srv/oe
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    echo "Running cleanup_exit..."
+}
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="virtualenv python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail libelf-dev xz-utils pigz coreutils"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+# Install jinja2-cli and ruamel.yaml==0.16.13
+pip install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
+
+set -ex
+
+mkdir -p ${HOME}/bin
+curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+chmod a+x ${HOME}/bin/repo
+export PATH=${HOME}/bin:${PATH}
+
+# initialize repo if not done already
+export MANIFEST_URL=${MANIFEST_URL:-https://github.com/96boards/oe-rpb-manifest.git}
+if [ ! -e ".repo/manifest.xml" ]; then
+   repo init -u ${MANIFEST_URL} -b ${MANIFEST_BRANCH}
+
+   # link to shared downloads on persistent disk
+   # our builds config is expecting downloads and sstate-cache, here.
+   # DL_DIR = "${OEROOT}/sources/downloads"
+   # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
+   mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
+   mkdir -p build
+   ln -s ${HOME}/srv/oe/downloads
+   ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
+fi
+
+repo sync
+cp .repo/manifest.xml source-manifest.xml
+repo manifest -r -o pinned-manifest.xml
+MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
+
+# record changes since last build, if available
+BASE_URL=http://snapshots.linaro.org
+if wget -q ${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
+    repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+else
+    echo "latest build published does not have pinned-manifest.xml, skipping diff report"
+fi
+
+# the setup-environment will create auto.conf and site.conf
+# make sure we get rid of old config.
+# let's remove the previous TMPDIR as well.
+# we want to preserve build/buildhistory though.
+rm -rf conf build/conf build/tmp-*glibc/
+
+# Accept EULA if/when needed
+export EULA_dragonboard410c=1
+
+[ -v KERNEL_SRCREV ] && export SRCREV_kernel="${KERNEL_SRCREV}"
+source setup-environment build
+
+########## vvv DISTRO DEPENDANT vvv ##########
+if [ "${DISTRO}" = "rpb" ]; then
+
+# Add job BUILD_NUMBER to output files names
+cat << EOF >> conf/auto.conf
+IMAGE_NAME_append = "-${BUILD_NUMBER}"
+KERNEL_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
+MODULE_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
+DT_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
+BOOT_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
+EOF
+
+# get build stats to make sure that we use sstate properly
+cat << EOF >> conf/auto.conf
+INHERIT += "buildstats buildstats-summary"
+EOF
+
+# Set the kernel to use
+distro_conf=$(find ../layers/meta-rpb/conf/distro -name rpb.inc)
+cat << EOF >> ${distro_conf}
+PREFERRED_PROVIDER_virtual/kernel = "${KERNEL_RECIPE}"
+EOF
+
+case "${KERNEL_RECIPE}" in
+  linux-hikey-aosp|linux-generic-android-common-o*|linux-generic-lsk*|linux-generic-stable*)
+    cat << EOF >> ${distro_conf}
+PREFERRED_VERSION_${KERNEL_RECIPE} = "${KERNEL_VERSION}+git%"
+EOF
+    ;;
+esac
+
+# Set the image types to use
+cat << EOF >> ${distro_conf}
+IMAGE_FSTYPES_remove = "ext4 iso wic"
+EOF
+
+# Set GCC to 7.x
+cat << EOF >> ${distro_conf}
+GCCVERSION = "7.%"
+EOF
+
+case "${KERNEL_RECIPE}" in
+  linux-*-aosp|linux-*-android-*)
+    cat << EOF >> ${distro_conf}
+CONSOLE = "ttyFIQ0"
+EOF
+    ;;
+esac
+
+# Include additional recipes in the image
+[ "${MACHINE}" = "am57xx-evm" -o "${MACHINE}" = "beaglebone" ] || extra_pkgs="numactl"
+cat << EOF >> conf/local.conf
+CORE_IMAGE_BASE_INSTALL_append = " kernel-selftests kselftests-mainline kselftests-next libhugetlbfs-tests ltp ${extra_pkgs}"
+CORE_IMAGE_BASE_INSTALL_append = " python python-misc python-modules python-numpy python-pexpect python-pyyaml"
+CORE_IMAGE_BASE_INSTALL_append = " git parted packagegroup-core-buildessential packagegroup-core-tools-debug tzdata"
+EOF
+
+# Override cmdline
+cat << EOF >> conf/local.conf
+CMDLINE_remove = "quiet"
+EOF
+
+# Remove recipes:
+# - docker to reduce image size
+cat << EOF >> conf/local.conf
+RDEPENDS_packagegroup-rpb_remove = "docker"
+EOF
+
+cat << EOF >> conf/local.conf
+SERIAL_CONSOLES_remove_intel-core2-32 = "115200;ttyPCH0"
+SERIAL_CONSOLES_remove_intel-corei7-64 = "115200;ttyPCH0"
+SERIAL_CONSOLES_append_dragonboard-410c = " 115200;ttyMSM1"
+SERIAL_CONSOLES_append_hikey = " 115200;ttyAMA2"
+EOF
+
+# Enable lkft-metadata class
+cat << EOF >> conf/local.conf
+INHERIT += "lkft-metadata"
+LKFTMETADATA_COMMIT = "1"
+EOF
+
+# Update kernel recipe SRCREV
+echo "SRCREV_kernel_${MACHINE} = \"${SRCREV_kernel}\"" >> conf/local.conf
+
+fi
+########## ^^^ DISTRO DEPENDANT ^^^ ##########
+
+# Remove systemd firstboot and machine-id file
+# Backport serialization change from v234 to avoid systemd tty race condition
+# Only on Morty
+if [ "${MANIFEST_BRANCH}" = "morty" ]; then
+  mkdir -p ../layers/meta-96boards/recipes-core/systemd/systemd
+  wget -q http://people.linaro.org/~fathi.boudra/backport-v234-e266c06-v230.patch \
+    -O ../layers/meta-96boards/recipes-core/systemd/systemd/backport-v234-e266c06-v230.patch
+
+  cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd/e2fsck.conf
+[options]
+# This will prevent e2fsck from stopping boot just because the clock is wrong
+broken_system_clock = 1
+EOF
+
+  cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd_%.bbappend
+FILESEXTRAPATHS_prepend := "\${THISDIR}/\${PN}:"
+
+SRC_URI += "\\
+    file://backport-v234-e266c06-v230.patch \\
+    file://e2fsck.conf \\
+"
+
+PACKAGECONFIG_remove = "firstboot"
+
+do_install_append() {
+    # Install /etc/e2fsck.conf to avoid boot stuck by wrong clock time
+    install -m 644 -p -D \${WORKDIR}/e2fsck.conf \${D}\${sysconfdir}/e2fsck.conf
+
+    rm -f \${D}\${sysconfdir}/machine-id
+}
+
+FILES_\${PN} += "\${sysconfdir}/e2fsck.conf "
+EOF
+elif [ "${MANIFEST_BRANCH}" = "rocko" ]; then
+  sed -i "s|bits/wordsize.h||" ../layers/openembedded-core/meta/recipes-core/glibc/glibc-package.inc
+fi
+
+# Place generic kernel definitions (if needed)
+if [ -e ${WORKSPACE}/custom-kernel-info.inc.tmp ]; then
+    mv -v ${WORKSPACE}/custom-kernel-info.inc.tmp conf/custom-kernel-info.inc
+fi
+
+# The kernel (as of next-20181130) requires fold from the host
+echo "HOSTTOOLS += \"fold\"" >> conf/local.conf
+
+# Workaround for missing juno-r2.dtb in Linux 4.4
+if [ "${KERNEL_VERSION}" = "4.4" ] && [ "${MACHINE}" = "juno" ]; then
+  echo 'KERNEL_DEVICETREE_remove_juno = "arm/juno-r2.dtb"' >> conf/local.conf
+fi
+
+# add useful debug info
+cat conf/{site,auto,local}.conf
+cat ${distro_conf}
+cat ${custom_kernel_conf}
+
+# Temporary sstate cleanup to get lkft metadata generated
+[ "${DISTRO}" = "rpb" ] && bitbake -c cleansstate kselftests-mainline kselftests-next ltp libhugetlbfs
+
+time bitbake ${IMAGES}
+
+# Disable network for AUTOREV
+echo 'BB_SRCREV_POLICY = "cache"' >> conf/local.conf
+
+DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
+
+# Prepare files to publish
+rm -f ${DEPLOY_DIR_IMAGE}/*.txt
+find ${DEPLOY_DIR_IMAGE} -type l -delete
+mv /srv/oe/{source,pinned}-manifest.xml ${DEPLOY_DIR_IMAGE}
+cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
+
+# FIXME: IMAGE_FSTYPES_remove doesn't work
+rm -f ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4 \
+      ${DEPLOY_DIR_IMAGE}/*.rootfs.iso \
+      ${DEPLOY_DIR_IMAGE}/*.rootfs.wic* \
+      ${DEPLOY_DIR_IMAGE}/*.iso \
+      ${DEPLOY_DIR_IMAGE}/*.stimg
+
+# FIXME: Sparse and converted images here, until it gets done by OE
+case "${MACHINE}" in
+  juno)
+    ;;
+  intel-core2-32|intel-corei7-64)
+    for rootfs in ${DEPLOY_DIR_IMAGE}/*.hddimg; do
+      xz -T0 ${rootfs}
+    done
+    ;;
+  *)
+    for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
+      pigz -d -k ${rootfs}
+      sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
+      rm -f ${rootfs%.gz}
+      pigz -9 ${rootfs%.ext4.gz}.img
+    done
+    ;;
+esac
+
+# Create MD5SUMS file
+find ${DEPLOY_DIR_IMAGE} -type f | xargs md5sum > MD5SUMS.txt
+sed -i "s|${DEPLOY_DIR_IMAGE}/||" MD5SUMS.txt
+mv MD5SUMS.txt ${DEPLOY_DIR_IMAGE}
+
+# Build information
+cat > ${DEPLOY_DIR_IMAGE}/HEADER.textile << EOF
+
+h4. LKFT Generic Linux - OpenEmbedded
+
+Build description:
+* Build URL: "$BUILD_URL":$BUILD_URL
+* Manifest URL: "${MANIFEST_URL}":${MANIFEST_URL}
+* Manifest branch: ${MANIFEST_BRANCH}
+* Manifest commit: "${MANIFEST_COMMIT}":${MANIFEST_URL/.git/\/commit}/${MANIFEST_COMMIT}
+EOF
+
+if [ -e "/srv/oe/manifest-changes.txt" ]; then
+  # the space after pre.. tag is on purpose
+  cat > ${DEPLOY_DIR_IMAGE}/README.textile << EOF
+
+h4. Manifest changes
+
+pre.. 
+EOF
+  cat /srv/oe/manifest-changes.txt >> ${DEPLOY_DIR_IMAGE}/README.textile
+  mv /srv/oe/manifest-changes.txt ${DEPLOY_DIR_IMAGE}
+fi
+
+GCCVERSION=$(bitbake -e | grep "^GCCVERSION="| cut -d'=' -f2 | tr -d '"')
+TARGET_SYS=$(bitbake -e | grep "^TARGET_SYS="| cut -d'=' -f2 | tr -d '"')
+TUNE_FEATURES=$(bitbake -e | grep "^TUNE_FEATURES="| cut -d'=' -f2 | tr -d '"')
+STAGING_KERNEL_DIR=$(bitbake -e | grep "^STAGING_KERNEL_DIR="| cut -d'=' -f2 | tr -d '"')
+
+if [ "${DISTRO}" = "rpb" ]; then
+  # lkft-metadata class generates metadata file, which can be sourced
+  for recipe in kselftests-mainline kselftests-next ltp libhugetlbfs; do
+    source lkftmetadata/packages/*/${recipe}/metadata
+  done
+else
+  # Generate LKFT metadata
+  mkdir ${WORKSPACE}/lkftmetadata/
+  for recipe in kselftests-mainline kselftests-next ltp libhugetlbfs ${KERNEL_RECIPE}; do
+    tmpfile=$(mktemp)
+    pkg=$(echo $recipe | tr '[a-z]-' '[A-Z]_')
+    bitbake -e ${recipe} | grep -e ^PV= -e ^SRC_URI= -e ^SRCREV= > ${tmpfile}
+    source ${tmpfile}
+    for suri in $SRC_URI; do if [[ ! $suri =~ file:// ]]; then uri=$(echo $suri | cut -d\; -f1); export ${pkg}_URL=$uri; break; fi; done
+    export ${pkg}_VERSION=${PV}
+    export ${pkg}_REVISION=${SRCREV}
+    unset -v PV SRC_URI SRCREV
+    rm ${tmpfile}
+    for v in URL VERSION REVISION; do
+      myvar="${pkg}_${v}"
+      echo "${myvar}=${!myvar}" >> ${WORKSPACE}/lkftmetadata/${recipe}
+    done
+  done
+fi
+
+BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | sort | xargs -r basename)
+KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+MODULES_TGZ=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*modules-*-${MACHINE}-*-${BUILD_NUMBER}.tgz" | xargs -r basename)
+ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
+ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename)
+ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
+HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.hddimg.xz" | xargs -r basename)
+case "${MACHINE}" in
+  am57xx-evm)
+    # QEMU arm 32bit needs the zImage file, not the uImage file.
+    # KERNEL_IMG is not used for the real hardware itself.
+    KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+    ;;
+  juno)
+    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-r2-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
+    ;;
+esac
+
+cat > ${DEPLOY_DIR_IMAGE}/build_config.json <<EOF
+{
+  "kernel_repo" : "${KERNEL_REPO}",
+  "kernel_commit_id" : "${SRCREV_kernel}",
+  "make_kernelversion" : "${MAKE_KERNELVERSION}",
+  "kernel_branch" : "${KERNEL_BRANCH}",
+  "kernel_describe" : "${KERNEL_DESCRIBE}",
+  "kselftest_mainline_url" : "${KSELFTESTS_MAINLINE_URL}",
+  "kselftest_mainline_version" : "${KSELFTESTS_MAINLINE_VERSION}",
+  "kselftest_next_url" : "${KSELFTESTS_NEXT_URL}",
+  "kselftest_next_version" : "${KSELFTESTS_NEXT_VERSION}",
+  "ltp_url" : "${LTP_URL}",
+  "ltp_version" : "${LTP_VERSION}",
+  "ltp_revision" : "${LTP_REVISION}",
+  "libhugetlbfs_url" : "${LIBHUGETLBFS_URL}",
+  "libhugetlbfs_version" : "${LIBHUGETLBFS_VERSION}",
+  "libhugetlbfs_revision" : "${LIBHUGETLBFS_REVISION}",
+  "build_arch" : "${TUNE_FEATURES}",
+  "compiler" : "${TARGET_SYS} ${GCCVERSION}",
+  "build_location" : "${BASE_URL}/${PUB_DEST}"
+}
+EOF
+
+# Note: the main job script allows to override the default value for
+#       BASE_URL and PUB_DEST, typically used for OE RPB builds
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
+BASE_URL=${BASE_URL}
+BOOT_URL=${BASE_URL}/${PUB_DEST}/${BOOT_IMG}
+SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG}
+KERNEL_URL=${BASE_URL}/${PUB_DEST}/${KERNEL_IMG}
+MODULES_URL=${BASE_URL}/${PUB_DEST}/${MODULES_TGZ}
+DTB_URL=${BASE_URL}/${PUB_DEST}/${DTB_IMG}
+RECOVERY_IMAGE_URL=${BASE_URL}/${PUB_DEST}/juno-oe-uboot.zip
+NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG}
+EXT4_IMAGE_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_EXT4}
+HDD_URL=${BASE_URL}/${PUB_DEST}/${HDD_IMG}
+KERNEL_COMMIT=${SRCREV_kernel}
+KERNEL_CONFIG_URL=${BASE_URL}/${PUB_DEST}/config
+KERNEL_DEFCONFIG_URL=${BASE_URL}/${PUB_DEST}/defconfig
+KSELFTESTS_MAINLINE_URL=${KSELFTESTS_MAINLINE_URL}
+KSELFTESTS_MAINLINE_VERSION=${KSELFTESTS_MAINLINE_VERSION}
+KSELFTESTS_NEXT_URL=${KSELFTESTS_NEXT_URL}
+KSELFTESTS_NEXT_VERSION=${KSELFTESTS_NEXT_VERSION}
+LTP_URL=${LTP_URL}
+LTP_VERSION=${LTP_VERSION}
+LTP_REVISION=${LTP_REVISION}
+LIBHUGETLBFS_URL=${LIBHUGETLBFS_URL}
+LIBHUGETLBFS_VERSION=${LIBHUGETLBFS_VERSION}
+LIBHUGETLBFS_REVISION=${LIBHUGETLBFS_REVISION}
+MAKE_KERNELVERSION=${MAKE_KERNELVERSION}
+TOOLCHAIN="${TARGET_SYS} ${GCCVERSION}"
+EOF
diff --git a/openembedded-lkft/builders-sumits.sh b/openembedded-lkft/builders-sumits.sh
index 61962e06e9..379edbfcf0 100755
--- a/openembedded-lkft/builders-sumits.sh
+++ b/openembedded-lkft/builders-sumits.sh
@@ -20,7 +20,7 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail libelf-dev"
+pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail libelf-dev pigz"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
@@ -100,6 +100,11 @@ cat << EOF >> ${distro_conf}
 IMAGE_FSTYPES_remove = "ext4 iso wic"
 EOF
 
+# Set GCC to 7.x
+cat << EOF >> ${distro_conf}
+GCCVERSION = "7.%"
+EOF
+
 case "${KERNEL_RECIPE}" in
   linux-*-aosp|linux-*-android-*)
     cat << EOF >> ${distro_conf}
@@ -226,10 +231,10 @@ case "${MACHINE}" in
     ;;
   *)
     for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
-      gunzip -k ${rootfs}
+      pigz -d -k ${rootfs}
       sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
       rm -f ${rootfs%.gz}
-      gzip -9 ${rootfs%.ext4.gz}.img
+      pigz -9 ${rootfs%.ext4.gz}.img
     done
     ;;
 esac
@@ -266,6 +271,7 @@ BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_N
 ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
 ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
 KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+MODULES_TGZ=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*modules-*-${MACHINE}-*-${BUILD_NUMBER}.tgz" | xargs -r basename)
 case "${MACHINE}" in
   juno)
     DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-r2-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
@@ -301,6 +307,7 @@ BASE_URL=${BASE_URL}
 BOOT_URL=${BASE_URL}/${PUB_DEST}/${BOOT_IMG}
 SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG}
 KERNEL_URL=${BASE_URL}/${PUB_DEST}/${KERNEL_IMG}
+MODULES_URL=${BASE_URL}/${PUB_DEST}/${MODULES_TGZ}
 DTB_URL=${BASE_URL}/${PUB_DEST}/${DTB_IMG}
 RECOVERY_IMAGE_URL=${BASE_URL}/${PUB_DEST}/juno-oe-uboot.zip
 NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG}
diff --git a/openembedded-lkft/builders.sh b/openembedded-lkft/builders.sh
index 9c1858fbd1..5594b9087f 100755
--- a/openembedded-lkft/builders.sh
+++ b/openembedded-lkft/builders.sh
@@ -20,15 +20,15 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="virtualenv python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail libelf-dev"
+pkg_list="virtualenv python3-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail libelf-dev xz-utils pigz coreutils libgmp-dev libiberty-dev libmpc-dev libyaml-dev"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
 
-# Install jinja2-cli and ruamel.yaml
-pip install --user --force-reinstall jinja2-cli ruamel.yaml
+# Install jinja2-cli and ruamel.yaml==0.16.13
+pip3 install --user --force-reinstall jinja2-cli ruamel.yaml==0.16.13
 
 set -ex
 
@@ -38,17 +38,19 @@ chmod a+x ${HOME}/bin/repo
 export PATH=${HOME}/bin:${PATH}
 
 # initialize repo if not done already
+export MANIFEST_URL=${MANIFEST_URL:-https://github.com/96boards/oe-rpb-manifest.git}
 if [ ! -e ".repo/manifest.xml" ]; then
-   repo init -u https://github.com/96boards/oe-rpb-manifest.git -b ${MANIFEST_BRANCH}
+   repo init -u ${MANIFEST_URL} -b ${MANIFEST_BRANCH}
 
    # link to shared downloads on persistent disk
    # our builds config is expecting downloads and sstate-cache, here.
    # DL_DIR = "${OEROOT}/sources/downloads"
    # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
-   mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
+   SSTATE_BRANCH="${SSTATE_BRANCH:-${MANIFEST_BRANCH}}"
+   mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}-${SSTATE_BRANCH}
    mkdir -p build
    ln -s ${HOME}/srv/oe/downloads
-   ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
+   ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${SSTATE_BRANCH} sstate-cache
 fi
 
 repo sync
@@ -68,13 +70,17 @@ fi
 # make sure we get rid of old config.
 # let's remove the previous TMPDIR as well.
 # we want to preserve build/buildhistory though.
-rm -rf conf build/conf build/tmp-*glibc/
+rm -rf build/conf build/tmp-*glibc/
 
 # Accept EULA if/when needed
 export EULA_dragonboard410c=1
-export EULA_stih410b2260=1
+
+[ -v KERNEL_SRCREV ] && export SRCREV_kernel="${KERNEL_SRCREV}"
 source setup-environment build
 
+########## vvv DISTRO DEPENDANT vvv ##########
+if [ "${DISTRO}" = "rpb" ]; then
+
 # Add job BUILD_NUMBER to output files names
 cat << EOF >> conf/auto.conf
 IMAGE_NAME_append = "-${BUILD_NUMBER}"
@@ -108,6 +114,11 @@ cat << EOF >> ${distro_conf}
 IMAGE_FSTYPES_remove = "ext4 iso wic"
 EOF
 
+# Set GCC to 7.x
+cat << EOF >> ${distro_conf}
+GCCVERSION = "7.%"
+EOF
+
 case "${KERNEL_RECIPE}" in
   linux-*-aosp|linux-*-android-*)
     cat << EOF >> ${distro_conf}
@@ -116,19 +127,8 @@ EOF
     ;;
 esac
 
-cat << EOF >> ${distro_conf}
-KERNEL_ALT_IMAGETYPE_remove_stih410-b2260 = "vmlinux"
-EOF
-
-# Mali GPU driver fails to build
-# error: implicit declaration of function 'copy_from_user'
-# [-Werror=implicit-function-declaration]
-# Ignore the whole gpu MACHINE_FEATURES mechanism
-stih410_b2260_conf=$(find ../layers/meta-st-cannes2/conf/machine -name stih410-b2260.conf)
-sed -i -e '/gpu/d' ${stih410_b2260_conf}
-
 # Include additional recipes in the image
-[ "${MACHINE}" = "am57xx-evm" -o "${MACHINE}" = "stih410-b2260" ] || extra_pkgs="numactl"
+[ "${MACHINE}" = "am57xx-evm" -o "${MACHINE}" = "beaglebone" ] || extra_pkgs="numactl"
 cat << EOF >> conf/local.conf
 CORE_IMAGE_BASE_INSTALL_append = " kernel-selftests kselftests-mainline kselftests-next libhugetlbfs-tests ltp ${extra_pkgs}"
 CORE_IMAGE_BASE_INSTALL_append = " python python-misc python-modules python-numpy python-pexpect python-pyyaml"
@@ -147,8 +147,8 @@ RDEPENDS_packagegroup-rpb_remove = "docker"
 EOF
 
 cat << EOF >> conf/local.conf
-DEFAULTTUNE_intel-core2-32 = "core2-64"
 SERIAL_CONSOLES_remove_intel-core2-32 = "115200;ttyPCH0"
+SERIAL_CONSOLES_remove_intel-corei7-64 = "115200;ttyPCH0"
 SERIAL_CONSOLES_append_dragonboard-410c = " 115200;ttyMSM1"
 SERIAL_CONSOLES_append_hikey = " 115200;ttyAMA2"
 EOF
@@ -159,17 +159,27 @@ INHERIT += "lkft-metadata"
 LKFTMETADATA_COMMIT = "1"
 EOF
 
+# Update kernel recipe SRCREV
+echo "SRCREV_kernel_${MACHINE} = \"${SRCREV_kernel}\"" >> conf/local.conf
+
+fi
+########## ^^^ DISTRO DEPENDANT ^^^ ##########
+
 # Remove systemd firstboot and machine-id file
 # Backport serialization change from v234 to avoid systemd tty race condition
-mkdir -p ../layers/meta-96boards/recipes-core/systemd/systemd
-wget -q http://people.linaro.org/~fathi.boudra/backport-v234-e266c06-v230.patch \
-  -O ../layers/meta-96boards/recipes-core/systemd/systemd/backport-v234-e266c06-v230.patch
-cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd/e2fsck.conf
+# Only on Morty
+if [ "${MANIFEST_BRANCH}" = "morty" ]; then
+  mkdir -p ../layers/meta-96boards/recipes-core/systemd/systemd
+  wget -q http://people.linaro.org/~fathi.boudra/backport-v234-e266c06-v230.patch \
+    -O ../layers/meta-96boards/recipes-core/systemd/systemd/backport-v234-e266c06-v230.patch
+
+  cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd/e2fsck.conf
 [options]
 # This will prevent e2fsck from stopping boot just because the clock is wrong
 broken_system_clock = 1
 EOF
-cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd_%.bbappend
+
+  cat << EOF >> ../layers/meta-96boards/recipes-core/systemd/systemd_%.bbappend
 FILESEXTRAPATHS_prepend := "\${THISDIR}/\${PN}:"
 
 SRC_URI += "\\
@@ -188,20 +198,41 @@ do_install_append() {
 
 FILES_\${PN} += "\${sysconfdir}/e2fsck.conf "
 EOF
+elif [ "${MANIFEST_BRANCH}" = "rocko" ]; then
+  sed -i "s|bits/wordsize.h||" ../layers/openembedded-core/meta/recipes-core/glibc/glibc-package.inc
+fi
 
-# Update kernel recipe SRCREV
-kernel_recipe=$(find ../layers/meta-96boards -name ${KERNEL_RECIPE}_${KERNEL_VERSION}.bb)
-sed -i "s|^SRCREV_kernel = .*|SRCREV_kernel = \"${SRCREV_kernel}\"|" ${kernel_recipe}
+# Place generic kernel definitions (if needed)
+if [ -e ${WORKSPACE}/custom-kernel-info.inc.tmp ]; then
+    mv -v ${WORKSPACE}/custom-kernel-info.inc.tmp conf/custom-kernel-info.inc
+fi
+
+# The kernel (as of next-20181130) requires fold from the host
+echo "HOSTTOOLS += \"fold\"" >> conf/local.conf
+
+# Workaround for missing juno-r2.dtb in Linux 4.4
+if [ "${KERNEL_VERSION}" = "4.4" ] && [ "${MACHINE}" = "juno" ]; then
+  echo 'KERNEL_DEVICETREE_remove_juno = "arm/juno-r2.dtb"' >> conf/local.conf
+fi
 
 # add useful debug info
-cat conf/{site,auto}.conf
-cat ${distro_conf}
+for f in conf/{site,auto,local}.conf ${distro_conf} ${custom_kernel_conf}; do
+  if [ -f ${f} ]; then
+    echo "=== contents of $f ==="
+    cat ${f}
+  else
+    echo "=== not existent: $f ==="
+  fi
+done
 
 # Temporary sstate cleanup to get lkft metadata generated
-bitbake -c cleansstate kselftests-mainline kselftests-next ltp libhugetlbfs
+[ "${DISTRO}" = "rpb" ] && bitbake -c cleansstate kselftests-mainline kselftests-next ltp libhugetlbfs
 
 time bitbake ${IMAGES}
 
+# Disable network for AUTOREV
+echo 'BB_SRCREV_POLICY = "cache"' >> conf/local.conf
+
 DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
 
 # Prepare files to publish
@@ -213,19 +244,29 @@ cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
 # FIXME: IMAGE_FSTYPES_remove doesn't work
 rm -f ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4 \
       ${DEPLOY_DIR_IMAGE}/*.rootfs.iso \
-      ${DEPLOY_DIR_IMAGE}/*.rootfs.wic \
+      ${DEPLOY_DIR_IMAGE}/*.rootfs.wic* \
+      ${DEPLOY_DIR_IMAGE}/*.iso \
       ${DEPLOY_DIR_IMAGE}/*.stimg
 
-# FIXME: Sparse images here, until it gets done by OE
+# FIXME: Sparse and converted images here, until it gets done by OE
 case "${MACHINE}" in
-  juno|stih410-b2260|intel-core2-32)
+  juno)
+    ;;
+  intel-core2-32|intel-corei7-64)
+    for rootfs in ${DEPLOY_DIR_IMAGE}/*.hddimg; do
+      if [ -e "${rootfs}" ]; then
+        xz -T0 "${rootfs}"
+      fi
+    done
     ;;
   *)
     for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
-      gunzip -k ${rootfs}
-      sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
-      rm -f ${rootfs%.gz}
-      gzip -9 ${rootfs%.ext4.gz}.img
+      if [ -f "${rootfs}" ]; then
+        pigz -d -k "${rootfs}"
+        sudo ext2simg -v "${rootfs%.gz}" "${rootfs%.ext4.gz}.img"
+        rm -f "${rootfs%.gz}"
+        pigz -9 "${rootfs%.ext4.gz}.img"
+      fi
     done
     ;;
 esac
@@ -242,9 +283,9 @@ h4. LKFT - OpenEmbedded
 
 Build description:
 * Build URL: "$BUILD_URL":$BUILD_URL
-* Manifest URL: "https://github.com/96boards/oe-rpb-manifest.git":https://github.com/96boards/oe-rpb-manifest.git
+* Manifest URL: "${MANIFEST_URL}":${MANIFEST_URL}
 * Manifest branch: ${MANIFEST_BRANCH}
-* Manifest commit: "${MANIFEST_COMMIT}":https://github.com/96boards/oe-rpb-manifest/commit/${MANIFEST_COMMIT}
+* Manifest commit: "${MANIFEST_COMMIT}":${MANIFEST_URL/.git/\/commit}/${MANIFEST_COMMIT}
 EOF
 
 if [ -e "/srv/oe/manifest-changes.txt" ]; then
@@ -259,23 +300,67 @@ EOF
   mv /srv/oe/manifest-changes.txt ${DEPLOY_DIR_IMAGE}
 fi
 
-GCCVERSION=$(bitbake -e | grep "^GCCVERSION="| cut -d'=' -f2 | tr -d '"')
-TARGET_SYS=$(bitbake -e | grep "^TARGET_SYS="| cut -d'=' -f2 | tr -d '"')
-TUNE_FEATURES=$(bitbake -e | grep "^TUNE_FEATURES="| cut -d'=' -f2 | tr -d '"')
-STAGING_KERNEL_DIR=$(bitbake -e | grep "^STAGING_KERNEL_DIR="| cut -d'=' -f2 | tr -d '"')
-
-# lkft-metadata class generates metadata file, which can be sourced
-for recipe in kselftests-mainline kselftests-next ltp libhugetlbfs; do
-  source lkftmetadata/packages/*/${recipe}/metadata
-done
+# Save Bitbake environment
+mkdir ${WORKSPACE}/lkftmetadata/
+bb_env=$(mktemp)
+bitbake -e > "${bb_env}"
+(
+  grep "^GCCVERSION=" "${bb_env}"
+  grep "^TARGET_SYS=" "${bb_env}"
+  grep "^TUNE_FEATURES=" "${bb_env}"
+  grep "^STAGING_KERNEL_DIR=" "${bb_env}"
+) > "${WORKSPACE}/lkftmetadata/bitbake"
+rm -v "${bb_env}"
+
+set -a
+source "${WORKSPACE}/lkftmetadata/bitbake"
+set +a
+
+if [ "${DISTRO}" = "rpb" ]; then
+  # lkft-metadata class generates metadata file, which can be sourced
+  for recipe in kselftests-mainline kselftests-next ltp libhugetlbfs; do
+    source lkftmetadata/packages/*/${recipe}/metadata
+  done
+else
+  # Generate LKFT metadata
+  for recipe in kselftests-mainline kselftests-next ltp libhugetlbfs ${KERNEL_RECIPE}; do
+    tmpfile=$(mktemp)
+    pkg=$(echo $recipe | tr '[a-z]-' '[A-Z]_')
+    bitbake -e ${recipe} | grep -e ^PV= -e ^SRC_URI= -e ^SRCREV= > ${tmpfile}
+    source ${tmpfile}
+    for suri in $SRC_URI; do if [[ ! $suri =~ file:// ]]; then uri=$(echo $suri | cut -d\; -f1); export ${pkg}_URL=$uri; break; fi; done
+    export ${pkg}_VERSION=${PV}
+    export ${pkg}_REVISION=${SRCREV}
+    unset -v PV SRC_URI SRCREV
+    rm ${tmpfile}
+    for v in URL VERSION REVISION; do
+      myvar="${pkg}_${v}"
+      echo "${myvar}=${!myvar}" >> ${WORKSPACE}/lkftmetadata/${recipe}
+    done
+  done
+fi
 
-BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | xargs -r basename)
-ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
-ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename)
-ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
+BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | sort | xargs -r basename)
 KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
-HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.hddimg" | xargs -r basename)
+MODULES_TGZ=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*modules-*-${MACHINE}-*-${BUILD_NUMBER}.tgz" | xargs -r basename)
+ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
+ROOTFS_EXT4=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename)
+ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
+HDD_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-lkft-${MACHINE}-*-${BUILD_NUMBER}.hddimg.xz" | xargs -r basename)
 case "${MACHINE}" in
+  am57xx-evm)
+    # QEMU arm 32bit needs the zImage file, not the uImage file.
+    # KERNEL_IMG is not used for the real hardware itself.
+    KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*-am57xx-beagle-x15-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
+    ;;
+  dragonboard-410c | dragonboard-845c)
+    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "Image.gz-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
+    KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "Image.gz-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+    ;;
+  hikey)
+    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
+    ;;
   juno)
     DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-r2-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
     ;;
@@ -310,6 +395,7 @@ BASE_URL=${BASE_URL}
 BOOT_URL=${BASE_URL}/${PUB_DEST}/${BOOT_IMG}
 SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG}
 KERNEL_URL=${BASE_URL}/${PUB_DEST}/${KERNEL_IMG}
+MODULES_URL=${BASE_URL}/${PUB_DEST}/${MODULES_TGZ}
 DTB_URL=${BASE_URL}/${PUB_DEST}/${DTB_IMG}
 RECOVERY_IMAGE_URL=${BASE_URL}/${PUB_DEST}/juno-oe-uboot.zip
 NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG}
@@ -329,4 +415,5 @@ LIBHUGETLBFS_URL=${LIBHUGETLBFS_URL}
 LIBHUGETLBFS_VERSION=${LIBHUGETLBFS_VERSION}
 LIBHUGETLBFS_REVISION=${LIBHUGETLBFS_REVISION}
 MAKE_KERNELVERSION=${MAKE_KERNELVERSION}
+TOOLCHAIN="${TARGET_SYS} ${GCCVERSION}"
 EOF
diff --git a/openembedded-lkft/kernel-versions.sh b/openembedded-lkft/kernel-versions.sh
new file mode 100644
index 0000000000..84824ebda6
--- /dev/null
+++ b/openembedded-lkft/kernel-versions.sh
@@ -0,0 +1,38 @@
+#!/bin/bash
+
+# Variables needed here:
+#  KERNEL_REPO         A clonable Git repository.
+#  KERNEL_REV          The branch or commit ID to checkout.
+#
+# This will create a file named ${WORKSPACE}/linux_versions
+# that can then be injected into the environment. The contents
+# will be:
+#  KERNEL_DESCRIBE     The output of `git describe --always`.
+#  KERNEL_SRCREV       The actual commit id that is the result
+#                      of the checkout or reset.
+#  MAKE_KERNELVERSION  The output of running `make
+#                      kernelversion` in the Linux tree.
+
+set -xe
+
+git clone --reference-if-able "${HOME}/srv/linux.git" -o origin "${KERNEL_REPO}" "${WORKSPACE}/linux"
+cd "${WORKSPACE}/linux"
+git remote add torvalds https://github.com/torvalds/linux.git
+git remote add linux-stable https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
+git remote add linux-stable-rc https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
+git fetch --multiple torvalds linux-stable linux-stable-rc
+git checkout "${KERNEL_REV}"
+GIT_COMMIT="$(git rev-parse HEAD)"
+
+MAKE_KERNELVERSION="$(make kernelversion)"
+kernel_major="$(echo ${MAKE_KERNELVERSION} | cut -d\. -f1)"
+kernel_minor="$(echo ${MAKE_KERNELVERSION} | cut -d\. -f2)"
+if echo "${MAKE_KERNELVERSION}" | grep -q "rc"; then
+  kernel_minor=$((kernel_minor - 1))
+fi
+echo "KERNEL_DESCRIBE=$(git describe --always)" >> "${WORKSPACE}/linux_versions"
+echo "KERNEL_SRCREV=${GIT_COMMIT}" >> "${WORKSPACE}/linux_versions"
+echo "MAKE_KERNELVERSION=${MAKE_KERNELVERSION}" >> "${WORKSPACE}/linux_versions"
+echo "KERNEL_VERSION=${kernel_major}.${kernel_minor}" >> "${WORKSPACE}/linux_versions"
+echo "KERNEL_BRANCH=linux-${kernel_major}.${kernel_minor}.y" >>"${WORKSPACE}/linux_versions"
+cat "${WORKSPACE}/linux_versions"
diff --git a/openembedded-lkft/lava-job-definitions/devices/b2260 b/openembedded-lkft/lava-job-definitions/devices/b2260
deleted file mode 100644
index eed7178d11..0000000000
--- a/openembedded-lkft/lava-job-definitions/devices/b2260
+++ /dev/null
@@ -1,60 +0,0 @@
-{% extends "lkft-nfs.jinja2" %}
-
-{% block global_settings %}
-{{ super() }}
-context:
-  test_character_delay: 10
-{% endblock global_settings %}
-
-{% block device_type %}b2260{% endblock %}
-
-{% block deploy_target %}
-- deploy:
-    namespace: target
-    timeout:
-      minutes: 15
-    to: tftp
-    kernel:
-      url: {{KERNEL_URL}}
-      type: uimage
-    dtb:
-      url: {{DTB_URL}}
-    nfsrootfs:
-      url: {{NFSROOTFS_URL}}
-      compression: xz
-    os: oe
-{% endblock deploy_target %}
-
-{% block boot_target %}
-- boot:
-    namespace: target
-    timeout:
-      minutes: 10
-    method: u-boot
-    commands: nfs
-    auto_login:
-      login_prompt: "stih410-b2260 login: "
-      username: root
-    prompts:
-    - 'root@stih410-b2260:~#' 
-{% endblock boot_target %}
-
-{% block test_target %}
-  {{ super() }}
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: prep-tmp-disk
-          description: "Mount local disk for tmp space"
-        run:
-          steps:
-            # no content at the moment
-            # to be updated once SD cards are available
-            - df -h
-            - mount
-            - ls /dev/disk/by-id/ -l
-      name: prep-tmp-disk
-      path: inline/prep.yaml
-{% endblock test_target %}
-
diff --git a/openembedded-lkft/lava-job-definitions/devices/dragonboard-410c b/openembedded-lkft/lava-job-definitions/devices/dragonboard-410c
index f761eeb87a..78be778c43 100644
--- a/openembedded-lkft/lava-job-definitions/devices/dragonboard-410c
+++ b/openembedded-lkft/lava-job-definitions/devices/dragonboard-410c
@@ -1,52 +1,42 @@
 {% extends "lkft-fastboot.jinja2" %}
 
 {% block device_type %}dragonboard-410c{% endblock %}
+{% block tags %}
+tags:
+  - new-firmware
+{% endblock %}
 
 {% block deploy_target %}
 - deploy:
     timeout:
-      minutes: 15
+      minutes: 25
     to: fastboot
-    namespace: target
-    connection: lxc
+    docker:
+      image: linaro/kir
     images:
       boot:
-        url: {{BOOT_URL}}
+        url: downloads://boot.img
       rootfs:
-        url: {{SYSTEM_URL}}
-        compression: gz
+        url: downloads://rpb-console-image-lkft.rootfs.img
         apply-overlay: true
     os: oe
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
+- command:
+    name: pre_os_command
+- command:
+    name: pre_power_command
 {% endblock deploy_target %}
 
 {% block boot_target %}
 - boot:
-    namespace: target
     auto_login:
       login_prompt: 'login:'
-      username: linaro
-      login_commands:
-        # Become super user to run tests
-        - su
+      username: root
     prompts:
     - 'root@(.*):/#'
     - 'root@dragonboard-410c:~#'
+    - 'dragonboard-410c:/home/linaro#'
     - 'dragonboard-410c:~\$'
     timeout:
       minutes: 5
     method: fastboot
 {% endblock boot_target %}
-
-{% block test_target %}
-- test:
-    namespace: target
-    timeout:
-      minutes: 60
-    definitions:
-{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey b/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey
index 30de3952ed..a4f5496fd7 100644
--- a/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey
+++ b/openembedded-lkft/lava-job-definitions/devices/hi6220-hikey
@@ -1,65 +1,49 @@
 {% extends "lkft-fastboot.jinja2" %}
 
-{% block device_type %}hi6220-hikey{% endblock %}
+{% block device_type %}hi6220-hikey-r2{% endblock %}
 
 {% block deploy_target %}
 - deploy:
     timeout:
       minutes: 15
     to: fastboot
-    namespace: target
-    connection: lxc
+    docker:
+      image: linaro/kir
     images:
       ptable:
-        url: http://releases.linaro.org/reference-platform/embedded/hikey/16.12/rpb/bootloader/ptable-linux-8g.img
+        url: downloads://ptable-linux-8g.img
         reboot: hard-reset
       boot:
-        url: {{BOOT_URL}}
+        url: downloads://boot.img
         reboot: hard-reset
       system:
-        url: {{SYSTEM_URL}}
-        compression: gz
+        url: downloads://rpb-console-image-lkft.rootfs.img
         apply-overlay: true
     os: oe
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
+- command:
+    name: pre_os_command
+- command:
+    name: pre_power_command
 {% endblock deploy_target %}
 
 {% block boot_target %}
 - boot:
-    namespace: target
     auto_login:
       login_prompt: 'login:'
-      username: linaro
-      login_commands:
-        # Become super user to run tests
-        - su
+      username: root
     prompts:
     - 'hikey:~'
+    - 'hikey:/home/linaro#'
     - 'root@(.*):/#'
     timeout:
-      minutes: 5
-    method: uefi-menu
-    commands: fastboot
-    protocols:
-      lava-lxc:
-      # other action could be boot-fastboot
-      - action: uefi-commands
-        request: pre-os-command
-        timeout:
-          minutes: 2
+      minutes: 10
+    method: grub
+- command:
+    name: pre_os_command
 {% endblock boot_target %}
 
 {% block test_target %}
-- test:
-    namespace: target
-    timeout:
-      minutes: 60
-    definitions:
+  {{ super() }}
     - from: inline
       repository:
         metadata:
@@ -70,15 +54,15 @@
           steps:
           # the image does not raise the interface itself
           # force a DHCP request to avoid avahi using a zero conf address.
-          - udhcpc
-          - netstat
-          - ip a
-          - ifconfig
+          # - udhcpc
+          # - netstat
+          # - ip a
+          # - ifconfig
           - df
           - cat /sys/class/thermal/thermal_zone0/policy || true
           - echo "power_allocator" > /sys/class/thermal/thermal_zone0/policy || true
           - cat /sys/class/thermal/thermal_zone0/policy || true
-          - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies  | awk '{ print $$(NF-1) }'  > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
+          - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_available_frequencies  | awk '{ print $(NF-1) }'  > /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq
           - cat /sys/devices/system/cpu/cpufreq/policy0/scaling_max_freq || true
       name: prep-inline
       path: inline/prep.yaml
diff --git a/openembedded-lkft/lava-job-definitions/devices/i386 b/openembedded-lkft/lava-job-definitions/devices/i386
new file mode 120000
index 0000000000..f4bad791ea
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/devices/i386
@@ -0,0 +1 @@
+x86
\ No newline at end of file
diff --git a/openembedded-lkft/lava-job-definitions/devices/juno-r2 b/openembedded-lkft/lava-job-definitions/devices/juno-r2
index 4de382c487..ba50603557 100644
--- a/openembedded-lkft/lava-job-definitions/devices/juno-r2
+++ b/openembedded-lkft/lava-job-definitions/devices/juno-r2
@@ -4,21 +4,13 @@
 {{ super() }}
 context:
   bootloader_prompt: juno#
+  booti_dtb_addr: "0x85000000"
 {% endblock global_settings %}
 
 {% block device_type %}juno-r2{% endblock %}
 
 {% block deploy_target %}
 - deploy:
-    namespace: recovery
-    timeout:
-      minutes: 10
-    to: vemsd
-    recovery_image:
-      url:  {{RECOVERY_IMAGE_URL}}
-      compression: zip
-
-- deploy:
     namespace: target
     timeout:
       minutes: 10
@@ -29,6 +21,9 @@ context:
       type: image
     dtb:
       url: {{DTB_URL}}
+    modules:
+      url: {{MODULES_URL}}
+      compression: gz
     nfsrootfs:
       url: {{NFSROOTFS_URL}}
       compression: xz
@@ -40,7 +35,6 @@ context:
     namespace: target
     timeout:
       minutes: 10
-    connection-namespace: recovery
     method: u-boot
     commands: nfs
     auto_login:
@@ -63,8 +57,8 @@ context:
           - export STORAGE_DEV=$(lava-target-storage SATA || lava-target-storage USB)
           - test -n "${STORAGE_DEV}" || lava-test-raise "STORAGE_DEV not found; job exit"
           - echo "y" | mkfs -t ext4 ${STORAGE_DEV} || lava-test-raise "mkfs -t ext4 ${STORAGE_DEV} failed; job exit"
-          - mkdir -p /ltp-tmp
-          - mount ${STORAGE_DEV} /ltp-tmp && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit"
+          - mkdir -p /scratch
+          - mount ${STORAGE_DEV} /scratch && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit"
           - df -h
           - mount
       name: prep-inline
diff --git a/openembedded-lkft/lava-job-definitions/devices/qemu_arm b/openembedded-lkft/lava-job-definitions/devices/qemu_arm
index 70ff971f4b..781e0824c9 100644
--- a/openembedded-lkft/lava-job-definitions/devices/qemu_arm
+++ b/openembedded-lkft/lava-job-definitions/devices/qemu_arm
@@ -1,16 +1,18 @@
 {% extends "lkft-nfs.jinja2" %}
 
+{# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #}
+{% set libhuggetlbfs_word_size = 32 %}
 {% block global_settings %}
 {{ super() }}
 context:
-  arch: arm
+  arch: arm64
   netdevice: tap
-  machine: virt
-  cpu: cortex-a15
+  machine: virt-2.10,accel=kvm
+  cpu: host,aarch64=off
   guestfs_interface: virtio
 {% endblock global_settings %}
 
-{% block device_type %}qemu{% endblock %}
+{% block device_type %}qemu-arm{% endblock %}
 
 {% block deploy_target %}
 - deploy:
@@ -20,7 +22,7 @@ context:
     to: tmpfs
     images:
       rootfs:
-        image_arg: -drive format=raw,file={rootfs} -m 4096 -smp 2 -nographic
+        image_arg: -drive format=raw,file={rootfs},if=virtio -m 4096 -smp 4 -nographic
         url: {{EXT4_IMAGE_URL}}
         compression: gz
         apply-overlay: true
@@ -55,11 +57,11 @@ context:
         metadata:
           format: Lava-Test Test Definition 1.0
           name: prep-tmp-disk
-          description: "Link /ltp-tmp to /tmp"
+          description: "Link /scratch to /tmp"
         run:
           steps:
             - df -h
-            - ln -s /tmp /ltp-tmp
+            - ln -s /tmp /scratch
       name: prep-tmp-disk
       path: inline/prep.yaml
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/qemu_arm64 b/openembedded-lkft/lava-job-definitions/devices/qemu_arm64
index a2f404d96b..4966bc2c4b 100644
--- a/openembedded-lkft/lava-job-definitions/devices/qemu_arm64
+++ b/openembedded-lkft/lava-job-definitions/devices/qemu_arm64
@@ -5,12 +5,12 @@
 context:
   arch: arm64
   netdevice: tap
-  machine: virt
-  cpu: cortex-a57
+  machine: virt-2.10,accel=kvm
+  cpu: host
   guestfs_interface: virtio
 {% endblock global_settings %}
 
-{% block device_type %}qemu{% endblock %}
+{% block device_type %}qemu-arm{% endblock %}
 
 {% block deploy_target %}
 - deploy:
@@ -20,7 +20,7 @@ context:
     to: tmpfs
     images:
       rootfs:
-        image_arg: -drive format=raw,file={rootfs} -m 4096 -smp 4 -nographic
+        image_arg: -drive format=raw,file={rootfs},if=virtio -m 4096 -smp 4 -nographic
         url: {{EXT4_IMAGE_URL}}
         compression: gz
         apply-overlay: true
@@ -45,7 +45,7 @@ context:
       login_commands:
         - su
     prompts:
-    - 'root@hikey:~#'
+    - root@(.*):~#
 {% endblock boot_target %}
 
 {% block test_target %}
@@ -55,11 +55,11 @@ context:
         metadata:
           format: Lava-Test Test Definition 1.0
           name: prep-tmp-disk
-          description: "Link /ltp-tmp to /tmp"
+          description: "Link /scratch to /tmp"
         run:
           steps:
             - df -h
-            - ln -s /tmp /ltp-tmp
+            - ln -s /tmp /scratch
       name: prep-tmp-disk
       path: inline/prep.yaml
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/qemu_i386 b/openembedded-lkft/lava-job-definitions/devices/qemu_i386
new file mode 100644
index 0000000000..b5a2c33fe0
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/devices/qemu_i386
@@ -0,0 +1,62 @@
+{% extends "lkft-nfs.jinja2" %}
+
+{# libhugetlbfs_word_size variable is required for libhugetlbfs.yaml test template #}
+{% set libhuggetlbfs_word_size = 32 %}
+
+{% block global_settings %}
+{{ super() }}
+context:
+  arch: i386
+  guestfs_interface: virtio
+{% endblock global_settings %}
+
+{% block device_type %}qemu{% endblock %}
+
+{% block deploy_target %}
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      kernel:
+        image_arg: -kernel {kernel} --append "root=/dev/sda  rootwait console=ttyS0,115200"
+        url: {{KERNEL_URL}}
+      rootfs:
+        image_arg: -hda {rootfs} -m 4096 -smp 4 -nographic
+        url: {{EXT4_IMAGE_URL}}
+        compression: gz
+    os: oe
+{% endblock deploy_target %}
+
+{% block boot_target %}
+- boot:
+    namespace: target
+    timeout:
+      minutes: 10
+    method: qemu
+    media: tmpfs
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      login_commands:
+        - su
+    prompts:
+    - 'root@intel-core2-32:'
+{% endblock boot_target %}
+
+{% block test_target %}
+  {{ super() }}
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: prep-tmp-disk
+          description: "Link /scratch to /tmp"
+        run:
+          steps:
+            - df -h
+            - ln -s /tmp /scratch
+      name: prep-tmp-disk
+      path: inline/prep.yaml
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/qemu_x86_64 b/openembedded-lkft/lava-job-definitions/devices/qemu_x86_64
index 262ab7428e..3c38e2f2f8 100644
--- a/openembedded-lkft/lava-job-definitions/devices/qemu_x86_64
+++ b/openembedded-lkft/lava-job-definitions/devices/qemu_x86_64
@@ -4,6 +4,7 @@
 {{ super() }}
 context:
   arch: amd64
+  guestfs_interface: virtio
 {% endblock global_settings %}
 
 {% block device_type %}qemu{% endblock %}
@@ -15,9 +16,13 @@ context:
       minutes: 15
     to: tmpfs
     images:
+      kernel:
+        image_arg: -kernel {kernel} --append "root=/dev/sda  rootwait console=ttyS0,115200"
+        url: {{KERNEL_URL}}
       rootfs:
-        image_arg: -drive format=raw,file={rootfs} -m 4096 -smp 4 -nographic
-        url: {{HDD_URL}}
+        image_arg: -hda {rootfs} -m 4096 -smp 4 -nographic
+        url: {{EXT4_IMAGE_URL}}
+        compression: gz
     os: oe
 {% endblock deploy_target %}
 
@@ -35,6 +40,7 @@ context:
         - su
     prompts:
     - 'root@intel-core2-32:'
+    - 'root@intel-corei7-64:'
 {% endblock boot_target %}
 
 {% block test_target %}
@@ -44,11 +50,11 @@ context:
         metadata:
           format: Lava-Test Test Definition 1.0
           name: prep-tmp-disk
-          description: "Link /ltp-tmp to /tmp"
+          description: "Link /scratch to /tmp"
         run:
           steps:
             - df -h
-            - ln -s /tmp /ltp-tmp
+            - ln -s /tmp /scratch
       name: prep-tmp-disk
       path: inline/prep.yaml
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/x15 b/openembedded-lkft/lava-job-definitions/devices/x15
index a42d35e952..7dab5c8c5d 100644
--- a/openembedded-lkft/lava-job-definitions/devices/x15
+++ b/openembedded-lkft/lava-job-definitions/devices/x15
@@ -9,29 +9,28 @@
     timeout:
       minutes: 25
     to: fastboot
-    namespace: target
-    connection: lxc
+    docker:
+      image: linaro/kir
     images:
-      userdata:
-        url: {{SYSTEM_URL}}
-        compression: gz
+      super:
+        url: downloads://rpb-console-image-lkft.rootfs.img
         apply-overlay: true
     os: oe
 {% endblock deploy_target %}
 
 {% block boot_target %}
 - boot:
-    namespace: target
     auto_login:
       login_prompt: 'am57xx-evm login:'
       username: root
     prompts:
     - 'root@am57xx-evm:'
     commands:
-    - run findfdt
+    - setenv fdtfile am57xx-beagle-x15.dtb
     - setenv console ttyS2,115200n8
     - setenv mmcdev 1
-    - "setenv bootpart 1:f"
+    - part number mmc 1 super part_num
+    - "setenv bootpart 1:${part_num}"
     - run mmcboot
     timeout:
       minutes: 15
@@ -39,9 +38,24 @@
 {% endblock boot_target %}
 
 {% block test_target %}
-- test:
-    namespace: target
-    timeout:
-      minutes: 60
-    definitions:
+  {{ super() }}
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: prep-tmp-disk
+          description: "Mount local disk for tmp space"
+        run:
+          steps:
+{% if KERNEL_VERSION != '4.4' %}
+          - export STORAGE_DEV=$(lava-target-storage SATA || lava-target-storage USB)
+          - test -n "${STORAGE_DEV}" || lava-test-raise "STORAGE_DEV not found; job exit"
+          - echo "y" | mkfs -t ext4 ${STORAGE_DEV} || lava-test-raise "mkfs -t ext4 ${STORAGE_DEV} failed; job exit"
+          - mkdir -p /scratch
+          - mount ${STORAGE_DEV} /scratch && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit"
+{% endif %}
+          - df -h
+          - mount
+      name: prep-tmp-disk
+      path: inline/prep.yaml
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/devices/x86 b/openembedded-lkft/lava-job-definitions/devices/x86
index 7e7da6cc4c..fc9ce7ac5a 100644
--- a/openembedded-lkft/lava-job-definitions/devices/x86
+++ b/openembedded-lkft/lava-job-definitions/devices/x86
@@ -16,6 +16,9 @@ context:
     to: tftp
     kernel:
       url: {{KERNEL_URL}}
+    modules:
+      url: {{MODULES_URL}}
+      compression: gz
     nfsrootfs:
       url: {{NFSROOTFS_URL}}
       compression: xz
@@ -38,6 +41,7 @@ context:
         - su
     prompts:
     - 'root@intel-core2-32:'
+    - 'root@intel-corei7-64:'
 {% endblock boot_target %}
 
 {% block test_target %}
@@ -50,15 +54,13 @@ context:
           description: "Mount local disk for tmp space"
         run:
           steps:
-            - df -h
-            - mount
-            - ls /dev/disk/by-id/ -l
-            - export TMPDISK=$(ls /dev/disk/by-id/ata-TOSHIBA_MG03ACA100_*)
-            - echo "y" | mkfs -t ext4 ${TMPDISK}
-            - mkdir -p /ltp-tmp
-            - mount ${TMPDISK} /ltp-tmp || lava-test-raise "mount failed job exit"
-            - df -h
-            - mount
+          - export STORAGE_DEV=$(lava-target-storage SATA || lava-target-storage USB)
+          - test -n "${STORAGE_DEV}" || lava-test-raise "STORAGE_DEV not found; job exit"
+          - echo "y" | mkfs -t ext4 ${STORAGE_DEV} || lava-test-raise "mkfs -t ext4 ${STORAGE_DEV} failed; job exit"
+          - mkdir -p /scratch
+          - mount ${STORAGE_DEV} /scratch && echo "mounted" || lava-test-raise "mount ${STORAGE_DEV} failed; job exit"
+          - df -h
+          - mount
       name: prep-tmp-disk
       path: inline/prep.yaml
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/lkft-fastboot.jinja2 b/openembedded-lkft/lava-job-definitions/lkft-fastboot.jinja2
index 5e2f1091a5..c5f8707978 100644
--- a/openembedded-lkft/lava-job-definitions/lkft-fastboot.jinja2
+++ b/openembedded-lkft/lava-job-definitions/lkft-fastboot.jinja2
@@ -4,58 +4,47 @@
 {{ super() }}
 context:
   test_character_delay: 10
+reboot_to_fastboot: false
 {% endblock global_settings %}
 
-{% block protocols %}
-protocols:
-  lava-lxc:
-    name: lxc-target
-    template: debian
-    distribution: debian
-    release: jessie
-    arch: amd64
-    mirror: http://mirror.bytemark.co.uk/debian
-{% endblock protocols %}
-
 {% block actions %}
 - deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
     timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget http://dl.google.com/android/repository/platform-tools_r26.0.0-linux.zip
-          - unzip platform-tools_r26.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+      minutes: 40
+    to: downloads
+    images:
+{%- if DEVICE_TYPE == "hi6220-hikey" %}
+      ptable:
+        url: http://images.validation.linaro.org/snapshots.linaro.org/96boards/reference-platform/components/uefi-staging/69/hikey/release/ptable-linux-8g.img
+{%- endif %}
+{%- if DEVICE_TYPE in ['hi6220-hikey', 'dragonboard-410c'] %}
+      boot:
+        url: {{BOOT_URL}}
+{%- endif %}
+      dtb:
+        url: {{DTB_URL}}
+      kernel:
+        url: {{KERNEL_URL}}
+      modules:
+        url: {{MODULES_URL}}
+        compression: gz
+{%- if DEVICE_TYPE == 'dragonboard-410c' %}
+      rootfs:
+{%- elif DEVICE_TYPE == 'hi6220-hikey' %}
+      system:
+{%- elif DEVICE_TYPE == 'x15' %}
+      super:
+{%- endif %}
+        url: {{EXT4_IMAGE_URL}}
+        format: ext4
+        compression: gz
+        apply-overlay: true
+    os: oe
+    postprocess:
+      docker:
+        image: linaro/kir
+        steps:
+        - /kir/lava/board_setup.sh {{DEVICE_TYPE}}
 
 {% block deploy_target %}
 {% endblock deploy_target %}
@@ -64,6 +53,10 @@ protocols:
 {% endblock boot_target %}
 
 {% block test_target %}
+- test:
+    timeout:
+      minutes: {% if job_timeout is defined %}{{ job_timeout }}{% else %}60{% endif %}
+    definitions:
 {% endblock test_target %}
 
 {% endblock actions %}
diff --git a/openembedded-lkft/lava-job-definitions/lkft-nfs.jinja2 b/openembedded-lkft/lava-job-definitions/lkft-nfs.jinja2
index 1176bd79ea..a824196452 100644
--- a/openembedded-lkft/lava-job-definitions/lkft-nfs.jinja2
+++ b/openembedded-lkft/lava-job-definitions/lkft-nfs.jinja2
@@ -12,7 +12,7 @@
 - test:
     namespace: target
     timeout:
-      minutes: 60
+      minutes: {% if job_timeout is defined %}{{ job_timeout }}{% else %}60{% endif %}
     definitions:
 {% endblock test_target %}
 
diff --git a/openembedded-lkft/lava-job-definitions/lkft.jinja2 b/openembedded-lkft/lava-job-definitions/lkft.jinja2
index 624be93bf9..673ca46584 100644
--- a/openembedded-lkft/lava-job-definitions/lkft.jinja2
+++ b/openembedded-lkft/lava-job-definitions/lkft.jinja2
@@ -3,11 +3,12 @@
 {% block global_settings %}
 timeouts:
   job:
-    minutes: {% if job_timeout is defined %}{{ job_timeout }}{% else %}90{% endif %}
-  action:
-    minutes: 10
+    minutes: {% if job_timeout is defined %}{{ job_timeout + 20 }}{% else %}30{% endif %}
   connection:
     minutes: 2
+
+{% block settings %}
+{% endblock settings %}
 {% endblock global_settings %}
 
 {% block priority %}{{LAVA_JOB_PRIORITY}}{% endblock priority %}
@@ -23,5 +24,7 @@ timeouts:
   kernel-defconfig: {{KERNEL_DEFCONFIG_URL}}
   build-url: {{BUILD_URL}}
   build-location: {{BASE_URL}}/{{PUB_DEST}}
+  toolchain: {{TOOLCHAIN | default('unknown')}}
   series: lkft
+  email-notification: {{CI_MAIL_RECIPIENTS | default('""')}}
 {% endblock metadata %}
diff --git a/openembedded-lkft/lava-job-definitions/master.jinja2 b/openembedded-lkft/lava-job-definitions/master.jinja2
index 5509c8cee8..3315be1646 100644
--- a/openembedded-lkft/lava-job-definitions/master.jinja2
+++ b/openembedded-lkft/lava-job-definitions/master.jinja2
@@ -2,6 +2,10 @@
 {% endblock global_settings %}
 
 device_type: {% block device_type %}{% endblock %}
+{% block tags %}
+tags:
+  - production
+{% endblock %}
 job_name: {% block job_name %}{% endblock %}
 priority: {% block priority %}{% endblock %}
 visibility: {% block visibility %}{% endblock %}
diff --git a/openembedded-lkft/lava-job-definitions/master/template-kselftest.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/master/template-kselftest.yaml.jinja2
index dc2460582e..a0154ce3cf 100644
--- a/openembedded-lkft/lava-job-definitions/master/template-kselftest.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/master/template-kselftest.yaml.jinja2
@@ -16,15 +16,15 @@
   {%- endif %}
 {% endblock global_settings %}
 
-{% set job_timeout = 45 %}
+{% set job_timeout = 85 %}
 {% block metadata %}
   {{ super() }}
-  kselftest__url: {{KSELFTESTS_URL}}
-  kselftest__version: "{{KSELFTESTS_VERSION}}"
-  kselftest__revision: "{{KSELFTESTS_REVISION}}"
+  kselftest__url: "{{KSELFTESTS_URL | default('unknown')}}"
+  kselftest__version: "{{KSELFTESTS_VERSION | default('unknown')}}"
+  kselftest__revision: "{{KSELFTESTS_REVISION | default('unknown')}}"
 {% endblock metadata %}
 
-{% block job_name %}lkft-kselftests{{vsyscall_suffix}}-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+{% block job_name %}lkft-kselftests-{{testnames|join('-')}}{{vsyscall_suffix}}-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
 
 {% block test_target %}
   {{ super() }}
@@ -39,16 +39,18 @@
           - systemctl stop systemd-timesyncd || true
       name: timesync-off
       path: inline/timesync-off.yaml
-    - repository: git://git.linaro.org/qa/test-definitions.git
+{% for testname in testnames %}
+    - repository: https://github.com/Linaro/test-definitions.git
       from: git
+      revision: '{{ TDEFINITIONS_REVISION }}'
       path: automated/linux/kselftest/kselftest.yaml
-      name: kselftest{{vsyscall_suffix}}
+      name: kselftest{{vsyscall_suffix}}-{{testname}}
       parameters:
         KSELFTEST_PATH: {{KSELFTEST_PATH}}
         SKIPFILE: skipfile-lkft.yaml
         BOARD: '{{ DEVICE_TYPE }}'
         BRANCH: '{{ KERNEL_VERSION_OVERRIDE|default(KERNEL_VERSION) }}'
         ENVIRONMENT: '{{ ENVIRONMENT|default("production") }}'
-      timeout:
-        minutes: 40
+        TST_CMDFILES: '{{testname}}'
+{% endfor %}
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/master/template-kvm-unit-tests.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/master/template-kvm-unit-tests.yaml.jinja2
new file mode 100644
index 0000000000..faeb632b0a
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/master/template-kvm-unit-tests.yaml.jinja2
@@ -0,0 +1,26 @@
+{% extends device_type %}
+
+{% block global_settings %}
+{{ super() }}
+  extra_kernel_args: 'kvm.enable_vmware_backdoor=1 kvm.force_emulation_prefix=1'
+{% endblock global_settings %}
+
+{% set job_timeout = 25 %}
+{% block metadata %}
+  {{ super() }}
+  kvm-unit-tests__url: 'https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git'
+{% endblock metadata %}
+
+{% block job_name %}lkft-kvm-unit-tests-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/kvm-unit-tests/kvm-unit-tests.yaml
+      name: kvm-unit-tests
+      parameters:
+        SKIP_INSTALL: 'true'
+        SMP: {% if DEVICE_TYPE == "juno-r2" %}'false'{% else %}'true'{% endif %}
+        GIT_REF: 'f2606a873e805f9aff4c4879ec75e65d7e30af73'
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2
index 2a1263fd63..cda24cd2d1 100644
--- a/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2
+++ b/openembedded-lkft/lava-job-definitions/master/template-ltp.yaml.jinja2
@@ -2,18 +2,21 @@
 
 {% block metadata %}
   {{ super() }}
-  ltp-{{testname}}-tests__url: {{LTP_URL}}
-  ltp-{{testname}}-tests__version: "{{LTP_VERSION}}"
-  ltp-{{testname}}-tests__revision: "{{LTP_REVISION}}"
+{% for testname in testnames %}
+  ltp-{{testname}}-tests__url: "{{LTP_URL | default('unknown')}}"
+  ltp-{{testname}}-tests__version: "{{LTP_VERSION | default('unknown')}}"
+  ltp-{{testname}}-tests__revision: "{{LTP_REVISION | default('unknown')}}"
+{% endfor %}
 {% endblock metadata %}
 
-{% block job_name %}lkft-ltp-{{testname}}-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+{% block job_name %}lkft-ltp-{{testnames|join('-')}}-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
 
 {% block test_target %}
   {{ super() }}
 {% block test_target_prep %}
 {% endblock test_target_prep %}
-    - repository: git://git.linaro.org/qa/test-definitions.git
+{% for testname in testnames %}
+    - repository: https://github.com/Linaro/test-definitions.git
       from: git
       path: automated/linux/ltp/ltp.yaml
       parameters:
@@ -24,7 +27,7 @@
         BRANCH: '{{ KERNEL_VERSION_OVERRIDE|default(KERNEL_VERSION) }}'
         ENVIRONMENT: '{{ ENVIRONMENT|default('production') }}'
         TIMEOUT_MULTIPLIER: 3
+        LTP_TMPDIR: '/scratch'
       name: ltp-{{testname}}-tests
-      timeout:
-        minutes: {% if job_timeout is defined %}{{ job_timeout-5|int|abs }}{% else %}60{% endif %}
+{% endfor %}
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/master/template-network-basic-tests.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/master/template-network-basic-tests.yaml.jinja2
new file mode 100644
index 0000000000..e120226315
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/master/template-network-basic-tests.yaml.jinja2
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% set job_timeout = 25 %}
+{% block metadata %}
+  {{ super() }}
+{% endblock metadata %}
+
+{% block job_name %}lkft-network-basic-tests-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/network-basic/network-basic.yaml
+      name: network-basic-tests
+      parameters:
+        SKIP_INSTALL: "true"
+        NFS: "true"
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/master/template-ssuite.yaml.jinja2 b/openembedded-lkft/lava-job-definitions/master/template-ssuite.yaml.jinja2
new file mode 100644
index 0000000000..a034a11f39
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/master/template-ssuite.yaml.jinja2
@@ -0,0 +1,25 @@
+{% extends device_type %}
+
+{% set job_timeout = 105 %}
+{% block metadata %}
+  {{ super() }}
+  ssuite__url: "{{SSUITE_URL | default('unknown')}}"
+  ssuite__version: "{{SSUITE_VERSION | default('unknown')}}"
+  ssuite__revision: "{{SSUITE_REVISION | default('unknown')}}"
+{% endblock metadata %}
+
+{% block job_name %}lkft-ssuite-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/ssuite/ssuite-bench.yaml
+      name: ssuite
+      parameters:
+        SKIP_INSTALL: "true"
+        NUM_REPETITIONS: '{{num_repetitions}}'
+        TESTS: '{{testnames}}'
+        TEST_DEV: "'{{testdevnames}}'"
+        TEST_DIR: '{{s_path}}'
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan-sanity/ltp-quickhit.yaml b/openembedded-lkft/lava-job-definitions/testplan-sanity/ltp-quickhit.yaml
new file mode 100644
index 0000000000..1c52fa3cc7
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan-sanity/ltp-quickhit.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['quickhit'] %}
+{% set job_timeout = 45 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-bpf.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-bpf.yaml
new file mode 100644
index 0000000000..a4f968d7d4
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-bpf.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['bpf'] %}
+{% set job_timeout = 15 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-intel-x86.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-intel-x86.yaml
new file mode 100644
index 0000000000..6070e6f0d2
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-intel-x86.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['intel_pstate', 'livepatch', 'ptrace', 'x86'] %}
+{% set job_timeout = 15 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-kvm.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-kvm.yaml
new file mode 100644
index 0000000000..581dcf29b5
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-kvm.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['kvm'] %}
+{% set job_timeout = 15 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-native.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-native.yaml
index 57b93da872..1645c4390c 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/kselftests-native.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-native.yaml
@@ -1,3 +1,4 @@
 {% extends "master/template-kselftest.yaml.jinja2" %}
 
+{% set testnames = [''] %}
 {% set vsyscall_mode = 'native' %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-net.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-net.yaml
new file mode 100644
index 0000000000..14cd104397
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-net.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['net', 'netfilter', 'nsfs', 'tc-testing'] %}
+{% set job_timeout = 15 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-none.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-none.yaml
index a9f940f19f..831b44ac22 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/kselftests-none.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-none.yaml
@@ -1,3 +1,4 @@
 {% extends "master/template-kselftest.yaml.jinja2" %}
 
+{% set testnames = [''] %}
 {% set vsyscall_mode = 'none' %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-1.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-1.yaml
new file mode 100644
index 0000000000..5caed559f7
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-1.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['android', 'breakpoints', 'capabilities', 'cgroup', 'clone3', 'core', 'cpufreq', 'cpu-hotplug', 'drivers'] %}
+{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-2.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-2.yaml
new file mode 100644
index 0000000000..852b34563c
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-2.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['efivarfs', 'filesystems', 'firmware', 'fpu', 'ftrace', 'futex', 'gpio', 'ipc', 'ir', 'kcmp', 'kexec'] %}
+{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-3.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-3.yaml
new file mode 100644
index 0000000000..03aca5f84e
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-3.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['lib', 'membarrier', 'memfd', 'memory-hotplug', 'mincore', 'mount', 'mqueue', 'openat2', 'pidfd', 'pid_namespace', 'pstore', 'proc'] %}
+{% set job_timeout = 15 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-4.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-4.yaml
new file mode 100644
index 0000000000..7e17f9bdd9
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-4.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['rseq', 'rtc', 'seccomp', 'sigaltstack', 'size', 'splice', 'static_keys', 'sync', 'sysctl'] %}
+{% set job_timeout = 15 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-5.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-5.yaml
new file mode 100644
index 0000000000..dab4b8a139
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests-short-run-5.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-kselftest.yaml.jinja2" %}
+
+{% set testnames = ['timens', 'timers', 'tmpfs', 'tpm2', 'user', 'vm', 'zram'] %}
+{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kselftests.yaml b/openembedded-lkft/lava-job-definitions/testplan/kselftests.yaml
index 1690a511b2..e638711625 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/kselftests.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/kselftests.yaml
@@ -1,2 +1,5 @@
 {% extends "master/template-kselftest.yaml.jinja2" %}
 
+{% set testnames = [''] %}
+{% set job_timeout = 85 %}
+
diff --git a/openembedded-lkft/lava-job-definitions/testplan/kvm-unit-tests.yaml b/openembedded-lkft/lava-job-definitions/testplan/kvm-unit-tests.yaml
new file mode 100644
index 0000000000..e785ffb9b2
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/kvm-unit-tests.yaml
@@ -0,0 +1,3 @@
+{% extends "master/template-kvm-unit-tests.yaml.jinja2" %}
+
+{% set job_timeout = 25 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/libgpiod.yaml b/openembedded-lkft/lava-job-definitions/testplan/libgpiod.yaml
new file mode 100644
index 0000000000..c939629dc8
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/libgpiod.yaml
@@ -0,0 +1,19 @@
+{% extends device_type %}
+
+{% set job_timeout = 25 %}
+{% block metadata %}
+  {{ super() }}
+  libgpiod__url: "{{LIBGPIOD_URL | default('unknown')}}"
+  libgpiod__version: "{{LIBGPIOD_VERSION | default('unknown')}}"
+  libgpiod__revision: "{{LIBGPIOD_REVISION | default('unknown')}}"
+{% endblock metadata %}
+
+{% block job_name %}lkft-libgpiod-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/gpiod/gpiod.yaml
+      name: libgpiod
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/libhugetlbfs.yaml b/openembedded-lkft/lava-job-definitions/testplan/libhugetlbfs.yaml
index df13dc21a9..f76a298327 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/libhugetlbfs.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/libhugetlbfs.yaml
@@ -1,23 +1,21 @@
 {% extends device_type %}
 
-{% set job_timeout = 25 %}
+{% set job_timeout = 45 %}
 {% block metadata %}
   {{ super() }}
-  libhugetlbfs__url: {{LIBHUGETLBFS_URL}}
-  libhugetlbfs__version: "{{LIBHUGETLBFS_VERSION}}"
-  libhugetlbfs__revision: "{{LIBHUGETLBFS_REVISION}}"
+  libhugetlbfs__url: "{{LIBHUGETLBFS_URL | default('unknown')}}"
+  libhugetlbfs__version: "{{LIBHUGETLBFS_VERSION | default('unknown')}}"
+  libhugetlbfs__revision: "{{LIBHUGETLBFS_REVISION | default('unknown')}}"
 {% endblock metadata %}
 
 {% block job_name %}lkft-libhugetlbfs-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
 
 {% block test_target %}
   {{ super() }}
-    - repository: git://git.linaro.org/qa/test-definitions.git
+    - repository: https://github.com/Linaro/test-definitions.git
       from: git
       path: automated/linux/libhugetlbfs/libhugetlbfs.yaml
       name: libhugetlbfs
       parameters:
         WORD_SIZE: {% if libhuggetlbfs_word_size is defined %}{{libhuggetlbfs_word_size|int|abs}}{% else %}64{% endif %}
-      timeout:
-        minutes: 20
 {% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-cap_bounds.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-cap_bounds.yaml
deleted file mode 100644
index 36bd4770ef..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-cap_bounds.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'cap_bounds' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-containers.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-containers.yaml
index 462a8e2535..686bc0d5d6 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-containers.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-containers.yaml
@@ -1,4 +1,4 @@
 {% extends "master/template-ltp.yaml.jinja2" %}
 
-{% set testname = 'containers' %}
-{% set job_timeout = 20 %}
+{% set testnames = ['containers'] %}
+{% set job_timeout = 30 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-cve.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-cve.yaml
new file mode 100644
index 0000000000..640b876f84
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-cve.yaml
@@ -0,0 +1,17 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['cve'] %}
+{% set job_timeout = 60 %}
+
+{% block metadata %}
+  {{ super() }}
+  spectre_meltdown_checker_test__url: "https://github.com/speed47/spectre-meltdown-checker.git"
+{% endblock metadata %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/spectre-meltdown-checker-test/spectre-meltdown-checker-test.yaml
+      name: spectre-meltdown-checker-test
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-fcntl-locktests.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-fcntl-locktests.yaml
deleted file mode 100644
index 118508df39..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-fcntl-locktests.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'fcntl-locktests' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-filecaps.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-filecaps.yaml
deleted file mode 100644
index 397951c51d..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-filecaps.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'filecaps' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-fs.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-fs.yaml
index f0292aee31..e825da5d91 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-fs.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-fs.yaml
@@ -1,4 +1,4 @@
 {% extends "master/template-ltp.yaml.jinja2" %}
 
-{% set testname = 'fs' %}
-{% set job_timeout = 95 %}
+{% set testnames = ['fs'] %}
+{% set job_timeout = 45 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-fs_bind.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-fs_bind.yaml
deleted file mode 100644
index 508a9f2e91..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-fs_bind.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'fs_bind' %}
-{% set job_timeout = 40 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-fs_perms_simple.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-fs_perms_simple.yaml
deleted file mode 100644
index 06281b5869..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-fs_perms_simple.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'fs_perms_simple' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-fsx.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-fsx.yaml
deleted file mode 100644
index 244dda0010..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-fsx.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'fsx' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-hugetlb-mm.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-hugetlb-mm.yaml
new file mode 100644
index 0000000000..de87a03329
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-hugetlb-mm.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['hugetlb', 'mm'] %}
+{% set job_timeout = 60 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-hugetlb.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-hugetlb.yaml
deleted file mode 100644
index 7f5a66a371..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-hugetlb.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'hugetlb' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-io-dio.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-io-dio.yaml
new file mode 100644
index 0000000000..b6a63e65a4
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-io-dio.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['io', 'dio'] %}
+{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-io.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-io.yaml
deleted file mode 100644
index 3cb7d6d2f4..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-io.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'io' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-ipc.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-ipc.yaml
index 544f6450ef..96afa0e36d 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-ipc.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-ipc.yaml
@@ -1,4 +1,4 @@
 {% extends "master/template-ltp.yaml.jinja2" %}
 
-{% set testname = 'ipc' %}
+{% set testnames = ['ipc'] %}
 {% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-math.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-math.yaml
index fe030d0025..bb7beb38b0 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-math.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-math.yaml
@@ -1,4 +1,4 @@
 {% extends "master/template-ltp.yaml.jinja2" %}
 
-{% set testname = 'math' %}
-{% set job_timeout = 20 %}
+{% set testnames = ['math', 'commands'] %}
+{% set job_timeout = 30 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-nptl.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-nptl.yaml
deleted file mode 100644
index 90dbdf0c83..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-nptl.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'nptl' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-open-posix.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-open-posix.yaml
new file mode 100644
index 0000000000..d7403b525a
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-open-posix.yaml
@@ -0,0 +1,23 @@
+{% extends device_type %}
+
+{% set job_timeout = 75 %}
+{% block metadata %}
+  {{ super() }}
+  ltp-open-posix-tests__url: "{{LTP_URL | default('unknown')}}"
+  ltp-open-posix-tests__version: "{{LTP_VERSION | default('unknown')}}"
+  ltp-open-posix-tests__revision: "{{LTP_REVISION | default('unknown')}}"
+{% endblock metadata %}
+
+{% block job_name %}lkft-ltp-open-posix-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+{% block test_target_prep %}
+{% endblock test_target_prep %}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/ltp-open-posix/ltp-open-posix.yaml
+      name: ltp-open-posix-tests
+      parameters:
+        SKIP_INSTALL: 'true'
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-pty.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-pty.yaml
deleted file mode 100644
index ed9609eba7..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-pty.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'pty' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-sched.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-sched.yaml
index 6d713cfa1e..73201a50d3 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-sched.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-sched.yaml
@@ -1,4 +1,4 @@
 {% extends "master/template-ltp.yaml.jinja2" %}
 
-{% set testname = 'sched' %}
+{% set testnames = ['sched'] %}
 {% set job_timeout = 30 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-securebits.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-securebits.yaml
deleted file mode 100644
index da2043ef0a..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-securebits.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'securebits' %}
-{% set job_timeout = 20 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs-2.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs-2.yaml
new file mode 100644
index 0000000000..7539003e38
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs-2.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['filecaps', 'fs_bind', 'fs_perms_simple', 'fsx'] %}
+{% set job_timeout = 30 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs-3.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs-3.yaml
new file mode 100644
index 0000000000..ee8efea0e0
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs-3.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['nptl', 'pty', 'securebits'] %}
+{% set job_timeout = 30 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs.yaml
new file mode 100644
index 0000000000..ca337f3905
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-short-runs.yaml
@@ -0,0 +1,4 @@
+{% extends "master/template-ltp.yaml.jinja2" %}
+
+{% set testnames = ['cap_bounds', 'cpuhotplug', 'fcntl-locktests'] %}
+{% set job_timeout = 30 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-syscalls.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-syscalls.yaml
index b6d0d32cb3..aea22c4547 100644
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-syscalls.yaml
+++ b/openembedded-lkft/lava-job-definitions/testplan/ltp-syscalls.yaml
@@ -1,4 +1,4 @@
 {% extends "master/template-ltp.yaml.jinja2" %}
 
-{% set testname = 'syscalls' %}
+{% set testnames = ['syscalls'] %}
 {% set job_timeout = 120 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ltp-timers.yaml b/openembedded-lkft/lava-job-definitions/testplan/ltp-timers.yaml
deleted file mode 100644
index 8c2b47125d..0000000000
--- a/openembedded-lkft/lava-job-definitions/testplan/ltp-timers.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-{% extends "master/template-ltp.yaml.jinja2" %}
-
-{% set testname = 'timers' %}
-{% set job_timeout = 20 %}
-
-{% block test_target_prep %}
-    - from: inline
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: timesync-off
-          description: "Disable systemd time sync services"
-        run:
-          steps:
-          - systemctl stop systemd-timesyncd || true
-      name: timesync-off
-      path: inline/timesync-off.yaml
-{% endblock test_target_prep %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/network-basic-tests.yaml b/openembedded-lkft/lava-job-definitions/testplan/network-basic-tests.yaml
new file mode 100644
index 0000000000..9378849c49
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/network-basic-tests.yaml
@@ -0,0 +1,3 @@
+{% extends "master/template-network-basic-tests.yaml.jinja2" %}
+
+{% set job_timeout = 25 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/perf.yaml b/openembedded-lkft/lava-job-definitions/testplan/perf.yaml
new file mode 100644
index 0000000000..02e3d124d5
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/perf.yaml
@@ -0,0 +1,18 @@
+{% extends device_type %}
+
+{% set job_timeout = 30 %}
+{% block metadata %}
+  {{ super() }}
+{% endblock metadata %}
+
+{% block job_name %}lkft-perf-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/perf/perf.yaml
+      name: perf
+      parameters:
+        SKIP_INSTALL: 'true'
+{% endblock test_target %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/ssuite.yaml b/openembedded-lkft/lava-job-definitions/testplan/ssuite.yaml
new file mode 100644
index 0000000000..f38aade7dd
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/ssuite.yaml
@@ -0,0 +1,7 @@
+{% extends "master/template-ssuite.yaml.jinja2" %}
+
+{% set num_repetitions = '3' %}
+{% set testnames = 'throughput replayed-gnome-term-startup' %}
+{% set testdevnames = '$(lava-target-storage SATA || lava-target-storage USB)' %}
+{% set s_path = '/opt/S-suite/' %}
+{% set job_timeout = 60 %}
diff --git a/openembedded-lkft/lava-job-definitions/testplan/v4l2-compliance.yaml b/openembedded-lkft/lava-job-definitions/testplan/v4l2-compliance.yaml
new file mode 100644
index 0000000000..371b83ecf5
--- /dev/null
+++ b/openembedded-lkft/lava-job-definitions/testplan/v4l2-compliance.yaml
@@ -0,0 +1,18 @@
+{% extends device_type %}
+
+{% set job_timeout = 25 %}
+{% block metadata %}
+  {{ super() }}
+{% endblock metadata %}
+
+{% block job_name %}lkft-v4l2-compliance-{{KERNEL_BRANCH}}-{{BUILD_NUMBER}}{% endblock job_name %}
+
+{% block test_target %}
+  {{ super() }}
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/v4l2/v4l2-compliance.yaml
+      name: v4l2-compliance
+      parameters:
+        VIDEO_DRIVER: vivid.ko
+{% endblock test_target %}
diff --git a/openembedded-lkft/postbuild.groovy b/openembedded-lkft/postbuild.groovy
index 56c2fa3534..61d70a1ddb 100644
--- a/openembedded-lkft/postbuild.groovy
+++ b/openembedded-lkft/postbuild.groovy
@@ -1,16 +1,17 @@
 if (manager.build.result == hudson.model.Result.SUCCESS) {
-  def qa_server = manager.build.buildVariables.get('QA_SERVER')
+  def qa_server = manager.envVars["QA_SERVER"]
   def desc = manager.build.getDescription()
   if (desc == null) {
     desc = ""
   }
-  pattern = ~"${qa_server}/testjob/(\\d+)"
+  pattern = ~".*(${qa_server}/testjob/(\\d+))(.*)"
   manager.build.logFile.eachLine { line ->
     matcher = pattern.matcher(line)
     if(matcher.matches()) {
-      def url = matcher.group(0)
-      def testjob_id = matcher.group(1)
-      desc += "&nbsp;<a href='${url}'>QA Reports: ${testjob_id}</a><br/>"
+      def url = matcher.group(1)
+      def testjob_id = matcher.group(2)
+      def job_name = matcher.group(3)
+      desc += "&nbsp;<a href='${url}'>LAVA job (QA ${testjob_id})${job_name}</a><br/>"
     }
   }
   manager.build.setDescription(desc)
diff --git a/openembedded-lkft/publishers.sh b/openembedded-lkft/publishers.sh
new file mode 100755
index 0000000000..d064105da7
--- /dev/null
+++ b/openembedded-lkft/publishers.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+set -ex
+
+
+# Generate checksums for use in LAVA jobs
+( cd ${DEPLOY_DIR_IMAGE} && rm -f SHA256SUMS.txt && find -maxdepth 1 -type f -exec sha256sum {} + > SHA256SUMS.txt )
+
+test -d ${HOME}/bin || mkdir ${HOME}/bin
+wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+
+# LLP
+if [ -n "${LLP_GROUP}" ]; then
+  cat > "${WORKSPACE}/BUILD-INFO.txt" << EOF
+Format-Version: 0.5
+
+Files-Pattern: *
+License-Type: protected
+Auth-Groups: ${LLP_GROUP}
+EOF
+fi
+
+# Publish
+if [ -e "${WORKSPACE}/BUILD-INFO.txt" ]; then
+  time python3 ${HOME}/bin/linaro-cp.py \
+    --server ${PUBLISH_SERVER} \
+    --build-info ${WORKSPACE}/BUILD-INFO.txt \
+    ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+else
+  time python3 ${HOME}/bin/linaro-cp.py \
+    --server ${PUBLISH_SERVER} \
+    ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+fi
diff --git a/openembedded-lkft/qareports.groovy b/openembedded-lkft/qareports.groovy
new file mode 100644
index 0000000000..60e17c851e
--- /dev/null
+++ b/openembedded-lkft/qareports.groovy
@@ -0,0 +1,22 @@
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+  qa_server = manager.envVars["QA_SERVER"]
+  qa_server_team = manager.envVars["QA_SERVER_TEAM"]
+  if (qa_server_team == null) {
+    qa_server_team = "lkft"
+  }
+  qa_server_project = manager.envVars["QA_SERVER_PROJECT"]
+  kernel_describe = manager.envVars["KERNEL_DESCRIBE"]
+  build_number = manager.envVars["BUILD_NUMBER"]
+  qa_build = kernel_describe + "-b" + build_number
+  test_suites = manager.envVars["TEST_SUITES"]
+
+  if (test_suites != "")
+  {
+    def qa_desc = manager.build.getDescription()
+    if (qa_desc == null) {
+      qa_desc = ""
+    }
+    qa_desc += "&nbsp;<a href='${qa_server}/${qa_server_team}/${qa_server_project}/build/${qa_build}'>QA Reports</a><br/>"
+    manager.build.setDescription(qa_desc)
+  }
+}
diff --git a/openembedded-lkft/qemu-testjobs.sh b/openembedded-lkft/qemu-testjobs.sh
deleted file mode 100644
index 279cdd9da5..0000000000
--- a/openembedded-lkft/qemu-testjobs.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# Submit QEMU jobs
-case "${MACHINE}" in
-#  am57xx-evm)
-#    DEVICE_TYPE=qemu_arm
-#    ;;
-#  hikey)
-#    DEVICE_TYPE=qemu_arm64
-#    ;;
-  intel-core2-32)
-    DEVICE_TYPE=qemu_x86_64
-    ;;
-  *)
-    unset DEVICE_TYPE
-    ;;
-esac
-
-echo "DEVICE_TYPE=${DEVICE_TYPE}" > qemu_device_type_parameters
-
diff --git a/openembedded-lkft/submit_build_result.groovy b/openembedded-lkft/submit_build_result.groovy
new file mode 100644
index 0000000000..732c92b84e
--- /dev/null
+++ b/openembedded-lkft/submit_build_result.groovy
@@ -0,0 +1,126 @@
+/*
+    This lovely groovy script is used to send the jenkins build result to
+    qa-reports.linaro.org (SQUAD).
+
+    It requires the following variables to be available in the environment:
+    DEVICE_TYPE: This becomes the environment in qa-reports
+    QA_SERVER: URL for qa-reports (squad) host.
+    QA_REPORTS_TOKEN: Auth token for qa-reports (squad) host.
+    QA_SERVER_PROJECT: qa-reports project name
+    KERNEL_DESCRIBE: This becomes build version in qa-reports (squad).
+
+    Optional variables:
+    QA_SERVER_TEAM: This becomes the group in qa-reports. It defaults to 'lkft'
+    KERNEL_REPO: metadata - git repo url. Defaults to 'unknown'.
+    SRCREV_kernel/KERNEL_COMMIT: metadata - git commit sha. Checks for
+        SRCREV_kernel, falls through to KERNEL_COMMIT, and then finally defaults
+        to 'unknown'.
+    KERNEL_BRANCH: metadata - git branch. Defaults to 'unknown'.
+    MAKE_KERNELVERSION: metadata - result of 'make kernelversion'. Defaults to 'unknown'.
+
+    If the jenkins job is successful, a 'build/build_process' test result will
+    be set to 'pass' in qa-reports, otherwise it will get a 'fail' result.
+
+    To test changes to this script:
+    - Set up a local jenkins container
+    - Create a freestyle job
+    - Add QA_REPORTS_TOKEN 'secret text' under 'Use secret text(s) or file(s)
+    - Untick 'Inject nevironment variables to the build process'
+      - Paste the following (for example) into the 'Properties Content':
+          DEVICE_TYPE=x15
+          QA_SERVER=https://staging-qa-reports.linaro.org
+          QA_SERVER_PROJECT=linux-mainline-master
+          KERNEL_DESCRIBE=v5.1
+          QA_SERVER_TEAM=lkft
+          KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
+          SRCREV_kernel=e93c9c99a629c61837d5a7fc2120cd2b6c70dbdd
+          KERNEL_BRANCH=master
+          MAKE_KERNELVERSION=5.1.0
+    - Enable Groovy Postbuild and paste this script in
+
+    A build error log is extracted from the jenkins log using a regular
+    expression, and included in the test result.
+
+*/
+import hudson.AbortException
+
+def device_type = manager.envVars["DEVICE_TYPE"]
+def qa_server_team = 'lkft'
+if (manager.envVars.containsKey('QA_SERVER_TEAM')) {
+    qa_server_team = manager.envVars["QA_SERVER_TEAM"]
+}
+def base_url = manager.envVars['QA_SERVER']
+def auth_token = manager.envVars["QA_REPORTS_TOKEN"]
+def build_process = "fail"
+def log_error_pattern = ~'^ERROR: .*$'
+def log_fetch_failure = ~'^ERROR: .*Fetcher failure: Unable to find revision.* even from upstream'
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+    build_process = "pass"
+}
+def url_path = '/api/submit/' +
+               qa_server_team +
+               '/' +
+               manager.envVars["QA_SERVER_PROJECT"] +
+               '/' +
+               manager.envVars["KERNEL_DESCRIBE"] +
+               '/' +
+               device_type
+def url_path_sanity = '/api/submit/' +
+               qa_server_team +
+               '/' +
+               manager.envVars["QA_SERVER_PROJECT"] + '-sanity' +
+               '/' +
+               manager.envVars["KERNEL_DESCRIBE"] +
+               '/' +
+               device_type
+
+def error_log = ""
+manager.build.logFile.eachLine { line ->
+    matcher = log_error_pattern.matcher(line)
+    if (matcher.matches()) {
+        error_log += line+"\n"
+    }
+}
+
+manager.build.logFile.eachLine { line ->
+    matcher = log_fetch_failure.matcher(line)
+    if (matcher.matches()) {
+        throw new AbortException("Fetcher failure. Stop everything.")
+    }
+}
+
+@Grab(group='org.codehaus.groovy.modules.http-builder', module='http-builder', version='0.7' )
+import groovyx.net.http.HTTPBuilder
+import static groovyx.net.http.ContentType.URLENC
+
+def http = new HTTPBuilder(base_url)
+def postBody = [
+    tests: '{"build/build_process": "'+ build_process +'"}',
+    log: error_log,
+    metadata:
+        // This is fussy, but I thought it was easier than figuring out how to
+        // add JsonOutput
+        """{
+            "job_id": "${device_type}-${manager.build.number}",
+            "git branch": "${manager.envVars.get("KERNEL_BRANCH", "unknown")}",
+            "git repo": "${manager.envVars.get("KERNEL_REPO", "unknown")}",
+            "git commit": "${manager.envVars.get("KERNEL_COMMIT", "unknown")}",
+            "git commit": "${manager.envVars.get("SRCREV_kernel", manager.envVars.get("KERNEL_COMMIT", "unknown"))}",
+            "git describe": "${manager.envVars.get("KERNEL_DESCRIBE", "unknown")}",
+            "make_kernelversion": "${manager.envVars.get("MAKE_KERNELVERSION", "unknown")}"
+        }"""
+]
+http.headers['Auth-Token'] = auth_token
+
+http.post(path: url_path,
+          body: postBody,
+          requestContentType: URLENC ) { resp ->
+  println "POST Success: ${resp.statusLine}"
+  assert resp.statusLine.statusCode == 201
+}
+http.post(path: url_path_sanity,
+          body: postBody,
+          requestContentType: URLENC ) { resp ->
+  println "POST Success: ${resp.statusLine}"
+  assert resp.statusLine.statusCode == 201
+}
diff --git a/openembedded-lkft/submit_for_testing-staging.sh b/openembedded-lkft/submit_for_testing-staging.sh
new file mode 100755
index 0000000000..94f1217012
--- /dev/null
+++ b/openembedded-lkft/submit_for_testing-staging.sh
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+set -ex
+
+echo "v---env---v"
+env
+echo "^---env---^"
+
+[ -z "${KSELFTEST_PATH}" ] && export KSELFTEST_PATH="/opt/kselftests/mainline/"
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="25"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+[ -z "${QA_SERVER_TEAM}" ] && export QA_SERVER_TEAM=lkft
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${KERNEL_COMMIT}" ] && export KERNEL_COMMIT="${KERNEL_SRCREV}"
+[ -z "${MAKE_KERNELVERSION}" ] && export MAKE_KERNELVERSION="unknown"
+[ -z "${KERNEL_VERSION}" ] && export KERNEL_VERSION="unknown"
+[ -z "${KERNEL_DESCRIBE}" ] && export KERNEL_DESCRIBE=${KERNEL_SRCREV:0:12}
+
+[ "${TEST_SUITES}" = "none" ] && unset DEVICE_TYPE
+
+export BASE_PATH=configs/openembedded-lkft/
+
+if [ -z "${DEVICE_TYPE}" ]; then
+    echo "DEVICE_TYPE not set. Exiting"
+    exit 0
+fi
+
+if [ -z "${DRY_RUN}" ]; then
+    case "${QA_SERVER_PROJECT}" in
+      linux-mainline-*)
+        source ${WORKSPACE}/lkftmetadata/${KERNEL_RECIPE}
+        export KSELFTESTS_URL=${LINUX_GENERIC_MAINLINE_URL}
+        export KSELFTESTS_VERSION=${LINUX_GENERIC_MAINLINE_VERSION}
+        export KSELFTESTS_REVISION=${KERNEL_COMMIT}
+        ;;
+      linux-next-*)
+        source ${WORKSPACE}/lkftmetadata/${KERNEL_RECIPE}
+        export KSELFTESTS_URL=${LINUX_GENERIC_NEXT_URL}
+        export KSELFTESTS_VERSION=${LINUX_GENERIC_NEXT_VERSION}
+        export KSELFTESTS_REVISION=${KERNEL_COMMIT}
+        ;;
+      *)
+        export KSELFTESTS_URL=${KSELFTESTS_MAINLINE_URL}
+        export KSELFTESTS_VERSION=${KSELFTESTS_MAINLINE_VERSION}
+        export KSELFTESTS_REVISION=${KSELFTESTS_MAINLINE_VERSION}
+        ;;
+    esac
+
+    rm -rf configs
+
+    # Perform a shallow clone unless CONFIGS_REPO_REV_OVERRIDE is set
+    CONFIGS_REPO_CLONE_ARGS="--depth 1"
+    if [ ! -z ${CONFIGS_REPO_REV_OVERRIDE} ]; then
+        CONFIGS_REPO_CLONE_ARGS=""
+    fi
+
+    CONFIGS_REPO_URL=${CONFIGS_REPO_URL_OVERRIDE:-http://git.linaro.org/ci/job/configs.git}
+    git clone ${CONFIGS_REPO_CLONE_ARGS} ${CONFIGS_REPO_URL} configs
+    if [ ! -z ${CONFIGS_REPO_REV_OVERRIDE} ]; then
+        (cd configs && git checkout ${CONFIGS_REPO_REV_OVERRIDE})
+    fi
+else
+    export DRY_RUN="--dry-run --template-path lava-job-definitions --testplan-path lava-job-definitions/ --quiet"
+fi
+
+export QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+
+[ -n "${TEST_TEMPLATES}" ] && unset TEST_TEMPLATES
+[ -z "${TEST_SUITES}" ] && TEST_SUITES=all
+TEMPLATE_PATH=""
+TEST_FILES=""
+
+for ts in ${TEST_SUITES,,}; do
+    case ${ts} in
+        all)
+            TEST_FILES=$(ls ${BASE_PATH}/lava-job-definitions/testplan/)
+            break
+            ;;
+        none)
+            # No point in going forward. Exit now.
+            exit 0
+            ;;
+        kselftests|libhugetlbfs|ltp)
+            TEST_FILES="${TEST_FILES} $(basename -a ${BASE_PATH}/lava-job-definitions/testplan/${ts}*.yaml)"
+            ;;
+        *)
+            if [ -e ${BASE_PATH}/lava-job-definitions/testplan/${ts}.yaml ]; then
+                TEST_FILES="${TEST_FILES} ${ts}.yaml"
+            else
+                echo "WARNING: Not sure what this test suite is about: ${ts}. Skipped."
+            fi
+            ;;
+    esac
+done
+
+# Were there no tests after expansion?
+if [ -z "${TEST_FILES// /}" ]; then
+    echo "No test files to execute. Terminating now."
+    exit 0
+fi
+
+for test in ${TEST_FILES}; do
+    if [[ ${test} = "ltp-open-posix.yaml" ]];then
+        # Run LTP open posix test suite on limited devices
+        # Each one per architecture arm64 juno-r2, arm32 x15 and x86
+        if [[ ${DEVICE_TYPE} = "juno-r2" || ${DEVICE_TYPE} = "x15" || ${DEVICE_TYPE} = "x86" || ${DEVICE_TYPE} = "i386" ]];then
+            TEST_TEMPLATES="${TEST_TEMPLATES} testplan/${test}"
+        fi
+    elif  [[ ${test} = "kselftests-native.yaml" || ${test} = "kselftests-none.yaml" ]];then
+        # kselftests-native.yaml and kselftests-none.yaml tests needed for x86
+        # Don't run on qemu; it's not possible to pass a kernel argument
+        # given the way we build the image and run qemu.
+        if [[ ${DEVICE_TYPE} = "x86" ]];then
+            TEST_TEMPLATES="${TEST_TEMPLATES} testplan/${test}"
+        fi
+    else
+        TEST_TEMPLATES="${TEST_TEMPLATES} testplan/${test}"
+    fi
+done
+
+python ${BASE_PATH}/submit_for_testing.py \
+  --device-type ${DEVICE_TYPE} \
+  --build-number ${BUILD_NUMBER} \
+  --lava-server ${LAVA_SERVER} \
+  --qa-server ${QA_SERVER} \
+  --qa-server-team ${QA_SERVER_TEAM} \
+  --qa-server-project ${QA_SERVER_PROJECT} \
+  --git-commit ${QA_BUILD_VERSION}-b${BUILD_NUMBER} \
+  ${DRY_RUN} \
+  --test-plan ${TEST_TEMPLATES}
diff --git a/openembedded-lkft/submit_for_testing.py b/openembedded-lkft/submit_for_testing.py
index d9b87032a8..19fdb00ae4 100644
--- a/openembedded-lkft/submit_for_testing.py
+++ b/openembedded-lkft/submit_for_testing.py
@@ -1,8 +1,12 @@
 import argparse
 import os
+import re
 import requests
 import sys
-import StringIO
+try:
+    from StringIO import StringIO ## for Python 2
+except ImportError:
+    from io import StringIO ## for Python 3
 from copy import deepcopy
 from string import Template
 from jinja2 import Environment, FileSystemLoader, StrictUndefined
@@ -33,9 +37,19 @@ def parse_template(yaml_string):
     yaml = YAML()
     # ruamel does not provide a mechanism to dump to string, so use StringIO
     # to catch it
-    output = StringIO.StringIO()
+    output = StringIO()
     yaml.dump(yaml.load(yaml_string), output)
-    return output.getvalue()
+    # strip empty lines from output
+    return re.sub(r'^\s*$\n', '', output.getvalue(), flags=re.MULTILINE)
+
+def get_job_name(lava_job_string):
+    '''
+        In: yaml-formatted string
+        Out: LAVA job's name
+    '''
+    yaml = YAML()
+    lava_job = yaml.load(lava_job_string)
+    return lava_job['job_name']
 
 def _load_template(template_name, template_path, device_type):
     template = ''
@@ -70,7 +84,7 @@ def _submit_to_squad(lava_job, lava_url_base, qa_server_api, qa_server_base, qa_
         results = requests.post(qa_server_api, data=data, headers=headers,
                                 timeout=31)
         if results.status_code < 300:
-            print("%s/testjob/%s" % (qa_server_base, results.text))
+            print("%s/testjob/%s %s" % (qa_server_base, results.text, get_job_name(lava_job)))
         else:
             print(results.status_code)
             print(results.text)
@@ -87,6 +101,10 @@ def main():
                         help="Device type in LAVA",
                         dest="device_type",
                         required=True)
+    parser.add_argument("--environment",
+                        help="User specified the environment name, prefix or suffix won't be used",
+                        dest="environment",
+                        default="")
     parser.add_argument("--env-prefix",
                         help="Prefix for the environment name",
                         dest="env_prefix",
@@ -170,7 +188,7 @@ def main():
     if args.dryrun:
         if not os.path.exists(output_path):
             os.mkdir(output_path)
-    if args.qa_token is None:
+    if args.qa_token is None and not args.dryrun:
         print("QA_REPORTS_TOKEN is missing")
         sys.exit(1)
 
@@ -180,7 +198,16 @@ def main():
     qa_server_team = args.qa_server_team
     qa_server_project = args.qa_server_project
     qa_server_build = args.git_commit
-    qa_server_env = args.env_prefix + args.device_type + args.env_suffix
+
+    if not args.environment:
+        # when user not specify value for the environment option,
+        # use the device_type as before
+        qa_server_env = args.env_prefix + args.device_type + args.env_suffix
+    else:
+        # when user specified value for the environment option,
+        # use the user specified value
+        qa_server_env = args.environment
+
     qa_server_api = "%s/api/submitjob/%s/%s/%s/%s" % (
         qa_server_base,
         qa_server_team,
@@ -225,7 +252,7 @@ def main():
 
     THIS_DIR = os.path.abspath(args.testplan_path)
     # prevent creating templates when variables are missing
-    j2_env = Environment(loader=FileSystemLoader(THIS_DIR), undefined=StrictUndefined)
+    j2_env = Environment(loader=FileSystemLoader(THIS_DIR, followlinks=True), undefined=StrictUndefined)
     context = deepcopy(os.environ)
     context.update({"device_type": os.path.join(args.testplan_device_path, args.device_type)})
     for test in args.test_plan:
diff --git a/openembedded-lkft/submit_for_testing.sh b/openembedded-lkft/submit_for_testing.sh
index c44ac1463a..1ebca5d4a2 100755
--- a/openembedded-lkft/submit_for_testing.sh
+++ b/openembedded-lkft/submit_for_testing.sh
@@ -3,9 +3,12 @@
 set -ex
 
 [ -z "${KSELFTEST_PATH}" ] && export KSELFTEST_PATH="/opt/kselftests/mainline/"
-[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="low"
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="25"
+[ -z "${SANITY_LAVA_JOB_PRIORITY}" ] && export SANITY_LAVA_JOB_PRIORITY="30"
 [ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
 [ -z "${QA_SERVER_TEAM}" ] && export QA_SERVER_TEAM=lkft
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${TDEFINITIONS_REVISION}" ] && export TDEFINITIONS_REVISION="kselftest-5.1"
 
 if [ -n "${DRY_RUN}" ]; then
     export DRY_RUN="--dry-run --template-path lava-job-definitions --testplan-path lava-job-definitions/ --quiet"
@@ -21,18 +24,22 @@ if [ -z "${DEVICE_TYPE}" ]; then
 fi
 
 if [ -z "${DRY_RUN}" ]; then
+    METADATA=${WORKSPACE}/lkftmetadata/${KERNEL_RECIPE}
+    [ "${DISTRO}" = "rpb" ] && METADATA=/srv/oe/build/lkftmetadata/packages/*/${KERNEL_RECIPE}/metadata
     case "${QA_SERVER_PROJECT}" in
       linux-mainline-*)
-        source /srv/oe/build/lkftmetadata/packages/*/${KERNEL_RECIPE}/metadata
+        source ${METADATA}
         export KSELFTESTS_URL=${LINUX_GENERIC_MAINLINE_URL}
         export KSELFTESTS_VERSION=${LINUX_GENERIC_MAINLINE_VERSION}
         export KSELFTESTS_REVISION=${KERNEL_COMMIT}
+        export TDEFINITIONS_REVISION="kselftest"
         ;;
       linux-next-*)
-        source /srv/oe/build/lkftmetadata/packages/*/${KERNEL_RECIPE}/metadata
+        source ${METADATA}
         export KSELFTESTS_URL=${LINUX_GENERIC_NEXT_URL}
         export KSELFTESTS_VERSION=${LINUX_GENERIC_NEXT_VERSION}
         export KSELFTESTS_REVISION=${KERNEL_COMMIT}
+        export TDEFINITIONS_REVISION="kselftest"
         ;;
       *)
         export KSELFTESTS_URL=${KSELFTESTS_MAINLINE_URL}
@@ -43,37 +50,328 @@ if [ -z "${DRY_RUN}" ]; then
 fi
 
 if [ ! -z "${KERNEL_DESCRIBE}" ]; then
-    export QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+    export QA_BUILD_VERSION=${KERNEL_DESCRIBE}${KERNEL_DESCRIBE_SUFFIX}
 else
     export QA_BUILD_VERSION=${KERNEL_COMMIT:0:12}
 fi
 
 if [ -z "${DRY_RUN}" ]; then
     rm -rf configs
-    git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+
+    # Perform a shallow clone unless CONFIGS_REPO_REV_OVERRIDE is set
+    CONFIGS_REPO_CLONE_ARGS="--depth 1"
+    if [ ! -z ${CONFIGS_REPO_REV_OVERRIDE} ]; then
+        CONFIGS_REPO_CLONE_ARGS=""
+    fi
+
+    CONFIGS_REPO_URL=${CONFIGS_REPO_URL_OVERRIDE:-http://git.linaro.org/ci/job/configs.git}
+    git clone ${CONFIGS_REPO_CLONE_ARGS} ${CONFIGS_REPO_URL} configs
+    if [ ! -z ${CONFIGS_REPO_REV_OVERRIDE} ]; then
+        (cd configs && git checkout ${CONFIGS_REPO_REV_OVERRIDE})
+    fi
 fi
 
-[ ! -z ${TEST_TEMPLATES} ] && unset TEST_TEMPLATES
+[ -n "${FULL_TEST_TEMPLATES}" ] && unset FULL_TEST_TEMPLATES
+[ -n "${QEMU_TEST_TEMPLATES}" ] && unset QEMU_TEST_TEMPLATES
+[ -z "${TEST_SUITES}" ] && TEST_SUITES=all
 TEMPLATE_PATH=""
+TEST_FILES=""
+
+# Generate list of job templates for full test run
+for ts in ${TEST_SUITES,,}; do
+    case ${ts} in
+        all)
+            TEST_FILES=$(ls ${BASE_PATH}/lava-job-definitions/testplan/)
+            ;;
+        none)
+            break
+            ;;
+        kselftests|libhugetlbfs|ltp|perf)
+            TEST_FILES="${TEST_FILES} $(basename -a ${BASE_PATH}/lava-job-definitions/testplan/${ts}*.yaml)"
+            ;;
+        *)
+            if [ -e ${BASE_PATH}/lava-job-definitions/testplan/${ts}.yaml ]; then
+                TEST_FILES="${TEST_FILES} ${ts}.yaml"
+            else
+                echo "WARNING: Not sure what this test suite is about: ${ts}. Skipped."
+            fi
+            ;;
+    esac
+
+    case ${ts} in
+        all|sanity)
+            # Generate list of job templates for sanity test run
+            for test in $(ls ${BASE_PATH}/lava-job-definitions/testplan-sanity/); do
+                SANITY_TEST_TEMPLATES="${SANITY_TEST_TEMPLATES} testplan-sanity/${test}"
+            done
+            ;;
+    esac
+done
 
-for test in $(ls ${BASE_PATH}/lava-job-definitions/testplan/); do
-# kselftests-native.yaml and kselftests-none.yaml tests needed for x86 and qemu_x86_64
-    if [[ ${test} = "kselftests-native.yaml" || ${test} = "kselftests-none.yaml" ]];then
-        if [[ ${DEVICE_TYPE} = "x86" || ${DEVICE_TYPE} = "qemu_x86_64" ]];then
-            TEST_TEMPLATES="${TEST_TEMPLATES} testplan/${test}"
+for test in ${TEST_FILES}; do
+    if [[ ${test} = "ltp-open-posix.yaml" ]];then
+        # Run LTP open posix test suite on limited devices
+        # Each one per architecture arm64 juno-r2, arm32 x15 and x86
+        if [[ ${DEVICE_TYPE} = "juno-r2" || ${DEVICE_TYPE} = "x15" || ${DEVICE_TYPE} = "x86" || ${DEVICE_TYPE} = "i386" ]];then
+            FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}"
+        fi
+    elif  [[ ${test} = "kselftests-native.yaml" || ${test} = "kselftests-none.yaml" ]];then
+        # kselftests-native.yaml and kselftests-none.yaml tests needed for x86
+        # Don't run on qemu; it's not possible to pass a kernel argument
+        # given the way we build the image and run qemu.
+        if [[ ${DEVICE_TYPE} = "x86" ]];then
+            FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}"
+        fi
+    elif [[ ${test} = "kvm-unit-tests.yaml" ]];then
+        if [[ ${DEVICE_TYPE} = "juno-r2" || ${DEVICE_TYPE} = "x86" ]];then
+            FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}"
+        fi
+    elif [[ ${test} = "ssuite.yaml" ]];then
+        if [[ ${DEVICE_TYPE} = "x86" || ${DEVICE_TYPE} = "x15" ]];then
+            if [[ ${DEVICE_TYPE} = "x15" && "${MAKE_KERNELVERSION}" == 4.4* ]];then
+                echo "no testplan for ${DEVICE_TYPE} and kernel verison: ${MAKE_KERNELVERSION}"
+            else
+                FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}"
+            fi
+        fi
+    elif [[ ${test} = "network-basic-tests.yaml" ]];then
+        if [[ ${DEVICE_TYPE} != "dragonboard-410c" ]];then
+            FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}"
         fi
     else
-        TEST_TEMPLATES="${TEST_TEMPLATES} testplan/${test}"
+        FULL_TEST_TEMPLATES="${FULL_TEST_TEMPLATES} testplan/${test}"
+        QEMU_TEST_TEMPLATES="${QEMU_TEST_TEMPLATES} testplan/${test}"
     fi
 done
 
-python ${BASE_PATH}/submit_for_testing.py \
-  --device-type ${DEVICE_TYPE} \
-  --build-number ${BUILD_NUMBER} \
-  --lava-server ${LAVA_SERVER} \
-  --qa-server ${QA_SERVER} \
-  --qa-server-team ${QA_SERVER_TEAM} \
-  --qa-server-project ${QA_SERVER_PROJECT} \
-  --git-commit ${QA_BUILD_VERSION} \
-  ${DRY_RUN} \
-  --test-plan ${TEST_TEMPLATES}
+# MIGRATION TO LKFT 2.0
+#
+# The following tests are already part of the lkft-full
+# test plan from lava-test-plans:
+# * kvm-unit-tests
+# * libhugetlbfs
+# * LTP
+# * spectre-meltdown-checker
+# * v4l2-compliance
+# so we need to remove them from here for the combinations
+# that have been migrated to LKFT 2.0.
+
+# The list of migrated combinations is here, in the form of
+#   QA_PROJECT::LAVA_DEVICE
+# one per line, in the following array:
+MIGRATED=(
+  linux-mainline-master::dragonboard-410c
+  linux-next-master::dragonboard-410c
+  linux-stable-rc-linux-4.9.y::dragonboard-410c
+  linux-stable-rc-linux-4.14.y::dragonboard-410c
+  linux-stable-rc-linux-4.19.y::dragonboard-410c
+  linux-stable-rc-linux-5.4.y::dragonboard-410c
+  linux-stable-rc-5.5-oe::dragonboard-410c
+  linux-stable-rc-5.6-oe::dragonboard-410c
+  linux-stable-rc-5.7-oe::dragonboard-410c
+  linux-stable-rc-linux-5.8.y::dragonboard-410c
+  linux-stable-rc-linux-5.9.y::dragonboard-410c
+  linux-stable-rc-linux-5.10.y::dragonboard-410c
+  linux-stable-rc-linux-5.11.y::dragonboard-410c
+  linux-stable-rc-linux-5.12.y::dragonboard-410c
+  linux-stable-rc-linux-5.13.y::dragonboard-410c
+  linux-stable-rc-linux-5.14.y::dragonboard-410c
+  linux-stable-rc-linux-5.15.y::dragonboard-410c
+  linux-stable-rc-linux-5.16.y::dragonboard-410c
+  linux-stable-rc-linux-5.17.y::dragonboard-410c
+  linux-mainline-master::hi6220-hikey
+  linux-next-master::hi6220-hikey
+  linux-stable-rc-linux-4.9.y::hi6220-hikey
+  linux-stable-rc-linux-4.14.y::hi6220-hikey
+  linux-stable-rc-linux-4.19.y::hi6220-hikey
+  linux-stable-rc-linux-5.4.y::hi6220-hikey
+  linux-stable-rc-5.5-oe::hi6220-hikey
+  linux-stable-rc-5.6-oe::hi6220-hikey
+  linux-stable-rc-5.7-oe::hi6220-hikey
+  linux-stable-rc-linux-5.8.y::hi6220-hikey
+  linux-stable-rc-linux-5.9.y::hi6220-hikey
+  linux-stable-rc-linux-5.10.y::hi6220-hikey
+  linux-stable-rc-linux-5.11.y::hi6220-hikey
+  linux-stable-rc-linux-5.12.y::hi6220-hikey
+  linux-stable-rc-linux-5.13.y::hi6220-hikey
+  linux-stable-rc-linux-5.14.y::hi6220-hikey
+  linux-stable-rc-linux-5.15.y::hi6220-hikey
+  linux-stable-rc-linux-5.16.y::hi6220-hikey
+  linux-stable-rc-linux-5.17.y::hi6220-hikey
+  linux-mainline-master::juno-r2
+  linux-next-master::juno-r2
+  linux-stable-rc-linux-4.4.y::juno-r2
+  linux-stable-rc-linux-4.9.y::juno-r2
+  linux-stable-rc-linux-4.14.y::juno-r2
+  linux-stable-rc-linux-4.19.y::juno-r2
+  linux-stable-rc-linux-5.4.y::juno-r2
+  linux-stable-rc-5.5-oe::juno-r2
+  linux-stable-rc-5.6-oe::juno-r2
+  linux-stable-rc-5.7-oe::juno-r2
+  linux-stable-rc-linux-5.8.y::juno-r2
+  linux-stable-rc-linux-5.9.y::juno-r2
+  linux-stable-rc-linux-5.10.y::juno-r2
+  linux-stable-rc-linux-5.11.y::juno-r2
+  linux-stable-rc-linux-5.12.y::juno-r2
+  linux-stable-rc-linux-5.13.y::juno-r2
+  linux-stable-rc-linux-5.14.y::juno-r2
+  linux-stable-rc-linux-5.15.y::juno-r2
+  linux-stable-rc-linux-5.16.y::juno-r2
+  linux-stable-rc-linux-5.17.y::juno-r2
+  linux-mainline-master::i386
+  linux-next-master::i386
+  linux-stable-rc-linux-4.4.y::i386
+  linux-stable-rc-linux-4.9.y::i386
+  linux-stable-rc-linux-4.14.y::i386
+  linux-stable-rc-linux-4.19.y::i386
+  linux-stable-rc-linux-5.4.y::i386
+  linux-stable-rc-5.5-oe::i386
+  linux-stable-rc-5.6-oe::i386
+  linux-stable-rc-5.7-oe::i386
+  linux-stable-rc-linux-5.8.y::i386
+  linux-stable-rc-linux-5.9.y::i386
+  linux-stable-rc-linux-5.10.y::i386
+  linux-stable-rc-linux-5.11.y::i386
+  linux-stable-rc-linux-5.12.y::i386
+  linux-stable-rc-linux-5.13.y::i386
+  linux-stable-rc-linux-5.14.y::i386
+  linux-stable-rc-linux-5.15.y::i386
+  linux-stable-rc-linux-5.16.y::i386
+  linux-stable-rc-linux-5.17.y::i386
+  linux-mainline-master::x15
+  linux-next-master::x15
+  linux-stable-rc-linux-4.4.y::x15
+  linux-stable-rc-linux-4.9.y::x15
+  linux-stable-rc-linux-4.14.y::x15
+  linux-stable-rc-linux-4.19.y::x15
+  linux-stable-rc-linux-5.4.y::x15
+  linux-stable-rc-5.5-oe::x15
+  linux-stable-rc-5.6-oe::x15
+  linux-stable-rc-5.7-oe::x15
+  linux-stable-rc-linux-5.8.y::x15
+  linux-stable-rc-linux-5.9.y::x15
+  linux-stable-rc-linux-5.10.y::x15
+  linux-stable-rc-linux-5.11.y::x15
+  linux-stable-rc-linux-5.12.y::x15
+  linux-stable-rc-linux-5.13.y::x15
+  linux-stable-rc-linux-5.14.y::x15
+  linux-stable-rc-linux-5.15.y::x15
+  linux-stable-rc-linux-5.16.y::x15
+  linux-stable-rc-linux-5.17.y::x15
+  linux-mainline-master::x86
+  linux-next-master::x86
+  linux-stable-rc-linux-4.4.y::x86
+  linux-stable-rc-linux-4.9.y::x86
+  linux-stable-rc-linux-4.14.y::x86
+  linux-stable-rc-linux-4.19.y::x86
+  linux-stable-rc-linux-5.4.y::x86
+  linux-stable-rc-5.5-oe::x86
+  linux-stable-rc-5.6-oe::x86
+  linux-stable-rc-5.7-oe::x86
+  linux-stable-rc-linux-5.8.y::x86
+  linux-stable-rc-linux-5.9.y::x86
+  linux-stable-rc-linux-5.10.y::x86
+  linux-stable-rc-linux-5.11.y::x86
+  linux-stable-rc-linux-5.12.y::x86
+  linux-stable-rc-linux-5.13.y::x86
+  linux-stable-rc-linux-5.14.y::x86
+  linux-stable-rc-linux-5.15.y::x86
+  linux-stable-rc-linux-5.16.y::x86
+  linux-stable-rc-linux-5.17.y::x86
+)
+
+this_combo="${QA_SERVER_PROJECT}::${DEVICE_TYPE}"
+if [[ ${MIGRATED[*]} =~ ${this_combo} ]]; then
+    echo "This combination (${DEVICE_TYPE} in ${QA_SERVER_PROJECT}) has been"
+    echo "migrated to LKFT 2.0. Tests running there will be filtered out here."
+
+    NEW_FULL_TEST_TEMPLATES=""
+    for t in ${FULL_TEST_TEMPLATES}; do
+        test="${t#testplan/*}"
+        test="${test%%.yaml}"
+        case ${test} in
+            ltp*)            test=""   ;;
+            libhugetlbfs)    test=""   ;;
+            kvm-unit-tests)  test=""   ;;
+            v4l2-compliance) test=""   ;;
+            *)               test="$t" ;;
+        esac
+        [ -z "${test}" ] && echo "LKFT2.0 filtering: $t"
+        NEW_FULL_TEST_TEMPLATES="${NEW_FULL_TEST_TEMPLATES} ${test}"
+    done
+    FULL_TEST_TEMPLATES="${NEW_FULL_TEST_TEMPLATES}"
+fi
+
+# Submit sanity jobs
+if false; then
+    # Save original priority
+    export FULL_LAVA_JOB_PRIORITY=${LAVA_JOB_PRIORITY}
+
+    # Bump priority for the sanity jobs
+    export LAVA_JOB_PRIORITY=${SANITY_LAVA_JOB_PRIORITY}
+
+    # Submit sanity test run
+    if [ ! -z "${SANITY_TEST_TEMPLATES}" ]; then
+      python3 ${BASE_PATH}/submit_for_testing.py \
+        --device-type ${DEVICE_TYPE} \
+        --build-number ${BUILD_NUMBER} \
+        --lava-server ${LAVA_SERVER} \
+        --qa-server ${QA_SERVER} \
+        --qa-server-team ${QA_SERVER_TEAM} \
+        --qa-server-project ${QA_SERVER_PROJECT}-sanity \
+        --git-commit ${QA_BUILD_VERSION} \
+        ${DRY_RUN} \
+        --test-plan ${SANITY_TEST_TEMPLATES}
+    fi
+
+    # reset LAVA_JOB_PRIORITY to default
+    export LAVA_JOB_PRIORITY=${FULL_LAVA_JOB_PRIORITY}
+fi
+
+# Submit QEMU jobs
+QEMU_DEVICE_TYPE=""
+case "${DEVICE_TYPE}" in
+  x15)
+    QEMU_DEVICE_TYPE=qemu_arm
+    ;;
+  juno-r2)
+    QEMU_DEVICE_TYPE=qemu_arm64
+    ;;
+  i386)
+    QEMU_DEVICE_TYPE=qemu_i386
+    ;;
+  x86)
+    QEMU_DEVICE_TYPE=qemu_x86_64
+    ;;
+esac
+if false; then
+  # submit_for_testing.py sends the current environment to jinja, and jinja
+  # templates rely on DEVICE_TYPE. so we have to actually set DEVICE_TYPE here.
+  export ORIGINAL_DEVICE_TYPE=${DEVICE_TYPE}
+  export DEVICE_TYPE=${QEMU_DEVICE_TYPE}
+  python3 ${BASE_PATH}/submit_for_testing.py \
+    --device-type ${QEMU_DEVICE_TYPE} \
+    --build-number ${BUILD_NUMBER} \
+    --lava-server ${LAVA_SERVER} \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team ${QA_SERVER_TEAM} \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --git-commit ${QA_BUILD_VERSION} \
+    ${DRY_RUN} \
+    --test-plan ${QEMU_TEST_TEMPLATES}
+  export DEVICE_TYPE=${ORIGINAL_DEVICE_TYPE}
+fi
+
+# Submit full test run
+if [ ! -z "${FULL_TEST_TEMPLATES}" ] && [ ! -z "${FULL_TEST_TEMPLATES}" ]; then
+  python3 ${BASE_PATH}/submit_for_testing.py \
+    --device-type ${DEVICE_TYPE} \
+    --build-number ${BUILD_NUMBER} \
+    --lava-server ${LAVA_SERVER} \
+    --qa-server ${QA_SERVER} \
+    --qa-server-team ${QA_SERVER_TEAM} \
+    --qa-server-project ${QA_SERVER_PROJECT} \
+    --git-commit ${QA_BUILD_VERSION} \
+    ${DRY_RUN} \
+    --test-plan ${FULL_TEST_TEMPLATES}
+fi
diff --git a/openembedded-lkft/test_submit_for_testing.sh b/openembedded-lkft/test_submit_for_testing.sh
index 2852a62b71..18a9e931da 100755
--- a/openembedded-lkft/test_submit_for_testing.sh
+++ b/openembedded-lkft/test_submit_for_testing.sh
@@ -1,19 +1,43 @@
 #!/bin/bash
 
+# This 'test' script generates all job templates from lava-job-definitions,
+# verifies that they are valid YAML, and saves them all to ./tmp/. When making
+# lava job template changes in lava-job-definitions, run this beforehand, save
+# /tmp to a new path, and then run it after and diff the directories to see the
+# effects the change had on the job definitions.
+#
+# These generated templates can also be verified by lava by using the following
+# commandline, which requires lavacli to be configured with authentication
+# against some LAVA host.
+#
+#    drue@xps:~/src/configs/openembedded-lkft$ rm -rf tmp && ./test_submit_for_testing.sh && for file in $(find tmp -name '*.yaml'); do echo $file && lavacli -i therub jobs validate $file || break; done
+
 set -e
 
-virtualenv .venv
+virtualenv --python=$(which python2) .venv
 source .venv/bin/activate
-pip install Jinja2 requests urllib3 ruamel.yaml
+pip install Jinja2 requests urllib3 ruamel.yaml==0.16.13
 
-export BASE_URL=http://snapshots.linaro.org
-export PUB_DEST=openembedded/lkft/morty/hikey/rpb/linux-mainline/346
-export EXT4_IMAGE_URL="${BUILD_LOCATION}/${EXT4_IMAGE_FILENAME}"
-export BOOT_URL=${BASE_URL}/${PUB_DEST}/boot-0.0+AUTOINC+06e4def583-fb1158a365-r0-hikey-20171012090440-346.uefi.img
-export DTB_URL=${BASE_URL}/${PUB_DEST}/junor2.dtb
-export HDD_URL=${BASE_URL}/${PUB_DEST}/rpb-console-image-intel-core2-32-20180212181859-651.hddimg
 export BUILD_ID=346
 export BUILD_NUMBER=346
+export BASE_URL=http://snapshots.linaro.org
+export PUB_DEST=openembedded/lkft/morty/hikey/rpb/linux-mainline/${BUILD_NUMBER}
+export BOOOT_IMG=boot-Image-hikey-20171012090440-346.uefi.img
+export KERNEL_IMG=Image-gz-hikey-20171012090440-346.bin
+export MODULES_TGZ=modules--hikey-20171012090440-346.tgz
+export DTB_IMG=Image-gz-hikey-20171012090440-346.dtb
+export ROOTFS_IMG=rpb-console-image-hikey-20171012090440-346.rootfs.img.gz
+export ROOTFS_EXT4=rpb-console-image-hikey-20171012090440-346.rootfs.ext4.gz
+export ROOTFS_TARXZ_IMG=rpb-console-image-hikey-20171012090440-346.rootfs.tar.xz
+export HDD_IMG=rpb-console-image-hikey-20171012090440-346.rootfs.hddimg
+export BOOT_URL=${BASE_URL}/${PUB_DEST}/${BOOT_IMG}
+export DTB_URL=${BASE_URL}/${PUB_DEST}/${DTB_IMG}
+export KERNEL_URL=${BASE_URL}/${PUB_DEST}/${KERNEL_IMG}
+export MODULES_URL=${BASE_URL}/${PUB_DEST}/${MODULES_TGZ}
+export EXT4_IMAGE_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_EXT4}
+export NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_TARXZ_IMG}
+export HDD_URL=${BASE_URL}/${PUB_DEST}/${HDD_IMG}
+export SYSTEM_URL=${BASE_URL}/${PUB_DEST}/${ROOTFS_IMG}
 export BUILD_URL="https://ci.linaro.org/job/openembedded-lkft-linux-mainline/DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64/346/"
 export JOB_BASE_NAME="DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64"
 export JOB_NAME="openembedded-lkft-linux-mainline/DISTRO=rpb,MACHINE=hikey,label=docker-stretch-amd64"
@@ -25,7 +49,6 @@ export KERNEL_DEFCONFIG_URL=${BASE_URL}/${PUB_DEST}/defconfig
 export KERNEL_DESCRIBE=v4.14-rc4-84-gff5abbe799e2
 export KERNEL_RECIPE=linux-hikey-mainline
 export KERNEL_REPO=https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-export KERNEL_URL=${BASE_URL}/${PUB_DEST}/Image--4.13+git0+ff5abbe799-r0-hikey-20171012090440-346.bin
 export KERNEL_VERSION=git
 export KERNEL_VERSION_OVERRIDE=mainline
 export KSELFTEST_PATH="/opt/"
@@ -44,25 +67,25 @@ export LTP_VERSION=20170929
 export MACHINE=hikey
 export MAKE_KERNELVERSION=4.14.0-rc4
 export MANIFEST_BRANCH=morty
-export NFSROOTFS_URL=${BASE_URL}/${PUB_DEST}/rpb-console-image-hikey-20171012090440-346.rootfs.tar.xz
 export QA_REPORTS_TOKEN=qa-reports-token
 export QA_SERVER=https://qa-reports.linaro.org
-export QA_SERVER_PROJECT=linux-mainline-oe
+export QA_SERVER_PROJECT=linux-mainline-master
 export RECOVERY_IMAGE_URL=${BASE_URL}/${PUB_DEST}/juno-oe-uboot.zip
 export SKIP_LAVA=
 export SRCREV_kernel=ff5abbe799e29099695cb8b5b2f198dd8b8bdf26
-export SYSTEM_URL=${BASE_URL}/${PUB_DEST}/rpb-console-image-hikey-20171012090440-346.rootfs.img.gz
 export BUILD_NAME="openembedded-lkft-linux-mainline"
-export LAVA_JOB_PRIORITY="medium"
+export LAVA_JOB_PRIORITY="50"
+export SANITY_LAVA_JOB_PRIORITY="55"
 export QA_SERVER="http://localhost:8000"
 export QA_REPORTS_TOKEN="secret"
 export DEVICE_TYPE="x86"
 export KSELFTEST_SKIPLIST="pstore"
 export QA_BUILD_VERSION=${KERNEL_DESCRIBE}
+export TOOLCHAIN="arm-linaro-linux-gnueabi linaro-6.2"
 
 export DRY_RUN=true
 
-for device in $(ls lava-job-definitions/devices); do
+for device in hi6220-hikey i386 x86 juno-r2 x15 dragonboard-410c; do
     export DEVICE_TYPE=$device
     bash submit_for_testing.sh
 done
diff --git a/openembedded-rootfs-external-toolchain.yaml b/openembedded-rootfs-external-toolchain.yaml
index cf5d7b95fa..ba4fb1dc57 100644
--- a/openembedded-rootfs-external-toolchain.yaml
+++ b/openembedded-rootfs-external-toolchain.yaml
@@ -10,14 +10,14 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
     parameters:
         - string:
             name: toolchain_url
             default: 'http://releases.linaro.org/components/toolchain/binaries/5.3-2016.02/aarch64-linux-gnu/gcc-linaro-5.3-2016.02-x86_64_aarch64-linux-gnu.tar.xz'
-    disabled: false
+    disabled: true
     node: build
     display-name: 'OpenEmbedded rootfs with external toolchain'
     scm:
@@ -94,10 +94,10 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out/ openembedded/images/${rootfs}-${arch}-external-toolchain/${BUILD_NUMBER}
     publishers:
         - email:
-            recipients: 'fathi.boudra@linaro.org koen.kooi@linaro.org'
+            recipients: 'fathi.boudra@linaro.org'
diff --git a/openembedded-x86-rootfs.yaml b/openembedded-x86-rootfs.yaml
deleted file mode 100644
index 95cf339fb5..0000000000
--- a/openembedded-x86-rootfs.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-- job:
-    name: openembedded-x86-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'OpenEmbedded rootfs (x86-64)'
-    scm:
-        - git:
-            url: https://git.linaro.org/openembedded/jenkins-setup.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - timed: '@weekly'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-        - axis:
-            type: user-defined
-            name: gcc_version
-            values:
-                - 6.2
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - minimal
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'rootfs=="minimal"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            export PATH="$HOME/bin:$PATH"
-
-            # we clean build and populate it from cache
-            bash -x pre-build-do-cleanup.sh
-
-            # set init-and-build flags based on image type
-            init_flags=
-            [ "${rootfs}" = "lng" ] && init_flags="-p"
-            # do a build
-            bash -x init-and-build.sh -a x86-64 -g ${gcc_version} ${init_flags} linaro-image-${rootfs}
-
-            cd ${WORKSPACE}
-
-            bash -x post-build-create-image-manifest.sh
-            bash -x post-build-sort-out-downloads.sh
-
-            # Capture what we're building in the build output.
-            repo manifest -r
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/ openembedded/images/${rootfs}-x86-gcc-${gcc_version}/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'anders.roxell@linaro.org fathi.boudra@linaro.org koen.kooi@linaro.org riku.voipio@linaro.org'
diff --git a/openjdk8-hadoop-LCA14.yaml b/openjdk8-hadoop-LCA14.yaml
index 7e24887816..99f312b918 100644
--- a/openjdk8-hadoop-LCA14.yaml
+++ b/openjdk8-hadoop-LCA14.yaml
@@ -17,12 +17,12 @@
             days-to-keep: 30
             num-to-keep: 10
             artifact-num-to-keep: 5
-    disabled: false
+    disabled: true
     node: build
     display-name: 'OpenJDK - Assemble Hadoop demo'
     scm:
         - git:
-            url: https://git.linaro.org/people/andrew.mcdermott/openjdk8-hadoop-LCA14.git
+            url: https://git.linaro.org/leg/openjdk/openjdk8-hadoop-LCA14.git
             refspec: +refs/heads/master:refs/remotes/origin/master
             name: origin
             branches:
diff --git a/optee-build.yaml b/optee-build.yaml
index 62c3fcf43d..a1e7093b02 100644
--- a/optee-build.yaml
+++ b/optee-build.yaml
@@ -14,7 +14,7 @@
                 - job-build
                 - job-cancel
                 - job-configure
-            linaro:
+            everyone-flat:
                 - job-build
         - build-discarder:
             days-to-keep: 90
diff --git a/optee-os.yaml b/optee-os.yaml
index 80110fd53c..8d38967612 100644
--- a/optee-os.yaml
+++ b/optee-os.yaml
@@ -14,7 +14,7 @@
                 - job-build
                 - job-cancel
                 - job-configure
-            linaro:
+            everyone-flat:
                 - job-build
         - build-discarder:
             days-to-keep: 90
diff --git a/optee/build/publishers.sh b/optee/build/publishers.sh
index 6d0eb8e70a..4767642416 100755
--- a/optee/build/publishers.sh
+++ b/optee/build/publishers.sh
@@ -29,7 +29,7 @@ zip -r ${WORKSPACE}/out-publish/juno-oe-uboot.zip .
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --server ${PUBLISH_SERVER} \
   --link-latest \
   ${WORKSPACE}/out-publish ${PUB_DEST}
diff --git a/optee/os/publishers.sh b/optee/os/publishers.sh
index 536c19dccb..f5a2f1d977 100755
--- a/optee/os/publishers.sh
+++ b/optee/os/publishers.sh
@@ -25,7 +25,7 @@ rm -f  ${WORKSPACE}/out-publish/tee-pageable_v2.bin
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --server ${PUBLISH_SERVER} \
   --link-latest \
   ${WORKSPACE}/out-publish ${PUB_DEST}
diff --git a/package-and-publish-linux-linaro-stable.yaml b/package-and-publish-linux-linaro-stable.yaml
deleted file mode 100644
index d61afd413d..0000000000
--- a/package-and-publish-linux-linaro-stable.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-- job:
-    name: package-and-publish-linux-linaro-stable
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 100
-            artifact-num-to-keep: 1
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Package and publish Linaro Stable Kernel (LSK)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk:refs/remotes/origin/linux-linaro-lsk
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk
-            basedir: reference-git
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - lsk-arndale-be
-                - lsk-vexpress
-                - lsk-vexpress-be
-                - lsk-vexpress64
-                - lsk-vexpress64-be
-                - lt-vexpress64
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - .gnupg/
-                - default_git_publish_keyfile
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.bz2
-            relative-to: 'somewhereElse'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            # this step ensures we have gpg configured
-            # requires "Copy files into the job's workspace before building" above
-            # with "Files to copy" of .gnupg/
-            cp -a .gnupg ~
-            gpg --list-keys
-            rm -rf .gnupg
-
-            exit 0
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount kernel_build
-            }
-
-            dpkg -s dpkg |grep '^Version'
-
-            test -d kernel_build || mkdir kernel_build
-            sudo mount -t tmpfs -o size=6G tmpfs kernel_build
-
-            rm -rf ubuntu-kernel-ci
-            git clone git://git.linaro.org/ci/ubuntu-kernel-ci.git ubuntu-kernel-ci
-
-            # export parent_workspace="/mnt/ci_build/workspace/package-and-publish-linux-linaro-stable"
-            # export reference_git="${parent_workspace}/reference-git"
-            # export nearby_git="${reference_git}/.git"
-
-            export nearby_git="${WORKSPACE}/reference-git/.git"
-
-            # test -d ${reference_git} || git clone -b linux-linaro-lsk git://git.linaro.org/kernel/linux-linaro-stable.git ${reference_git}
-
-            case "${hwpack}" in
-              lsk-arndale-be|lsk-omap-be|lsk-vexpress-be)
-                export TCBINDIR=${WORKSPACE}/tc/armeb/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.bz2
-                export conf_options="do_publish_source_pkg=false do_create_artifact_dir=false do_publish_release_tag=false"
-                ;;
-              lsk-vexpress)
-                export TCBINDIR=${WORKSPACE}/tc/armhf/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                export conf_options="do_publish_release_tag=false"
-                export conf_options="-k B86C70FE do_publish_release_tag=false"
-                ;;
-              lsk-vexpress64|lsk-vexpress64-be|lt-vexpress64)
-                export TCBINDIR=${WORKSPACE}/tc/arm64/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-                export conf_options="do_publish_source_pkg=false do_create_artifact_dir=false do_publish_release_tag=false"
-                ;;
-            esac
-
-            ./ubuntu-kernel-ci/scripts/package_kernel --cfg ${hwpack}.cfg nearby_git=${nearby_git} ${conf_options}
-
-            # Display changelog
-            cat ${WORKSPACE}/kernel_build/linux/debian/changelog
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            #time python ${HOME}/bin/linaro-cp.py \
-            #  --api_version 3 \
-            #  --link-latest \
-            #  out kernel-hwpack/package-and-publish-linux-linaro-stable-${hwpack}/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/*.deb'
-            excludes: 'out/*dbgsym*.deb'
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/package-and-publish-linux-linaro.yaml b/package-and-publish-linux-linaro.yaml
deleted file mode 100644
index 54680e51e7..0000000000
--- a/package-and-publish-linux-linaro.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-- job:
-    name: package-and-publish-linux-linaro
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 100
-            artifact-num-to-keep: 1
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Package and publish Linux Linaro'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro:refs/remotes/origin/linux-linaro
-            name: origin
-            branches:
-                - refs/heads/linux-linaro
-            basedir: reference-git
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - arndale-be
-                - lt-vexpress
-                - vexpress
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - copy-to-slave:
-            includes:
-                - .gnupg/
-                - .ssh/
-                - .dput.cf
-                - default_git_publish_keyfile
-                - gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-                - gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.bz2
-            relative-to: 'somewhereElse'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            # this step ensures we have gpg configured
-            # requires "Copy files into the job's workspace before building" above
-            # with "Files to copy" of .gnupg/
-            cp -a .gnupg ~
-            gpg --list-keys
-            rm -rf .gnupg
-
-            # Set up local ssh keys for upload signing
-            cp -a .ssh ~
-            rm -rf .ssh
-            chmod og-rwx ~/.ssh ~/.ssh/id_rsa
-
-            #set up upload config for repo.l.o
-            mv .dput.cf ~
-
-            exit 0
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount kernel_build
-            }
-
-            dpkg -s dpkg |grep '^Version'
-
-            test -d kernel_build || mkdir kernel_build
-            sudo mount -t tmpfs -o size=6G tmpfs kernel_build
-
-            rm -rf ubuntu-kernel-ci
-            git clone git://git.linaro.org/ci/ubuntu-kernel-ci.git ubuntu-kernel-ci
-
-            # export parent_workspace="/mnt/ci_build/workspace/package-and-publish-linux-linaro"
-            # export reference_git="${parent_workspace}/reference-git"
-            # export nearby_git="${reference_git}/.git"
-
-            export nearby_git="${WORKSPACE}/reference-git/.git"
-
-            # test -d ${reference_git} || git clone -b master git://git.linaro.org/kernel/linux-linaro-tracking.git ${reference_git}
-
-            case "${hwpack}" in
-              arndale|arndale-octa|beaglebone|highbank|lt-vexpress|midway|omap|u8500|vexpress)
-                export TCBINDIR=${WORKSPACE}/arm-tc/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz
-                export conf_options="do_publish_release_tag=false"
-                export conf_options="-k B86C70FE do_publish_release_tag=false"
-                ;;
-              arndale-be|omap-be)
-                export TCBINDIR=${WORKSPACE}/armeb-tc/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-arm-linux-gnueabihf-4.7-2013.04-20130415_linux.tar.bz2
-                export conf_options="do_publish_source_pkg=false do_create_artifact_dir=false do_publish_release_tag=false"
-                ;;
-              vexpress64)
-                export HOST_PPA=linaro-overlay
-                export TCBINDIR=${WORKSPACE}/arm64-tc/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-                export conf_options="-k B86C70FE do_publish_release_tag=false"
-                ;;
-              vexpress64-be)
-                export TCBINDIR=${WORKSPACE}/arm64-tc/bin
-                export toolchain_url=file://${WORKSPACE}/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-                export conf_options="do_publish_source_pkg=false do_create_artifact_dir=false do_publish_release_tag=false"
-                ;;
-            esac
-
-            ./ubuntu-kernel-ci/scripts/package_kernel --cfg ${hwpack}.cfg nearby_git=${nearby_git} ${conf_options}
-
-            # Display changelog
-            cat ${WORKSPACE}/kernel_build/linux/debian/changelog
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            #time python ${HOME}/bin/linaro-cp.py \
-            #  --api_version 3 \
-            #  --link-latest \
-            #  out kernel-hwpack/package-and-publish-linux-linaro-${hwpack}/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/*.deb'
-            excludes: 'out/*dbgsym*.deb'
-        - email:
-            recipients: 'fathi.boudra@linaro.org'
diff --git a/pfalcon-test.yaml b/pfalcon-test.yaml
new file mode 100644
index 0000000000..0528ddb419
--- /dev/null
+++ b/pfalcon-test.yaml
@@ -0,0 +1,117 @@
+- job:
+    name: pfalcon-test
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            paul.sokolovsky@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-configure
+                - job-cancel
+                - job-delete
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 30
+    parameters:
+        - string:
+            name: GIT_URL
+            default: 'https://github.com/OpenAMP/libmetal'
+        - string:
+            name: BRANCH
+            default: 'master'
+        - string:
+            name: ZEPHYR_GIT_URL
+            default: 'https://github.com/zephyrproject-rtos/zephyr'
+        - string:
+            name: ZEPHYR_BRANCH
+            default: 'master'
+        - string:
+            name: LAVA_SERVER
+            default: 'validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+    disabled: false
+    node: master
+    child-workspace: .
+    display-name: 'LITE Aeolus - OpenAMP'
+    axes:
+        - axis:
+            type: slave
+            name: label
+            values:
+                - x86_64-13
+        - axis:
+            type: user-defined
+            name: ZEPHYR_TOOLCHAIN_VARIANT
+            values:
+                - zephyr
+        - axis:
+            type: user-defined
+            name: PLATFORM
+            values:
+                - qemu_xilinx
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            docker run hello-world
+        - shell: |
+            git clone --depth 1 http://git.linaro.org/ci/job/configs.git job-configs
+        - shell: |
+            ./job-configs/lite-aeolus-openamp/install-deps.sh
+        - shell: |
+            ./job-configs/lite-aeolus-openamp/build.sh
+        - inject:
+            properties-file: env_var_parameters
+        - build-name-setter:
+            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
+            macro: true
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            echo "Publishing artifacts"
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --api_version 3 \
+              --link-latest \
+              *.qemu-sd components/kernel/aeolus-2/openamp/${BRANCH}/${PLATFORM}/${BUILD_NUMBER}
+
+            rm -rf out
+        - shell: |
+            ./job-configs/lite-aeolus-openamp/submit-test.sh
+
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw: lite-aeolus/description-lava-link.groovy
+        - email:
+            recipients: 'paul.sokolovsky@linaro.org'
diff --git a/post-build-lava.yaml b/post-build-lava.yaml
new file mode 100644
index 0000000000..8109751a37
--- /dev/null
+++ b/post-build-lava.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: post-build-lava
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - throttle:
+            option: project
+            max-total: 1
+    parameters:
+        - file:
+            name: post_build_lava_parameters
+    node: docker-bionic
+    display-name: 'Submit job to lava'
+    wrappers:
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+
+    builders:
+        - shell:
+            !include-raw: post-build-lava/post-build-lava.py
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                    - post-build-lava/postbuild.groovy
+        - email:
+            recipients: 'linaro-infrastructure-errors@lists.linaro.org'
diff --git a/post-build-lava/post-build-lava.py b/post-build-lava/post-build-lava.py
new file mode 100755
index 0000000000..41f4753c02
--- /dev/null
+++ b/post-build-lava/post-build-lava.py
@@ -0,0 +1,599 @@
+#!/usr/bin/python
+
+import base64
+import collections
+import fileinput
+import json
+import os
+import re
+import sys
+import urllib2
+import xmlrpclib
+
+tests_timeout = {
+    'bluetooth-enablement': 7200,
+    'bootchart': 800,
+    'busybox': 800,
+    'cyclictest': 90000,
+    'device-tree': 800,
+    'e2eaudiotest': 7200,
+    'ethernet': 800,
+    'gatortests': 1200,
+    'kernel-version': 800,
+    'leb-basic-graphics': 7200,
+    'ltp': 10800,
+    'mysql': 800,
+    'network-tests-basic': 1200,
+    'perf': 800,
+    'phpinfo': 800,
+    'phpmysql': 800,
+    'pwrmgmt': 1200,
+    'sdkhelloc': 800,
+    'sdkhellocxx': 800,
+    'smoke-tests-basic': 1200,
+    'toolchain': 800,
+    'wifi-enablement': 7200,
+}
+
+tests_nano = [
+    'device-tree',
+    'gatortests',
+    'ltp',
+    'perf',
+    'pwrmgmt',
+    'smoke-tests-basic',
+    'network-tests-basic',
+]
+
+
+# CI base URL
+ci_base_url = 'https://ci.linaro.org/jenkins/job/'
+# Snapshots base URL
+snapshots_url = 'https://snapshots.linaro.org'
+
+class LAVADeviceBase(object):
+    """
+    Base class for definition of the device type and target in lava job.
+    """
+
+    def __init__(self, name=None):
+        self.name = name
+
+
+class LAVADeviceType(LAVADeviceBase):
+    """
+    Representation the definition of the device type in lava job.
+    """
+
+
+class LAVADeviceTarget(LAVADeviceBase):
+    """
+    Representation the definition of the device target in lava job.
+    """
+
+
+def obfuscate_credentials(s):
+    return re.sub(r'([^ ]:).+?(@)', r'\1xxx\2', s)
+
+
+def auth_headers(username, password):
+    return 'Basic ' + base64.encodestring('%s:%s' % (username, password))[:-1]
+
+
+def get_hwpack_type(job_name, hwpack_file_name="Undefined"):
+    hwpack_type = job_name.replace('/', ',')
+    ret_split = dict(
+        token.split('=') for token in hwpack_type.split(',') if '=' in token)
+    try:
+        return ret_split['hwpack']
+    except KeyError, e:
+        # If hwpack key is not found, fallback to hwpack file name
+        return hwpack_file_name.split('_')[1].split('-')[1]
+
+
+def get_rootfs_url(distribution, architecture, rootfs_type):
+    # Rootfs last successful build number
+    ci_url = '%s%s-%s-%s%s%s%s' % \
+             (ci_base_url,
+              distribution,
+              architecture,
+              'rootfs/rootfs=',
+              rootfs_type,
+              ',label=build',
+              '/lastSuccessfulBuild/buildNumber')
+    request = urllib2.Request(ci_url)
+    try:
+        response = urllib2.urlopen(request)
+    except urllib2.URLError, e:
+        if hasattr(e, 'reason'):
+            print 'Failed to reach %s.' % ci_url
+            print 'Reason: ', e.reason
+        elif hasattr(e, 'code'):
+            print 'ci.linaro.org could not fulfill the request: %s' % ci_url
+            print 'Error code: ', e.code
+        sys.exit('Failed to get last successful rootfs build number.')
+
+    rootfs_build_number = '%s' % eval(response.read())
+
+    # Rootfs last successful build timestamp
+    ci_url = '%s%s-%s-%s%s%s%s' % \
+             (ci_base_url,
+              distribution,
+              architecture,
+              'rootfs/rootfs=',
+              rootfs_type,
+              ',label=build',
+              '/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd')
+    request = urllib2.Request(ci_url)
+    try:
+        response = urllib2.urlopen(request)
+    except urllib2.URLError, e:
+        if hasattr(e, 'reason'):
+            print 'Failed to reach %s.' % ci_url
+            print 'Reason: ', e.reason
+        elif hasattr(e, 'code'):
+            print 'ci.linaro.org could not fulfill the request: %s' % ci_url
+            print 'Error code: ', e.code
+        sys.exit('Failed to get last successful rootfs build timestamp.')
+
+    rootfs_build_timestamp = '%s' % eval(response.read())
+
+    rootfs_file_name = 'linaro-utopic-%s-%s-%s.tar.gz' % \
+                       (rootfs_type,
+                        rootfs_build_timestamp,
+                        rootfs_build_number)
+
+    rootfs_url = '%s/%s/%s/%s/%s/%s' % \
+                 (snapshots_url,
+                  distribution,
+                  'images',
+                  rootfs_type,
+                  rootfs_build_number,
+                  rootfs_file_name)
+
+    return rootfs_url, rootfs_build_number
+
+
+def lava_submit(config, lava_server):
+    print config
+
+    skip_lava = os.environ.get('SKIP_LAVA')
+    if skip_lava is None:
+        # LAVA user
+        lava_user = os.environ.get('LAVA_USER')
+        if lava_user is None:
+            f = open('/var/run/lava/lava-user')
+            lava_user = f.read().strip()
+            f.close()
+
+        # LAVA token
+        lava_token = os.environ.get('LAVA_TOKEN')
+        if lava_token is None:
+            f = open('/var/run/lava/lava-token')
+            lava_token = f.read().strip()
+            f.close()
+
+        # LAVA server base URL
+        lava_server_root = lava_server.rstrip('/')
+        if lava_server_root.endswith('/RPC2'):
+            lava_server_root = lava_server_root[:-len('/RPC2')]
+
+        try:
+            server_url = \
+                'https://{lava_user:>s}:{lava_token:>s}@{lava_server:>s}'
+            server = \
+                xmlrpclib.ServerProxy(server_url.format(
+                    lava_user=lava_user,
+                    lava_token=lava_token,
+                    lava_server=lava_server))
+            lava_job_id = server.scheduler.submit_job(config)
+            job_is_single_node = isinstance(lava_job_id, int)
+            if job_is_single_node:
+                lava_job_details = server.scheduler.job_details(lava_job_id)
+                lava_id = lava_job_details['id']
+            else:
+                lava_job_details = map(lambda sub_id: server.scheduler.job_details(sub_id), lava_job_id)
+                lava_id = lava_job_details[0]['id']
+            print 'LAVA Job Id: %s, URL: https://%s/scheduler/job/%s' % \
+                  (lava_job_id, lava_server_root, lava_id)
+            if not job_is_single_node:
+                try:
+                    lava_sub_jobs = []
+                    for details in lava_job_details:
+                        lava_job_role = json.loads(details['definition'])['role']
+                        lava_sub_jobs.append('%s:%s:%s' % (details['id'], details['sub_id'], lava_job_role))
+                    print 'LAVA Sub-Jobs: %s' % ', '.join(lava_sub_jobs)
+                except (TypeError, ValueError):
+                    # ignore ValueError JSON decode errors in case job is YAML based
+                    pass
+        except xmlrpclib.ProtocolError, e:
+            print 'Error making a LAVA request:', obfuscate_credentials(str(e))
+            sys.exit(1)
+
+        json.dump({'lava_url': 'https://' + lava_server_root,
+                   'job_id': lava_job_id}, open('lava-job-info', 'w'))
+    else:
+        print 'LAVA job submission skipped.'
+
+    sys.exit()
+
+
+def get_job_list():
+    job_list = ['CUSTOM_JSON_URL']
+    sec_job_prefix = 'CUSTOM_JSON_URL_'
+
+    for var in os.environ.keys():
+        if var.startswith(sec_job_prefix):
+            job_list.append(var)
+    job_list.sort()
+
+    return job_list
+
+
+def replace(fp, pattern, subst):
+    print pattern
+    print subst
+    for line in fileinput.input(fp, inplace=1):
+        if pattern in line:
+            line = line.replace(pattern, subst)
+        sys.stdout.write(line)
+    fileinput.close()
+
+
+def submit_job_from_url():
+    """This routine updates a predefined job with the parameters specific
+    to this particular build"""
+    job_list = get_job_list()
+    for job in job_list:
+        lava_job_url = os.environ.get(job)
+        if lava_job_url is None:
+            print "Error: No CUSTOM_JSON_URL provided"
+            return
+        jobresource = urllib2.urlopen(lava_job_url)
+        jobjson = open('job.json','wb')
+        jobjson.write(jobresource.read())
+        jobjson.close()
+        # Job name, defined by android-build, e.g. linaro-android_leb-panda
+        job_name = os.environ.get("JOB_NAME")
+        default_frontend_job_name = "~" + job_name.replace("_", "/", 1)
+        frontend_job_name = os.environ.get("FRONTEND_JOB_NAME", default_frontend_job_name)
+
+        # Build number, defined by android-build, e.g. 61
+        build_number = os.environ.get("BUILD_NUMBER")
+
+        # download base URL, this may differ from job URL if we don't host
+        # downloads in Jenkins any more
+        download_url = "%s/%s/%s/" % ('%s/android/' % snapshots_url,
+                                      frontend_job_name,
+                                      build_number)
+
+        # jenkins job name scheme doesn't apply for 96boards jobs so expect
+        # download_url to be provided by the job.
+        download_url = os.environ.get("DOWNLOAD_URL", download_url)
+
+        # Set the file extension based on the type of artifacts
+        artifact_type = os.environ.get("MAKE_TARGETS", "tarball")
+        if artifact_type == "droidcore":
+            # Check if File extension is already defined
+            file_extension = os.environ.get("IMAGE_EXTENSION", "img")
+        else:
+            file_extension = "tar.bz2"
+
+        boot_subst = "%s%s%s" % (download_url, "/boot.", file_extension)
+        system_subst = "%s%s%s" % (download_url, "/system.", file_extension)
+        userdata_subst = "%s%s%s" % (download_url, "/userdata.", file_extension)
+        cache_subst = "%s%s%s" % (download_url, "/cache.", file_extension)
+
+        replace("job.json", "%%ANDROID_BOOT%%", boot_subst)
+        replace("job.json", "%%ANDROID_SYSTEM%%", system_subst)
+        replace("job.json", "%%ANDROID_DATA%%", userdata_subst)
+        replace("job.json", "%%ANDROID_CACHE%%", cache_subst)
+        replace("job.json", "%%ANDROID_META_NAME%%", job_name)
+        replace("job.json", "%%JOB_NAME%%", job_name)
+        replace("job.json", "%%ANDROID_META_BUILD%%",  build_number)
+        replace("job.json", "%%ANDROID_META_URL%%", os.environ.get("BUILD_URL"))
+        replace("job.json", "%%BUNDLE_STREAM%%", os.environ.get('LAVA_STREAM', '/private/team/linaro/android-daily/'))
+        replace("job.json", "%%WA2_JOB_NAME%%", build_number)
+        replace("job.json", "%%DOWNLOAD_URL%%", download_url)
+        replace("job.json", "%%GERRIT_CHANGE_NUMBER%%", os.environ.get("GERRIT_CHANGE_NUMBER", ""))
+        replace("job.json", "%%GERRIT_PATCHSET_NUMBER%%", os.environ.get("GERRIT_PATCHSET_NUMBER", ""))
+        replace("job.json", "%%GERRIT_CHANGE_URL%%", os.environ.get("GERRIT_CHANGE_URL", ""))
+        replace("job.json", "%%GERRIT_CHANGE_ID%%", os.environ.get("GERRIT_CHANGE_ID", ""))
+        replace("job.json", "%%REFERENCE_BUILD_URL%%", os.environ.get("REFERENCE_BUILD_URL", ""))
+        replace("job.json", "%%CTS_MODULE_NAME%%", os.environ.get("CTS_MODULE_NAME", ""))
+
+        # LAVA server URL
+        lava_server = os.environ.get('LAVA_SERVER',
+                                     'validation.linaro.org/RPC2/')
+
+        with open("job.json", 'r') as fin:
+            print fin.read()
+
+        # Inject credentials after the job dump to avoid to leak
+        replace("job.json", "%%ART_TOKEN%%", os.environ.get("ART_TOKEN"))
+        replace("job.json", "%%ARTIFACTORIAL_TOKEN%%", os.environ.get("ARTIFACTORIAL_TOKEN"))
+        replace("job.json", "%%QA_REPORTS_TOKEN%%", os.environ.get("QA_REPORTS_TOKEN"))
+        replace("job.json", "%%AP_SSID%%", os.environ.get("AP_SSID"))
+        replace("job.json", "%%AP_KEY%%", os.environ.get("AP_KEY"))
+
+        with open("job.json") as fd:
+            config = fd.read().strip()
+        lava_submit(config=config, lava_server=lava_server)
+
+    sys.exit()
+
+
+def main():
+    '''Script entry point: return some JSON based on calling args.
+    We should be called from Jenkins and expect the following to be defined:
+    $HWPACK_BUILD_NUMBER $HWPACK_JOB_NAME HWPACK_FILE_NAME $DEVICE_TYPE
+    or, alternatively, $TARGET_PRODUCT $JOB_NAME $BUILD_NUMBER $BUILD_URL
+    '''
+
+    # LAVA server URL
+    lava_server = os.environ.get('LAVA_SERVER',
+                                 'validation.linaro.org/RPC2/')
+
+    # CI user
+    ci_user = os.environ.get('CI_USER')
+    # CI pass
+    ci_pass = os.environ.get('CI_PASS')
+    if ci_user is not None and ci_pass is not None:
+        auth = auth_headers(ci_user, ci_pass)
+    else:
+        auth = None
+
+    if os.environ.get('TARGET_PRODUCT') is not None:
+        submit_job_from_url()
+
+    # Allow to override completely the generated json
+    # using file provided by the user
+    custom_url = os.environ.get('CUSTOM_JSON_URL')
+    if custom_url is None:
+        custom_url = os.environ.get('CUSTOM_YAML_URL')
+    if custom_url is not None:
+        request = urllib2.Request(custom_url)
+        if auth:
+            request.add_header('Authorization', auth)
+        try:
+            response = urllib2.urlopen(request)
+        except urllib2.URLError, e:
+            if hasattr(e, 'reason'):
+                print 'Failed to reach %s.' % custom_url
+                print 'Reason: ', e.reason
+            elif hasattr(e, 'code'):
+                print 'ci.linaro.org could not fulfill the request: %s' % \
+                      custom_url
+                print 'Error code: ', e.code
+            sys.exit('Failed to get last successful artifact.')
+
+        if os.environ.get('CUSTOM_JSON_URL') is not None:
+            config = json.dumps(json.load(
+                response, object_pairs_hook=collections.OrderedDict),
+                indent=2, separators=(',', ': '))
+        else:
+            config = response.read()
+
+        lava_submit(config, lava_server)
+
+    # Name of the hardware pack project
+    hwpack_job_name = os.environ.get('HWPACK_JOB_NAME')
+    # The hardware pack build number
+    hwpack_build_number = os.environ.get('HWPACK_BUILD_NUMBER')
+    # Hardware pack file name
+    hwpack_file_name = os.environ.get('HWPACK_FILE_NAME', 'Undefined')
+    if hwpack_file_name == 'Undefined':
+        sys.exit('Hardware pack is not defined.')
+
+    # Device type
+    device_type = os.environ.get('DEVICE_TYPE', 'Undefined')
+    if device_type == 'Undefined':
+        sys.exit('Device type is not defined.')
+
+    # Pre-built image URL
+    image_url = os.environ.get('IMAGE_URL', 'Undefined')
+
+    # Hardware pack URL
+    hwpack_url = os.environ.get('HWPACK_URL', 'Undefined')
+
+    # Test definitions repository
+    git_repo = os.environ.get('GIT_REPO',
+                              'git://git.linaro.org/qa/test-definitions.git')
+
+    # Distribution, architecture and hardware pack type
+    distribution = os.environ.get('DISTRIBUTION', 'ubuntu')
+    architecture = os.environ.get('ARCHITECTURE', 'armhf')
+    if hwpack_job_name.startswith('package-and-publish'):
+        ret_split = hwpack_job_name.split('-', 3)
+        hwpack_type = ret_split[3]
+    elif hwpack_job_name.startswith('linux'):
+        hwpack_type = get_hwpack_type(hwpack_job_name)
+    else:
+        ret_split = hwpack_job_name.split('-', 2)
+        (distribution, architecture, hwpack_type) = \
+            ret_split[0], ret_split[1], ret_split[2]
+        hwpack_type = get_hwpack_type(hwpack_job_name, hwpack_file_name)
+
+    # Rootfs type, default is nano-lava
+    rootfs_type = os.getenv('ROOTFS_TYPE', 'nano-lava')
+
+    # Bundle stream name
+    bundle_stream_name = os.environ.get(
+        'BUNDLE_STREAM_NAME',
+        '/private/team/linaro/developers-and-community-builds/')
+
+    lava_test_plan = os.environ.get('LAVA_TEST_PLAN')
+    if lava_test_plan is None:
+        # tests set specific to an image
+        tests = tests_nano
+    else:
+        lava_test_plan = lava_test_plan.strip("'")
+        tests = lava_test_plan.split()
+
+    # vexpress doesn't support PM, so disable pwrmgmt
+    if device_type in ['vexpress-a9']:
+        try:
+            tests.remove('pwrmgmt')
+        except ValueError:
+            pass
+
+    actions = [{'command': 'deploy_linaro_image'}]
+    deploy_image_parameters = {}
+    metadata = {}
+
+    if image_url == 'Undefined':
+        # Convert CI URLs to snapshots URLs
+        if hwpack_url == 'Undefined':
+            if hwpack_job_name.startswith('package-and-publish'):
+                hwpack_job_name_fixup = hwpack_job_name.replace('.', '_')
+                hwpack_url = '%s/%s/%s/%s/%s/%s' % \
+                             (snapshots_url,
+                              'kernel-hwpack',
+                              hwpack_job_name_fixup,
+                              hwpack_job_name,
+                              hwpack_build_number,
+                              hwpack_file_name)
+            elif hwpack_job_name.startswith('linux'):
+                hwpack_url = '%s/%s/%s-%s/%s/%s' % \
+                             (snapshots_url,
+                              'kernel-hwpack',
+                              hwpack_job_name.split('/')[0],
+                              hwpack_type,
+                              hwpack_build_number,
+                              hwpack_file_name)
+            else:
+                hwpack_url = '%s/%s/%s/%s/%s/%s' % \
+                             (snapshots_url,
+                              distribution,
+                              'hwpacks',
+                              hwpack_type,
+                              hwpack_build_number,
+                              hwpack_file_name)
+
+        (rootfs_url, rootfs_build_number) = get_rootfs_url(distribution,
+                                                           architecture,
+                                                           rootfs_type)
+
+        deploy_image_parameters['hwpack'] = hwpack_url
+        deploy_image_parameters['rootfs'] = rootfs_url
+        metadata['rootfs.type'] = rootfs_type
+        metadata['rootfs.build'] = rootfs_build_number
+    else:
+        deploy_image_parameters['image'] = image_url
+
+    metadata['hwpack.type'] = hwpack_type
+    metadata['hwpack.build'] = hwpack_build_number
+    metadata['distribution'] = distribution
+
+    deploy_image_parameters_url = os.environ.get('DEPLOY_IMAGE_PARAMETERS_URL')
+    if deploy_image_parameters_url is not None:
+        request = urllib2.Request(deploy_image_parameters_url)
+        if auth:
+            request.add_header('Authorization', auth)
+        try:
+            response = urllib2.urlopen(request)
+        except urllib2.URLError, e:
+            if hasattr(e, 'reason'):
+                print 'Failed to reach %s.' % deploy_image_parameters_url
+                print 'Reason: ', e.reason
+            elif hasattr(e, 'code'):
+                print 'ci.linaro.org could not fulfill the request: %s' % \
+                      deploy_image_parameters_url
+                print 'Error code: ', e.code
+            sys.exit('Failed to get last successful artifact.')
+
+        deploy_image_parameters.update(json.load(response, object_pairs_hook=collections.OrderedDict))
+
+    actions[0]['parameters'] = deploy_image_parameters
+
+    metadata_url = os.environ.get('METADATA_URL')
+    if metadata_url is not None:
+        request = urllib2.Request(metadata_url)
+        if auth:
+            request.add_header('Authorization', auth)
+        try:
+            response = urllib2.urlopen(request)
+        except urllib2.URLError, e:
+            if hasattr(e, 'reason'):
+                print 'Failed to reach %s.' % metadata_url
+                print 'Reason: ', e.reason
+            elif hasattr(e, 'code'):
+                print 'ci.linaro.org could not fulfill the request: %s' % \
+                      metadata_url
+                print 'Error code: ', e.code
+            sys.exit('Failed to get last successful artifact.')
+
+        metadata.update(json.load(response, object_pairs_hook=collections.OrderedDict))
+
+    actions[0]['metadata'] = metadata
+
+    if len(tests) == 0:
+        actions.append({
+            'command': 'boot_linaro_image'
+        })
+
+    boot_image_parameters_url = os.environ.get('BOOT_IMAGE_PARAMETERS_URL')
+    if boot_image_parameters_url is not None:
+        request = urllib2.Request(boot_image_parameters_url)
+        if auth:
+            request.add_header('Authorization', auth)
+        try:
+            response = urllib2.urlopen(request)
+        except urllib2.URLError, e:
+            if hasattr(e, 'reason'):
+                print 'Failed to reach %s.' % boot_image_parameters_url
+                print 'Reason: ', e.reason
+            elif hasattr(e, 'code'):
+                print 'ci.linaro.org could not fulfill the request: %s' % \
+                      boot_image_parameters_url
+                print 'Error code: ', e.code
+            sys.exit('Failed to get last successful artifact.')
+
+        boot_image_parameters = json.load(response, object_pairs_hook=collections.OrderedDict)
+        if {'command': 'boot_linaro_image'} not in actions:
+            actions.append({
+                'command': 'boot_linaro_image'
+            })
+        actions[1]['parameters'] = boot_image_parameters
+
+    if len(tests) > 0:
+        if distribution == 'quantal' or distribution == 'raring':
+            distribution = 'ubuntu'
+        for test in tests:
+            test_list = [({'git-repo': git_repo,
+                           'testdef': '{distribution:>s}/{test:>s}.yaml'.format(
+                               distribution=distribution, test=test)})]
+
+            actions.append({
+                'command': 'lava_test_shell',
+                'parameters': {
+                    'timeout': tests_timeout.get(test, 18000),
+                    'testdef_repos': test_list
+                }
+            })
+
+    actions.append({
+        'command': 'submit_results',
+        'parameters': {
+            'stream': bundle_stream_name,
+            'server': '%s%s' % ('https://', lava_server)
+        }
+    })
+
+    # XXX Global timeout in LAVA is hardcoded to 24h (24 * 60 60)
+    # https://bugs.launchpad.net/bugs/1226017
+    # Set to 172800s (48h) to workaround the limitation
+    # A sane default is 900s (15m)
+    config = json.dumps({'timeout': 172800,
+                         'actions': actions,
+                         'job_name': '%s%s/%s/' % (ci_base_url,
+                                                   hwpack_job_name,
+                                                   hwpack_build_number),
+                         'device_type': device_type,
+                         }, indent=2, separators=(',', ': '))
+
+    lava_submit(config, lava_server)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/post-build-lava/postbuild.groovy b/post-build-lava/postbuild.groovy
new file mode 100644
index 0000000000..0abfaa3e7c
--- /dev/null
+++ b/post-build-lava/postbuild.groovy
@@ -0,0 +1,61 @@
+import hudson.model.*
+
+// Add a LAVA job link to the description
+def matcher = manager.getLogMatcher(".*LAVA Job Id.*")
+if (matcher?.matches()) {
+    def lavaJobId = matcher.group(0).split(",")[0].substring(13)
+    if (!lavaJobId.isInteger()) {
+        lavaSubJobs = matcher.group(0).substring(14).split("]")[0].replaceAll("'", "").split(",")
+        lavaJobId = lavaSubJobs[0]
+    }
+    def lavaServer = matcher.group(0).tokenize("/")[1]
+    def lavaJobUrl = "https://${lavaServer}/scheduler/job/${lavaJobId}"
+    def lavaDescription = "&nbsp;LAVA Job Id: <a href='${lavaJobUrl}'>${lavaJobId}</a>"
+
+    def cause = manager.build.getAction(hudson.model.CauseAction.class).getCauses()
+    def upstreamBuild = cause[0].upstreamBuild
+    def upstreamProject = cause[0].upstreamProject
+    def jobName = upstreamProject
+    def jobConfiguration = upstreamProject
+    def jobUrl = manager.hudson.getRootUrl() + "job/${upstreamProject}/${upstreamBuild}"
+    def jobDescription = "<br>&nbsp;Build <a href='${jobUrl}'>${upstreamProject} #${upstreamBuild}</a>"
+
+    manager.build.setDescription(lavaDescription + jobDescription)
+
+    // Multi-configuration project
+    if (upstreamProject.contains("/")) {
+        jobName = upstreamProject.split("/")[0]
+        jobConfiguration = upstreamProject.split("/")[1]
+    }
+
+    def jobs = hudson.model.Hudson.instance.getItem(jobName).getAllJobs()
+
+    for (job in jobs) {
+        if (job.name == jobConfiguration) {
+            if (job.getLastBuild().getDescription() != null) {
+                lavaDescription += "<br>" + job.getLastBuild().getDescription()
+            }
+            job.getLastBuild().setDescription(lavaDescription)
+        }
+    }
+
+    // Add parameters
+    def action = manager.build.getAction(hudson.model.ParametersAction.class)
+    def parameters = [
+            new StringParameterValue("LAVA_SERVER", "${lavaServer}/RPC2/"),
+            new StringParameterValue("LAVA_JOB_ID", "${lavaJobId}"),
+            new StringParameterValue("BUILD_JOB", "${jobUrl}")
+    ]
+    updatedAction = action.createUpdated(parameters)
+    manager.build.replaceAction(updatedAction)
+
+    // Update the pool of jobs to monitor
+    job = hudson.model.Hudson.instance.getItem("check-lava-status")
+    property = job.getProperty(hudson.model.ParametersDefinitionProperty.class)
+    parameter = property.getParameterDefinition("LAVA_JOB_ID_POOL")
+    lavaJobIdPool = parameter.getDefaultValue()
+    lavaJobIdPool += " ${manager.build.number}"
+    parameter.setDefaultValue(lavaJobIdPool)
+    job.save()
+}
+
diff --git a/post-build-repo.yaml b/post-build-repo.yaml
deleted file mode 100644
index 6795b35e46..0000000000
--- a/post-build-repo.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-- job:
-    name: post-build-repo
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - file:
-            name: post_build_ppa_parameters
-            description: "where to find changes file"
-    disabled: true
-    node: master
-    display-name: 'Upload packages to repo.linaro.org'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-            echo "Build success: ${build_success}"
-            echo "Package job name: ${pkg_job_name}"
-            echo "Debsign key ID: ${key_id}"
-            echo "Package changes file: ${pkg_changes}"
-            echo "Host repo: ${host_ppa}"
-            [  "${build_success}" = "false" ] && exit 0
-
-            job_path=/var/lib/jenkins/jobs/${pkg_job_name}/workspace/
-            job_path_axis=$(echo ${job_path} | sed -e 's,/label=,/configurations/axis-label/,')
-            temp=$(echo ${pkg_job_name} | sed -e 's,/,/workspace/,' -e 's,=,/,')
-            job_path_matrix=/var/lib/jenkins/jobs/${temp}/
-
-            for path in ${job_path} ${job_path_axis} ${job_path_matrix}
-            do
-                if [ -r "${path}/${pkg_changes}" ]
-                then
-                    cd ${path}
-                    break
-                fi
-            done
-
-            if [ -n "${pkg_url}" ]; then
-                echo "Source URL: ${pkg_url}"
-                # workaround race where post-build-repo gets called too early
-                timeout=5
-                set +e
-                while [ true ]; do
-                    wget --no-check-certificate --progress=dot -e dotbytes=1M ${pkg_url}/${pkg_changes}
-                    [ -r "${pkg_changes}" ] && break
-                    sleep 60
-                    timeout=$((timeout - 1))
-                    [ $timeout -eq 0 ] && break
-                done
-                set -e
-
-                for file in $(dcmd ${pkg_changes})
-                do
-                    wget --no-check-certificate --progress=dot -e dotbytes=1M ${pkg_url}/${file}
-                done
-            fi
-            chmod 0700 ~/.ssh/
-            chmod 0600 ~/.ssh/*
-
-            ls -l .
-            if [ ! -r "${pkg_changes}" ]; then
-                echo "${pkg_changes} missing"
-                exit 1
-            fi
-            debsign -k${key_id} ${pkg_changes}
-            dput ${host_ppa} ${pkg_changes}
-            set +e
-            logname=${pkg_changes/changes/log}
-            ssh upload@repo.linaro.org curl -o /srv/repos/ubuntu/$host_ppa/incoming/$logname $pkg_build_url/consoleText
-            for file in $(dcmd ${pkg_changes})
-            do
-                 rm -f $file
-            done
-            rm -f ${pkg_changes} *.upload
-            find . -mtime +1 -exec rm -f {} \;
-    publishers:
-        - email:
-            recipients: 'packages@lists.linaro.org'
diff --git a/post-build-reports.yaml b/post-build-reports.yaml
deleted file mode 100644
index bd57762e15..0000000000
--- a/post-build-reports.yaml
+++ /dev/null
@@ -1,102 +0,0 @@
-- job:
-    name: post-build-reports
-    description: 'This project helps submit build and test results
-        to reporting tools. It requires the following variables to be set:
-        <ul>
-        <li>SOURCE_PROJECT_NAME - Jenkins project name
-        <li>SOURCE_BUILD_NUMBER - Jenkins build number
-        <li>LAVA_JOB_IDS - comma separated list of LAVA job IDs
-        <li>ART_URL - URL of the API endpoing of art-reports
-        </ul>
-        Optionally the following variables might be set:
-        <ul>
-        <li>SOURCE_BRANCH_NAME - branch name of the manifest (for AOSP builds)
-        <li>SOURCE_GERRIT_CHANGE_NUMBER
-        <li>SOURCE_GERRIT_PATCHSET_NUMBER
-        <li>SOURCE_GERRIT_CHANGE_URL
-        <li>GERRIT_CHANGE_ID
-        </ul>'
-    project-type: freestyle
-    # wait 5 minutes before starting the build. This allows for source build to complete
-    quiet-period: 300
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            milosz.wasilewski@linaro.org:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 90
-            num-to-keep: 500
-            artifact-num-to-keep: 1
-    disabled: false
-    node: master
-    display-name: 'Post build reports'
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - credentials-binding:
-            - text:
-                credential-id: ART_TOKEN_ART_REPORTS
-                variable: ART_TOKEN_ART_REPORTS
-        - credentials-binding:
-            - text:
-                credential-id: ART_TOKEN_ANDROID_REPORTS
-                variable: ART_TOKEN_ANDROID_REPORTS
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-            rm -f \
-              artifacts/pinned-manifest.xml \
-              artifacts/boot_oat_size* \
-              artifacts/avg_oat_size* \
-              artifacts/*.json
-        - copyartifact:
-            project: ${SOURCE_PROJECT_NAME}
-            filter: 'pinned-manifest.xml'
-            target: artifacts
-            optional: true
-            flatten: true
-            which-build: specific-build
-            build-number: ${SOURCE_BUILD_NUMBER}
-        - copyartifact:
-            project: ${SOURCE_PROJECT_NAME}
-            filter: 'boot_oat_size*'
-            target: artifacts
-            optional: true
-            flatten: true
-            which-build: specific-build
-            build-number: ${SOURCE_BUILD_NUMBER}
-        - copyartifact:
-            project: ${SOURCE_PROJECT_NAME}
-            filter: 'avg_oat_time*'
-            target: artifacts
-            optional: true
-            flatten: true
-            which-build: specific-build
-            build-number: ${SOURCE_BUILD_NUMBER}
-        - copyartifact:
-            project: ${SOURCE_PROJECT_NAME}
-            filter: '*.json'
-            target: artifacts
-            optional: true
-            flatten: true
-            which-build: specific-build
-            build-number: ${SOURCE_BUILD_NUMBER}
-        - shell: |
-            #!/bin/bash
-            # Send to art-reports
-            rm -rf pbr
-            git clone git://git.linaro.org/qa/post-build-report.git pbr
-            python pbr/post-build-report.py
-    publishers:
-        - email:
-            recipients: 'milosz.wasilewski@linaro.org'
diff --git a/post-build-rpm.yaml b/post-build-rpm.yaml
deleted file mode 100644
index 1b712e1cf3..0000000000
--- a/post-build-rpm.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- job:
-    name: post-build-rpm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - file:
-            name: repo_parameters
-            description: "where to find rpms to upload"
-    disabled: true
-    node: master
-    display-name: 'Upload RPMs to repo.linaro.org'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-            echo "Build success: ${build_success}"
-            echo "Job name: ${pkg_job_name}"
-            echo "Repo: ${repo}"
-            echo "Distribution: ${dist}"
-            [  "${build_success}" = "false" ] && exit 0
-            if [ -z "${repo}" ] || [ -z "${dist}" ]
-            then
-               echo "missing repo or dist"
-               exit 1
-            fi
-            job_path=/var/lib/jenkins/jobs/${pkg_job_name}/workspace/
-            job_path_axis=$(echo ${job_path} | sed -e 's,/label=,/configurations/axis-label/,')
-            temp=$(echo ${pkg_job_name} | sed -e 's,/,/workspace/,' -e 's,=,/,')
-            job_path_matrix=/var/lib/jenkins/jobs/${temp}/
-
-            for path in ${job_path} ${job_path_axis} ${job_path_matrix}
-            do
-                if [ "$(ls -A ${path}/*.rpm)" ]
-                then
-                    cd ${path}
-                    break
-                fi
-            done
-            pwd
-            ls -l .
-            scp *rpm upload@repo.linaro.org:/srv/repos/rpm/${repo}/$dist/incoming
-            rm -f *rpm
-    publishers:
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/qa-check-web-links.yaml b/qa-check-web-links.yaml
deleted file mode 100644
index c30a7caf74..0000000000
--- a/qa-check-web-links.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-- job:
-    name: qa-check-web-links
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-amd64
-    display-name: 'QA - Check web links'
-    scm:
-        - git:
-            url: https://git.linaro.org/qa/checklink.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/sh
-
-            set -e
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends linkchecker
-
-            URLs=$(cat page_checklist.txt | tr '\n' ' ')
-            echo "Checking ${URLs}"
-            python check-link.py -f linaro-release-page.cfg ${URLs}
-    publishers:
-        - archive:
-            artifacts: '*.txt'
-        - email-ext:
-            recipients: 'qa-team@linaro.org'
-            attachments: 'link_check_result.txt'
diff --git a/qa-kvm-image-ubuntu.yaml b/qa-kvm-image-ubuntu.yaml
deleted file mode 100644
index 41f7f4d6d5..0000000000
--- a/qa-kvm-image-ubuntu.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-- job:
-    name: qa-kvm-image-ubuntu
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: docker-xenial-amd64
-    display-name: 'QA KVM image Ubuntu (Xenial)'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell:
-            !include-raw: qa-kvm-image-ubuntu/builders.sh
diff --git a/qa-kvm-image-ubuntu/builders.sh b/qa-kvm-image-ubuntu/builders.sh
index adaad26f2d..f29ffdcf55 100644
--- a/qa-kvm-image-ubuntu/builders.sh
+++ b/qa-kvm-image-ubuntu/builders.sh
@@ -56,7 +56,7 @@ time pigz -9 out/${image_name}.img
 
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
+time python3 ${HOME}/bin/linaro-cp.py \
   --api_version 3 \
   --link-latest \
   out ubuntu/images/qa-kvm/${BUILD_NUMBER}
diff --git a/qa-manual-test-definitions-sanity-check.yaml b/qa-manual-test-definitions-sanity-check.yaml
deleted file mode 100644
index 8026bc36f7..0000000000
--- a/qa-manual-test-definitions-sanity-check.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: qa-manual-test-definitions-sanity-check
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    disabled: true
-    node: build
-    display-name: 'QA manual test definitions sanity check'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            readable-message: true
-            successful-message: 'Sanity check OK'
-            failure-message: '[OUTPUT]:'
-            failure-message-file: 'build-error.txt'
-            trigger-for-unreviewed-patches: true
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: 'qa/manual-test-definitions'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: 'master'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo ""
-            echo "########################################################################"
-            echo "    Gerrit Environment"
-            env |grep GERRIT
-            echo "########################################################################"
-
-            rm -rf ${WORKSPACE}/*
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-
-            git clone -b ${GERRIT_BRANCH} --depth 1 https://git.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
-
-            wget -q https://git.linaro.org/qa/test-definitions-ci.git/blob_plain/HEAD:/test-definitions-ci.py -O test-definitions-ci.py
-            python test-definitions-ci.py E501
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
diff --git a/qa-test-definitions-sanity-check.yaml b/qa-test-definitions-sanity-check.yaml
deleted file mode 100644
index e6af8353eb..0000000000
--- a/qa-test-definitions-sanity-check.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-- job:
-    name: qa-test-definitions-sanity-check
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    disabled: false
-    node: build
-    display-name: 'QA test definitions sanity check'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            override-votes: true
-            gerrit-build-successful-verified-value: 1
-            gerrit-build-failed-verified-value: -1
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            readable-message: true
-            successful-message: 'Sanity check OK'
-            failure-message: '[OUTPUT]:'
-            failure-message-file: 'build-error.txt'
-            trigger-for-unreviewed-patches: true
-            projects:
-                - project-compare-type: 'ANT'
-                  project-pattern: 'qa/test-definitions'
-                  branches:
-                    - branch-compare-type: 'ANT'
-                      branch-pattern: 'master'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            echo ""
-            echo "########################################################################"
-            echo "    Gerrit Environment"
-            env |grep GERRIT
-            echo "########################################################################"
-
-            rm -rf ${WORKSPACE}/*
-            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
-
-            git clone -b ${GERRIT_BRANCH} --depth 1 https://git.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
-
-            python3 validate.py -r ${WORKSPACE}/build-error.txt -g -s SC1091
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
diff --git a/qclt.yaml b/qclt.yaml
new file mode 100644
index 0000000000..052bfd4b3f
--- /dev/null
+++ b/qclt.yaml
@@ -0,0 +1,15 @@
+# Jenkins view for various QCLT CI jobs
+- view:
+    name: qclt
+    view-type: list
+    regex: '.*lt-qcom-.*'
+
+- view:
+    name: qclt-linux
+    view-type: list
+    regex: '.*lt-qcom-linux.*'
+
+- view:
+    name: qclt-oe
+    view-type: list
+    regex: '.*lt-qcom-(openembedded|yocto).*'
diff --git a/qemu-docker.yaml b/qemu-docker.yaml
deleted file mode 100644
index ea1d2c64c8..0000000000
--- a/qemu-docker.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-- job:
-    name: qemu-docker
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 7
-            num-to-keep: 7
-    disabled: false
-    node: docker-xenial
-    display-name: 'QEMU source package build'
-    scm:
-        - git:
-            url: git://git.qemu.org/qemu.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: qemu-linaro
-            skip-tag: true
-            clean: true
-            disable-submodules: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            rm -rf qemu-ci
-            git clone --depth 1 http://git.linaro.org/git/ci/qemu.git qemu-ci
-            bash -x qemu-ci/qemu-pkg.sh
-    publishers:
-        - archive:
-            artifacts: '*.changes, *.dsc, *.gz, *.bz2, *.xz'
-            latest-only: true
-# Disable LAVA job submissions temporarily
-# until the jobs have been updated from LAVA v1 to v2
-#       - trigger:
-#           project: 'qemu-lava-ltp-tests, qemu-lava-tcg-system'
-        - trigger-parameterized-builds:
-            - project: build-package-obs
-              property-file: qemu-params
-              condition: SUCCESS
-        - email:
-            recipients: 'riku.voipio@linaro.org'
diff --git a/qemu-lava-ltp-tests.yaml b/qemu-lava-ltp-tests.yaml
deleted file mode 100644
index 139336bc67..0000000000
--- a/qemu-lava-ltp-tests.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: qemu-lava-ltp-tests
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'QEMU - build and run LAVA based LTP tests'
-    axes:
-        - axis:
-            type: user-defined
-            name: TARGET
-            values:
-                - arm
-                - aarch64
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=kvm
-            CUSTOM_JSON_URL=https://git.linaro.org/people/alex.bennee/test-runners.git/blob_plain/HEAD:/qemu-master-${TARGET}-user-ltp.json
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/qemu-lava-risu.yaml b/qemu-lava-risu.yaml
deleted file mode 100644
index 21e3ef682d..0000000000
--- a/qemu-lava-risu.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: qemu-lava-risu
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'QEMU - run LAVA based RISU tests against OBS build'
-    axes:
-        - axis:
-            type: user-defined
-            name: TARGET
-            values:
-                - aarch64
-    execution-strategy:
-        sequential: true
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://obs.linaro.org/linaro-staging-stretch/Debian_9.0/Release'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=kvm
-            CUSTOM_YAML_URL=https://git.linaro.org/people/alex.bennee/test-runners.git/blob_plain/HEAD:/qemu-master-${TARGET}-user-risu.yaml
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/qemu-lava-tcg-system.yaml b/qemu-lava-tcg-system.yaml
deleted file mode 100644
index 813bf2c46b..0000000000
--- a/qemu-lava-tcg-system.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-- job:
-    name: qemu-lava-tcg-system
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'QEMU - build and run LAVA based TCG system tests'
-    axes:
-        - axis:
-            type: user-defined
-            name: TARGET
-            values:
-                - aarch64
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=kvm
-            CUSTOM_JSON_URL=https://git.linaro.org/people/alex.bennee/test-runners.git/blob_plain/HEAD:/qemu-master-${TARGET}-system-test.json
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
diff --git a/robher-aosp-gendev.yaml b/robher-aosp-gendev.yaml
deleted file mode 100644
index 005bfbf1b7..0000000000
--- a/robher-aosp-gendev.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: robher-aosp-gendev
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            vishal.bhoj@linaro.org:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-configure
-                - job-cancel
-            rob.herring@linaro.org:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-configure
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    disabled: false
-    display-name: 'AOSP Generic Device build by Rob Herring'
-    triggers:
-        - timed: 'H H * * *'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-aosp
-        - axis:
-            type: user-defined
-            name: LUNCH_TARGET
-            values:
-                - linaro_arm-userdebug
-                - linaro_arm64-userdebug
-                - linaro_x86_64-userdebug
-                - db410c-userdebug
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell:
-            !include-raw: android-lcr/common/builders.sh
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # Clean any artifacts related to previous build
-            rm -rf out/target/product/*/system/ out/target/product/*/data/ out/target/product/*/*.xml out/target/product/*/obj/kernel/
-            rm -rf out/target/product/*/*.zip out/target/product/*/*.img out/target/product/*/*.xz
-
-            # Runs as ubuntu
-            repo init -u https://android.googlesource.com/platform/manifest -b master
-            cd .repo
-            rm -rf local_manifests
-            git clone https://github.com/robherring/android_manifest -b master local_manifests
-            cd ..
-            repo sync -f --force-sync -j16
-
-            source build/envsetup.sh
-
-            if [ ${LUNCH_TARGET} == "db410c-userdebug" ]; then
-                BUILD_TARGET="systemimage userdataimage cacheimage ramdisk"
-            else
-                BUILD_TARGET="systemimage ramdisk"
-            fi
-
-            lunch ${LUNCH_TARGET}
-            make -k -j"$(nproc)" "${BUILD_TARGET}"
-
-            cp .repo/manifest.xml out/source-manifest.xml
-            repo manifest -r -o ${ANDROID_PRODUCT_OUT}/pinned-manifest.xml
-
-            # Un-sparse the image
-            mv ${ANDROID_PRODUCT_OUT}/system.img ${ANDROID_PRODUCT_OUT}/system.simg
-            simg2img ${ANDROID_PRODUCT_OUT}/system.simg ${ANDROID_PRODUCT_OUT}/system.img
-            rm ${ANDROID_PRODUCT_OUT}/system.simg
-
-            # Publish binaries
-            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/generic/build-info/public-template.txt -O ${ANDROID_PRODUCT_OUT}/BUILD-INFO.txt
-            # Delete sources after build to save space
-            rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_DEST=/android/robher-aosp-gendev/${BUILD_NUMBER}/${LUNCH_TARGET}
-            PUB_SRC=${ANDROID_PRODUCT_OUT}
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - email:
-            recipients: 'rob.herring@linaro.org'
-        - email-ext:
-            recipients: 'rob.herring@linaro.org'
-            content-type: text
-            subject: 'errors for mesa master Android build ${BUILD_NUMBER}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                ERRORS:
-                ${BUILD_LOG_REGEX, regex="^.*? error: .*?$", linesBefore=0, linesAfter=2, showTruncatedLines=false}
-            unstable: true
diff --git a/robher-aosp.yaml b/robher-aosp.yaml
deleted file mode 100644
index bb3e8efad6..0000000000
--- a/robher-aosp.yaml
+++ /dev/null
@@ -1,139 +0,0 @@
-- job:
-    name: robher-aosp
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            vishal.bhoj@linaro.org:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-configure
-                - job-cancel
-            rob.herring@linaro.org:
-                - job-build
-                - job-read
-                - job-extended-read
-                - job-configure
-                - job-cancel
-    scm:
-        - git:
-            url: git://anongit.freedesktop.org/mesa/mesa
-            branches:
-                - origin/master
-                - origin/android/*
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            basedir: /home/buildslave/srv/${JOB_NAME}/external/mesa3d
-    parameters:
-        - string:
-            name: MESA_GIT_TREE
-            default:
-        - string:
-            name: MESA_EMAIL_RECIPIENTS
-            default:
-    disabled: false
-    node: docker-xenial-aosp
-    display-name: 'AOSP build playground for Rob Herring'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - linaro-publish-token:
-            host: snapshots.linaro.org
-        - shell:
-            !include-raw: android-lcr/common/builders.sh
-        - shell: |
-            cd /home/buildslave/srv/${JOB_NAME}/external/mesa3d
-            echo "CI_MAIL_RECIPIENTS=$(git --no-pager log -1 --pretty='%cE,%aE')" > ${WORKSPACE}/env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            # Clean any artifacts related to previous build
-            rm -rf out/target/product/*/system/ out/target/product/*/data/ out/target/product/*/*.xml out/target/product/*/obj/kernel/
-            rm -rf out/target/product/*/*.zip out/target/product/*/*.img out/target/product/*/*.xz
-
-            # Runs as ubuntu
-            repo init -u https://android.googlesource.com/platform/manifest -b master
-            cd .repo
-            rm -rf local_manifests
-            git clone https://github.com/robherring/android_manifest -b mesa-master-test local_manifests
-            cd ..
-            repo sync -q -f --force-sync -j"$(nproc)"
-
-            mkdir -p out
-            cp .repo/manifest.xml out/source-manifest.xml
-            repo manifest -r -o out/pinned-manifest.xml
-
-            cd external/mesa3d
-
-            if [ -n "${MESA_GIT_TREE}" ]; then
-                git fetch ${MESA_GIT_TREE}
-                git checkout FETCH_HEAD
-            fi
-
-            # Enable gpu drivers
-            echo 'BOARD_GPU_DRIVERS := "i915 i965 i915g r300g r600g nouveau swrast vc4 virgl"' > Android.mk.new
-            cat Android.mk >> Android.mk.new
-            mv Android.mk.new Android.mk
-            # Commit it so repo will throw it away
-            git commit -m "Android: enable GPU drivers" -a -s
-
-            cd ../..
-
-            source build/envsetup.sh
-
-            lunch linaro_arm64-userdebug
-            make -k -j"$(nproc)" gallium_dri libGLES_mesa || { true; failed=1; }
-
-            lunch linaro_x86_64-userdebug
-            make -k -j"$(nproc)" gallium_dri i915_dri i965_dri libGLES_mesa || { true; failed=1; }
-
-            # Delete sources after build to save space
-            rm -rf art/ dalvik/ kernel/ bionic/ developers/ libcore/ sdk/ bootable/ development/ libnativehelper/ system/ build/ device/ test/ build-info/ docs/ packages/ toolchain/ .ccache/ external/ pdk/ tools/ compatibility/ frameworks/ platform_testing/ vendor/ cts/ hardware/ prebuilts/ linaro*
-
-            ###### Don't care about artifacts for now ######
-            echo "Build for mesa rev ${rev} finished - ret ${failed}"
-            exit ${failed}
-    publishers:
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - email:
-            recipients: 'rob.herring@linaro.org vishal.bhoj@linaro.org'
-        - email-ext:
-            recipients: 'rob.herring@linaro.org, ${CI_MAIL_RECIPIENTS}, ${MESA_EMAIL_RECIPIENTS}'
-            content-type: text
-            subject: 'errors for mesa master Android build ${BUILD_NUMBER}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                branch: ${GIT_BRANCH}
-                commit: ${GIT_COMMIT}
-
-                ERRORS:
-                ${BUILD_LOG_REGEX, regex="^.*? error: .*?$", linesBefore=0, linesAfter=2, showTruncatedLines=false}
-            first-failure: true
-            failure: false
diff --git a/rpb-aosp-db410c.yaml b/rpb-aosp-db410c.yaml
deleted file mode 100644
index c00d612226..0000000000
--- a/rpb-aosp-db410c.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-- job:
-    name: 96boards-reference-platform-aosp-db410c
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-utopic-aosp
-    display-name: 'Reference Platform - AOSP (DragonBoard 410c)'
-    concurrent: true
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            java -version
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools libfdt-dev python-mako gettext
-
-            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
-            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            chmod a+x ${HOME}/bin/*
-            export PATH=${HOME}/bin:${PATH}
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            # Clean any artifacts related to previous build
-            rm -rf vendor/db410c
-            rm -rf out/target/product/db410c/system/ out/target/product/db410c/data/ out/target/product/db410c/*.xml out/target/product/db410c/obj/kernel/
-            rm -rf out/target/product/db410c/*.zip out/target/product/db410c/*.img out/target/product/db410c/*.xz
-
-            # Runs as ubuntu
-            repo init -u https://android.googlesource.com/platform/manifest -b android-6.0.1_r16
-            cd .repo
-            rm -rf local_manifests
-            git clone https://github.com/96boards/android_manifest -b android-6.0-db410c local_manifests
-            cd ..
-            repo sync -f --force-sync -j16
-
-            # Extract the proprietary firmware
-            mkdir -p vendor/db410c
-            cd vendor/db410c
-            wget --progress=dot -e dotbytes=1M http://developer.qualcomm.com/download/db410c/firmware-410c-1.2.0.bin
-            yes | sh firmware-410c-1.2.0.bin > /dev/null
-            cd ../..
-
-            mkdir -p out
-            cp .repo/manifest.xml out/source-manifest.xml
-            repo manifest -r -o out/pinned-manifest.xml
-
-            source build/envsetup.sh
-            lunch db410c-userdebug
-            make droidcore -j8
-
-            cd out/target/product/db410c/
-            for image in "boot-db410c.img" "system.img" "userdata.img" "cache.img" "dt.img" "ramdisk.img"; do
-                echo "Compressing ${image}"
-                xz -z ${image}
-            done
-            cd -
-
-            cp -a /home/buildslave/srv/${JOB_NAME}/out/*.xml /home/buildslave/srv/${JOB_NAME}/out/target/product/db410c/
-            cp -a /home/buildslave/srv/${JOB_NAME}/out/*.xml ${WORKSPACE}/
-
-            # Create MD5SUM
-            cd out/target/product/db410c/
-            md5sum *.txt *.xz *.xml *.img > MD5SUMS.txt
-            cd -
-
-            # Build information
-            cat > out/target/product/db410c/HEADER.textile << EOF
-
-            h4. Reference Platform Build - AOSP (DragonBoard 410c)
-
-            Build description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-
-            Please also check "RPB-AOSP-DragonBoard410c-Build":https://github.com/96boards/documentation/wiki/RPB-AOSP-DragonBoard410c-Build for more information about this build.
-
-            Install (also check the bootloader "install guide":https://github.com/96boards/documentation/wiki/Dragonboard-410c-Installation-Guide-for-Linux-and-Android#install-android-release):
-
-            bc. wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/boot-db410c.img.xz
-            wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/cache.img.xz
-            wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/system.img.xz
-            wget https://snapshots.linaro.org/96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}/userdata.img.xz
-            for f in *.xz; do xz -d \$f; done
-            sudo fastboot flash boot boot-db410c.img
-            sudo fastboot flash system system.img
-            sudo fastboot flash userdata userdata.img
-            sudo fastboot flash cache cache.img
-
-            EOF
-
-            cat > out/target/product/db410c/BUILD-INFO.txt << EOF
-            Format-Version: 0.5
-
-            Files-Pattern: *
-            License-Type: open
-            EOF
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_SRC=${PWD}/out/target/product/db410c/
-            PUB_DEST=96boards/reference-platform/aosp/db410c/${BUILD_NUMBER}
-            PUB_EXTRA_INC=^(BUILD-INFO.txt|HEADER.textile)$
-            EOF
-
-            # Construct post-build-lava parameters
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=apq8016-sbc
-            TARGET_PRODUCT=${TARGET_PRODUCT}
-            MAKE_TARGETS=${MAKE_TARGETS}
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            IMAGE_EXTENSION=img.xz
-            FRONTEND_JOB_NAME=${JOB_NAME}
-            DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
-            CUSTOM_JSON_URL=https://git.linaro.org/ci/job/configs.git/blob_plain/refs/heads/master:/96boards-reference-platform-aosp/lava-job-definitions/apq8016-sbc/template-boot.json
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - archive:
-            artifacts: '*.xml'
-            latest-only: true
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'fathi.boudra@linaro.org vishal.bhoj@linaro.org'
diff --git a/rpb-aosp-hikey.yaml b/rpb-aosp-hikey.yaml
deleted file mode 100644
index 938758c7fc..0000000000
--- a/rpb-aosp-hikey.yaml
+++ /dev/null
@@ -1,363 +0,0 @@
-- job:
-    name: 96boards-reference-platform-aosp-hikey
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUILD_CONFIG_FILENAME
-            default: 'reference-platform-aosp-hikey'
-        - string:
-            name: ART_URL
-            default: https://android-qa-reports.linaro.org/api/
-    disabled: true
-    node: docker-utopic-aosp
-    display-name: 'Reference Platform - AOSP (HiKey)'
-    concurrent: true
-    triggers:
-        - timed : 'H H * * 6'
-        - gerrit:
-            server-name: __ANY__
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-patchsets'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'platform/manifest'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-marshmallow'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'device/linaro/common'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'linaro-marshmallow'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'android-build-configs'
-                  branches:
-                      - branch-compare-type: 'PLAIN'
-                        branch-pattern: 'master'
-                  file-paths:
-                      - compare-type: 'PLAIN'
-                        pattern: 'reference-platform-aosp-hikey'
-    wrappers:
-        - timestamps
-        - timeout:
-            timeout: 500
-    builders:
-        - shell: |
-            CI_MAIL_RECIPIENTS="${GERRIT_CHANGE_OWNER_EMAIL},${GERRIT_EVENT_ACCOUNT_EMAIL}"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},vishal.bhoj@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},fathi.boudra@linaro.org"
-            CI_MAIL_RECIPIENTS="${CI_MAIL_RECIPIENTS},daniel.diaz@linaro.org"
-            echo "CI_MAIL_RECIPIENTS=${CI_MAIL_RECIPIENTS}" > env_var_parameters
-        - inject:
-            properties-file: env_var_parameters
-        - shell: |
-            #!/bin/bash
-
-            java -version
-
-            sudo sed -i -e 's/archive.ubuntu.com\|security.ubuntu.com/old-releases.ubuntu.com/g' /etc/apt/sources.list
-            sudo apt-get update
-            sudo apt-get install -y gcc-4.9-multilib bison git gperf libxml2-utils python-mako zip time python-requests genisoimage patch mtools
-
-            mkdir -p ${HOME}/bin ${WORKSPACE}/build/out
-            curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
-            chmod a+x ${HOME}/bin/*
-            export PATH=${HOME}/bin:${PATH}
-
-            if [ ! -d "/home/buildslave/srv/${JOB_NAME}" ]; then
-              sudo mkdir -p /home/buildslave/srv/${JOB_NAME}
-              sudo chmod 777 /home/buildslave/srv/${JOB_NAME}
-            fi
-            cd /home/buildslave/srv/${JOB_NAME}
-
-            git config --global user.email "ci_notify@linaro.org"
-            git config --global user.name "Linaro CI"
-
-            # Runs as ubuntu
-            set -xe
-            rm -rf build-tools jenkins-tools build/out build/android-patchsets build-configs
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-android-build-tools.git build-tools
-            git clone --depth 1 https://git.linaro.org/infrastructure/linaro-jenkins-tools.git jenkins-tools
-            git clone --depth 1 http://android-git.linaro.org/git/android-build-configs.git build-configs
-
-            export BUILD_CONFIG_FILENAME=${BUILD_CONFIG_FILENAME:-${JOB_NAME#android-*}}
-
-            # Early test
-            if [ ! -f build-configs/${BUILD_CONFIG_FILENAME} ]; then
-              echo "No config file named ${BUILD_CONFIG_FILENAME} exists"
-              echo "in android-build-configs.git"
-              exit 1
-            fi
-
-            cat << EOF > config.txt
-            BUILD_CONFIG_REPO=http://android-git.linaro.org/git/android-build-configs.git
-            BUILD_CONFIG_BRANCH=master
-            EOF
-            echo config.txt
-            export CONFIG=`base64 -w 0 config.txt`
-
-            # Download vendor binaries for hikey.
-            mkdir -p build
-            cd build/
-            wget https://dl.google.com/dl/android/aosp/linaro-hikey-20160226-67c37b1a.tgz
-            tar -xvf linaro-hikey-20160226-67c37b1a.tgz
-            yes "I ACCEPT" | ./extract-linaro-hikey.sh
-            cd -
-
-            # Build Android
-            build-tools/node/build us-east-1.ec2-git-mirror.linaro.org "${CONFIG}"
-            cp -a /home/buildslave/srv/${JOB_NAME}/build/out/*.xml /home/buildslave/srv/${JOB_NAME}/build/out/*.json ${WORKSPACE}/
-
-            # Create smaller userdata partition for 4gb emmc
-            cd build/
-            out/host/linux-x86/bin/make_ext4fs -s -T -1 -S out/root/file_contexts -L data -l 1342177280 -a data out/userdata-4gb.img out/data
-            cd -
-
-            cd build/out
-            rm -f ramdisk.img
-            for image in "boot.img" "boot_fat.uefi.img" "system.img" "userdata.img" "userdata-4gb.img" "cache.img"; do
-              echo "Compressing ${image}"
-              tar -Jcf ${image}.tar.xz ${image}
-              rm -f ${image}
-            done
-            cd -
-
-            rm -rf build/out/BUILD-INFO.txt
-            wget https://git.linaro.org/ci/job/configs.git/blob_plain/HEAD:/android-lcr/hikey/build-info/r-lcr-template.txt -O build/out/BUILD-INFO.txt
-
-            # Publish parameters
-            cat << EOF > ${WORKSPACE}/publish_parameters
-            PUB_SRC=${PWD}/build/out
-            PUB_DEST=96boards/reference-platform/aosp/hikey/${BUILD_NUMBER}
-            EOF
-
-            # Construct post-build-lava parameters
-            source build-configs/${BUILD_CONFIG_FILENAME}
-            cat << EOF > ${WORKSPACE}/post_build_lava_parameters
-            DEVICE_TYPE=${LAVA_DEVICE_TYPE:-${TARGET_PRODUCT}}
-            TARGET_PRODUCT=${TARGET_PRODUCT}
-            MAKE_TARGETS=${MAKE_TARGETS}
-            JOB_NAME=${JOB_NAME}
-            BUILD_NUMBER=${BUILD_NUMBER}
-            BUILD_URL=${BUILD_URL}
-            LAVA_SERVER=validation.linaro.org/RPC2/
-            IMAGE_EXTENSION=img.tar.xz
-            FRONTEND_JOB_NAME=${JOB_NAME}
-            DOWNLOAD_URL=${PUBLISH_SERVER}/${PUB_DEST}
-            CUSTOM_JSON_URL=https://git.linaro.org/qa/test-plans.git/blob_plain/HEAD:/android/hikey/template-boot.json
-            SKIP_REPORT=false
-            EOF
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cts-focused1.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cts-focused2.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-antutu2.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-antutu3.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-antutu5.7.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-benchmarkpi.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cf-bench.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-gearses2eclair.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-geekbench3.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-javawhetstone.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-jbench.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-linpack.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-quadrantpro.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-scimark.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-sqlite.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-rl-sqlite.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-vellamo3.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-applications.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-caffeinemark.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-antutu6.0.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            if [ -n "$GERRIT_PROJECT" ]; then
-                echo "SKIP_LAVA=1" >> ${WORKSPACE}/post_build_lava_parameters
-            fi
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cts-part1.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cts-part2.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cts-opengl.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-cts-media.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-andebenchpro2015.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-glbenchmark-2.5.1.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-        - shell: |
-            sed -i "s/CUSTOM_JSON_URL=.*/CUSTOM_JSON_URL=https:\/\/git.linaro.org\/qa\/test-plans.git\/blob_plain\/HEAD:\/android\/hikey\/template-weekly.json/g" ${WORKSPACE}/post_build_lava_parameters
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email-ext:
-            recipients: '${CI_MAIL_RECIPIENTS}'
-            content-type: text
-            body: |
-                Build Triggered by: ${GERRIT_CHANGE_SUBJECT}: ${GERRIT_CHANGE_URL}
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex=".*ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-        - archive:
-            artifacts: '*.xml,*.json'
-            latest-only: true
-        - logparser:
-            parse-rules: '/var/lib/jenkins/userContent/android.parse'
-            unstable-on-warning: false
-            fail-on-error: false
-        - fingerprint:
-            files: 'build/fingerprints/*'
-        - email:
-            recipients: 'vishal.bhoj@linaro.org fathi.boudra@linaro.org'
diff --git a/rpb-centos-installer-staging.yaml b/rpb-centos-installer-staging.yaml
deleted file mode 100644
index cd1c99a14d..0000000000
--- a/rpb-centos-installer-staging.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: 96boards-reference-centos-installer-staging
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'Reference Platform - CentOS Installer (staging)'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # Make sure the base image is updated to 7.3.1611
-            sudo sed -i 's/\$releasever/7.3.1611/g' /etc/yum.repos.d/CentOS-Base.repo
-
-            sudo yum update -y
-            sudo yum install -y cpio lorax python-requests wget xz
-
-            # Call lorax to create the netinstall image
-            sudo rm -rf netinstall
-            sudo lorax '--product=CentOS Linux' --version=7 --release=7.3.1611 \
-              --source=http://mirror.centos.org/altarch/7/os/aarch64/ \
-              --source=http://repo.linaro.org/rpm/linaro-overlay/centos-7/repo/ \
-              --source=http://repo.linaro.org/rpm/linaro-staging/centos-7/repo/ \
-              --source=http://obs.linaro.org/ERP-RPM:/17.08:/staging/ERP-17.08/ \
-              --isfinal --nomacboot --noupgrade --buildarch=aarch64 '--volid=CentOS 7 aarch64' netinstall/
-
-            # Modify initrd to include a default kickstart (that includes the external repository)
-            cd netinstall/images/pxeboot/
-            sudo mkdir initrd; cd initrd
-            sudo sh -c 'xzcat ../initrd.img | cpio -d -i -m'
-            cat > /tmp/ks.cfg << EOF
-            repo --name="linaro-overlay" --baseurl=http://repo.linaro.org/rpm/linaro-overlay/centos-7/repo/
-            repo --name="linaro-staging" --baseurl=http://repo.linaro.org/rpm/linaro-staging/centos-7/repo/
-            repo --name="ERP-RPM:17.08:staging" --baseurl=http://obs.linaro.org/ERP-RPM:/17.08:/staging/ERP-17.08/
-            EOF
-            sudo cp /tmp/ks.cfg ks.cfg
-            sudo sh -c 'find . | cpio -o -H newc | xz --check=crc32 --lzma2=dict=512KiB > ../initrd.img'
-            cd ..; sudo rm -rf initrd
-            cd ../../..
-
-            # Final preparation for publishing
-            mkdir out
-            cp -rf lorax.log netinstall/.discinfo netinstall/.treeinfo netinstall/EFI netinstall/images netinstall/LiveOS out/
-
-            # Create MD5SUMS file
-            (cd out && find -type f -exec md5sum {} \; | sed "s/  \.\//  /g" > MD5SUMS.txt)
-
-            # Build information
-            KERNEL_VERSION=`cat out/images/pxeboot/vmlinuz | gzip -d - | grep -a "Linux version"`
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - CentOS Installer (staging)
-
-            CentOS Installer (7) produced with the Reference Platform Kernel package.
-
-            Check "https://github.com/Linaro/documentation/blob/master/Reference-Platform/EECommon/Install-CentOS-7.md":https://github.com/Linaro/documentation/blob/master/Reference-Platform/EECommon/Install-CentOS-7.md for the install instructions.
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Kernel: $KERNEL_VERSION
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/centos-installer-staging/${BUILD_NUMBER}/
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-centos-installer.yaml b/rpb-centos-installer.yaml
deleted file mode 100644
index 49c724e2a4..0000000000
--- a/rpb-centos-installer.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
-- job:
-    name: 96boards-reference-centos-installer
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-centos7-aarch64
-    display-name: 'Reference Platform - CentOS Installer'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            # Make sure the base image is updated to 7.3.1611
-            sudo sed -i 's/\$releasever/7.3.1611/g' /etc/yum.repos.d/CentOS-Base.repo
-
-            sudo yum update -y
-            sudo yum install -y cpio lorax python-requests wget xz
-
-            # Call lorax to create the netinstall image
-            sudo rm -rf netinstall
-            sudo lorax '--product=CentOS Linux' --version=7 --release=7.3.1611 \
-              --source=http://mirror.centos.org/altarch/7/os/aarch64/ \
-              --source=http://repo.linaro.org/rpm/linaro-overlay/centos-7/repo/ \
-              --isfinal --nomacboot --noupgrade --buildarch=aarch64 '--volid=CentOS 7 aarch64' netinstall/
-
-            # Modify initrd to include a default kickstart (that includes the external repository)
-            cd netinstall/images/pxeboot/
-            sudo mkdir initrd; cd initrd
-            sudo sh -c 'xzcat ../initrd.img | cpio -d -i -m'
-            cat > /tmp/ks.cfg << EOF
-            repo --name="linaro-overlay" --baseurl=http://repo.linaro.org/rpm/linaro-overlay/centos-7/repo/
-            EOF
-            sudo cp /tmp/ks.cfg ks.cfg
-            sudo sh -c 'find . | cpio -o -H newc | xz --check=crc32 --lzma2=dict=512KiB > ../initrd.img'
-            cd ..; sudo rm -rf initrd
-            cd ../../..
-
-            # Final preparation for publishing
-            mkdir out
-            cp -rf lorax.log netinstall/.discinfo netinstall/.treeinfo netinstall/EFI netinstall/images netinstall/LiveOS out/
-
-            # Create MD5SUMS file
-            (cd out && find -type f -exec md5sum {} \; | sed "s/  \.\//  /g" > MD5SUMS.txt)
-
-            # Build information
-            KERNEL_VERSION=`cat out/images/pxeboot/vmlinuz | gzip -d - | grep -a "Linux version"`
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - CentOS Installer
-
-            CentOS Installer (7) produced with the Reference Platform Kernel package.
-
-            Check "https://platforms.linaro.org/documentation/Reference-Platform/Platforms/Enterprise/Documentation/Installation/Centos/README.md":https://platforms.linaro.org/documentation/Reference-Platform/Platforms/Enterprise/Documentation/Installation/Centos/README.md for the install instructions.
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Kernel: $KERNEL_VERSION
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/centos-installer/${BUILD_NUMBER}/
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-debian-installer-staging.yaml b/rpb-debian-installer-staging.yaml
deleted file mode 100644
index 2f401d9b79..0000000000
--- a/rpb-debian-installer-staging.yaml
+++ /dev/null
@@ -1,95 +0,0 @@
-- job:
-    name: 96boards-reference-debian-installer-staging
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: PUB_DEST
-            default: '96boards/reference-platform/components/debian-installer-staging/${BUILD_NUMBER}'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Reference Platform - Debian Installer (staging)'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-            set -ex
-            cat <<EOF >local.list
-            deb http://obs.linaro.org/ERP:/17.12/Debian_9/ ./
-            deb http://obs.linaro.org/ERP:/staging/Debian_9/ ./
-            EOF
-
-            cat <<EOF > sources.list.udeb
-            deb [trusted=yes] http://obs.linaro.org/ERP:/17.12/Debian_9/debian-installer ./
-            deb [trusted=yes] http://obs.linaro.org/ERP:/staging/Debian_9/debian-installer ./
-            deb http://deb.debian.org/debian stretch main/debian-installer
-            deb http://deb.debian.org/debian stretch-backports main/debian-installer
-            EOF
-
-            cat <<EOF > localudebs
-            linaro-erp-staging-udeb
-            linaro-erp-udeb
-            EOF
-
-            wget -q https://git.linaro.org/ci/job/configs.git/plain/rpb-debian-installer/staging/default-preseed.cfg -O default-preseed
-        - shell:
-            !include-raw: rpb-debian-installer/builders.sh
-        - shell: |
-            #!/bin/bash
-            # Build information
-            KERNEL_VERSION=`grep -a "Linux version" out/debian-installer/arm64/linux`
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - Debian Installer (staging)
-
-            Debian Installer (Stretch) produced with the Reference Platform Kernel package.
-
-            Check "https://github.com/Linaro/documentation/blob/master/Reference-Platform/EECommon/Install-Debian-Stretch.md":https://github.com/Linaro/documentation/blob/master/Reference-Platform/EECommon/Install-Debian-Stretch.md for the install instructions.
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Debian Installer version: $DEB_INSTALLER_VERSION
-            * Kernel: $KERNEL_VERSION
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out ${PUB_DEST}
-        - trigger-builds:
-            - project: erp-test-automation
-              predefined-parameters: |
-                  HOSTS=cb-g0
-                  BUILD_ENV=staging
-                  BUILD_NUM=${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
-        - email-ext:
-            recipients: 'qa-team@linaro.org'
-            always: true
diff --git a/rpb-debian-installer.yaml b/rpb-debian-installer.yaml
deleted file mode 100644
index 6906ded5e3..0000000000
--- a/rpb-debian-installer.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-- job:
-    name: 96boards-reference-debian-installer
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: PUB_DEST
-            default: '96boards/reference-platform/components/debian-installer/${BUILD_NUMBER}'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Reference Platform - Debian Installer'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-            set -e
-            cat <<EOF >local.list
-            deb http://obs.linaro.org/ERP:/17.12/Debian_9/ ./
-            EOF
-
-            cat <<EOF > sources.list.udeb
-            deb [trusted=yes] http://obs.linaro.org/ERP:/17.12/Debian_9/debian-installer ./
-            deb http://deb.debian.org/debian stretch main/debian-installer
-            deb http://deb.debian.org/debian stretch-backports main/debian-installer
-            EOF
-
-            cat <<EOF > localudebs
-            linaro-erp-udeb
-            EOF
-
-            wget -q https://git.linaro.org/ci/job/configs.git/plain/rpb-debian-installer/stable/default-preseed.cfg -O default-preseed
-        - shell:
-            !include-raw: rpb-debian-installer/builders.sh
-        - shell: |
-            #!/bin/bash
-            set -e
-            # Build information
-            KERNEL_VERSION=`grep -a "Linux version" out/debian-installer/arm64/linux`
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - Debian Installer
-
-            Debian Installer (Stretch) produced with the Reference Platform Kernel package.
-
-            Check "https://platforms.linaro.org/documentation/Reference-Platform/Platforms/Enterprise/Documentation/Installation/Debian/README.md":https://platforms.linaro.org/documentation/Reference-Platform/Platforms/Enterprise/Documentation/Installation/Debian/README.md for the install instructions.
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Debian Installer version: $DEB_INSTALLER_VERSION
-            * Kernel: $KERNEL_VERSION
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out ${PUB_DEST}
-        - trigger-builds:
-            - project: erp-test-automation
-              predefined-parameters: |
-                  HOSTS=cb-g0
-                  BUILD_ENV=stable
-                  BUILD_NUM=${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - lt-qcom-debian-images/postbuild.groovy
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
-        - email-ext:
-            recipients: 'qa-team@linaro.org'
-            always: true
diff --git a/rpb-debian-installer/builders.sh b/rpb-debian-installer/builders.sh
deleted file mode 100755
index 6c4d768322..0000000000
--- a/rpb-debian-installer/builders.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-set -ex
-
-sudo cp local.list /etc/apt/sources.list.d/
-cat > linaro.pref <<EOF
-Package: *
-Pin: release n=stretch-backports
-Pin-Priority: 500
-EOF
-sudo cp linaro.pref /etc/apt/preferences.d/
-
-sudo apt-get update -q
-
-# Find kernel abi
-KERNEL_ABI=`apt-cache show linux-image-reference-arm64 | grep -m 1 Depends | sed -e "s/.*linux-image-//g" -e "s/-arm64//g"`
-
-# Build the installer
-DEB_INSTALLER_VERSION="20170615+deb9u2"
-dget https://deb.debian.org/debian/pool/main/d/debian-installer/debian-installer_${DEB_INSTALLER_VERSION}.dsc
-cd debian-installer-*
-sudo apt-get build-dep -q --no-install-recommends -y .
-## https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=810654, so lava can use grub to load grub.cfg from the local disk
-sed -i 's/fshelp|//g' build/util/grub-cpmodules
-
-# Config changes
-cd build
-cp ../../sources.list.udeb .
-sed -i "s/LINUX_KERNEL_ABI.*/LINUX_KERNEL_ABI = $KERNEL_ABI/g" config/common
-sed -i "s/PRESEED.*/PRESEED = default-preseed/g" config/common
-sed -i "s/USE_UDEBS_FROM.*/USE_UDEBS_FROM = stretch/g" config/common
-
-# Local pkg-list (to include all udebs)
-cat <<EOF > pkg-lists/local
-ext4-modules-\${kernel:Version}
-fat-modules-\${kernel:Version}
-btrfs-modules-\${kernel:Version}
-md-modules-\${kernel:Version}
-efi-modules-\${kernel:Version}
-scsi-modules-\${kernel:Version}
-jfs-modules-\${kernel:Version}
-xfs-modules-\${kernel:Version}
-ata-modules-\${kernel:Version}
-sata-modules-\${kernel:Version}
-usb-storage-modules-\${kernel:Version}
-EOF
-cat ../../localudebs >> pkg-lists/local
-cp ../../default-preseed .
-
-fakeroot make build_netboot
-cd ../..
-
-cp debian-installer-*/build/dest/netboot/mini.iso .
-cp debian-installer-*/build/dest/netboot/netboot.tar.gz .
-
-# Final preparation for publishing
-mkdir out
-cp -a debian-installer-*/build/default-preseed out/default-preseed.cfg
-cp -a mini.iso netboot.tar.gz out/
-cd out; tar -zxvf netboot.tar.gz; cd ..
-
-# Create MD5SUMS file
-(cd out && find -type f -exec md5sum {} \; | sed "s/  \.\//  /g" > MD5SUMS.txt)
-
diff --git a/rpb-debian-installer/stable/default-preseed.cfg b/rpb-debian-installer/stable/default-preseed.cfg
deleted file mode 100644
index 1e9ee89894..0000000000
--- a/rpb-debian-installer/stable/default-preseed.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Continue install on "no kernel modules were found for this kernel"
-d-i anna/no_kernel_modules boolean true
-
-# Continue install on "no installable kernels found"
-d-i base-installer/kernel/skip-install boolean true
-d-i base-installer/kernel/no-kernels-found boolean true
-
-# Adding security, updates by default
-d-i apt-setup/services-select multiselect security, updates
-
-d-i pkgsel/upgrade select full-upgrade
diff --git a/rpb-debian-installer/staging/default-preseed.cfg b/rpb-debian-installer/staging/default-preseed.cfg
deleted file mode 100644
index 1e9ee89894..0000000000
--- a/rpb-debian-installer/staging/default-preseed.cfg
+++ /dev/null
@@ -1,11 +0,0 @@
-# Continue install on "no kernel modules were found for this kernel"
-d-i anna/no_kernel_modules boolean true
-
-# Continue install on "no installable kernels found"
-d-i base-installer/kernel/skip-install boolean true
-d-i base-installer/kernel/no-kernels-found boolean true
-
-# Adding security, updates by default
-d-i apt-setup/services-select multiselect security, updates
-
-d-i pkgsel/upgrade select full-upgrade
diff --git a/rpb-debian-iot.yaml b/rpb-debian-iot.yaml
deleted file mode 100644
index 4888e1248b..0000000000
--- a/rpb-debian-iot.yaml
+++ /dev/null
@@ -1,241 +0,0 @@
-- job:
-    name: rpb-debian-iot
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-configure
-                - job-cancel
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Reference Platform - Debian - IoT'
-    axes:
-        - axis:
-            type: user-defined
-            name: BOARD
-            values:
-                - hikey
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-rp
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'BOARD=="hikey"'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv ${BOARD}-debian-*.img || true
-              rm -rf configs iot-gateway-files out
-            }
-
-            # Builder setup
-            sudo apt-get update
-            sudo apt-get install -y android-tools-fsutils grub-common kpartx libfdt-dev mtools python-requests dosfstools cpio
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Create the hardware pack
-            cp -a configs/rpb-debian-iot/hwpacks/linaro-${BOARD} .
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug linaro-${BOARD} ${VERSION}
-
-            # Get rootfs
-            export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/stretch-arm64-rootfs/label=docker-jessie-arm64,rootfs=developer/lastSuccessfulBuild/buildNumber`
-            export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/stretch-arm64-rootfs/label=docker-jessie-arm64,rootfs=developer/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-            export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/stretch/developer-arm64/${ROOTFS_BUILD_NUMBER}/linaro-stretch-developer-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-            wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-            ROOTFS_BUILD_TAR=linaro-stretch-developer-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz
-
-            # Create pre-built image(s)
-            linaro-media-create --dev fastmodel --output-directory ${WORKSPACE} \
-              --image-file ${BOARD}-debian-stretch-iot-sdcard-${VERSION}.img --image-size 2500M \
-              --binary ${ROOTFS_BUILD_TAR} --hwpack hwpack_linaro-${BOARD}_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-            # Create eMMC rootfs image(s)
-            mkdir boot rootfs
-            for device in $(sudo kpartx -avs ${BOARD}-debian-stretch-iot-sdcard-${VERSION}.img | cut -d' ' -f3); do
-              partition=$(echo ${device} | cut -d'p' -f3)
-              [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-              [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-            done
-
-            # Add default config file templates
-            git clone --depth 1 https://github.com/linaro-technologies/iot-gateway-files.git
-            cd iot-gateway-files; IOT_GATEWAY_FILES_GIT_VERSION=`git log --format="%H" -1`; cd ..
-            sudo cp -av iot-gateway-files/etc-sysctrl.d-gateway.conf rootfs/etc/sysctl.d/gateway.conf
-            sudo cp -av iot-gateway-files/etc-network-interface.d-bt0 rootfs/etc/network/interfaces.d/bt0
-            sudo cp -av iot-gateway-files/etc-NetworkManager-conf.d-nm-bt0.conf rootfs/etc/NetworkManager/conf.d/nm-bt0.conf
-            sudo cp -av iot-gateway-files/etc-udev-rules.d-99-bluetooth-6lowpan.rules rootfs/etc/udev/rules.d/99-bluetooth-6lowpan.rules
-            sudo cp -av iot-gateway-files/etc-tinyproxy.conf rootfs/etc/tinyproxy/tinyproxy.conf
-            sudo cp -av iot-gateway-files/bluetooth_6lowpand.conf rootfs/etc/bluetooth/bluetooth_6lowpand.conf
-            ## Custom init scripts
-            sudo cp -av iot-gateway-files/bluetooth_6lowpand.sh rootfs/usr/bin/bluetooth_6lowpand
-            sudo cp -av iot-gateway-files/etc-systemd-system-bluetooth_6lowpand.service rootfs/etc/systemd/system/bluetooth_6lowpand.service
-            ## Mosquitto
-            sudo cp -av iot-gateway-files/etc-mosquitto-template.conf rootfs/etc/mosquitto/template.conf
-            sudo cp -av iot-gateway-files/mosquitto-conf.sh rootfs/usr/bin/mosquitto-conf
-
-            ## Disable interfaces during boot so it can ignore bt0
-            sudo sed -i 's/#CONFIGURE_INTERFACES=yes/CONFIGURE_INTERFACES=no/g' rootfs/etc/default/networking
-
-            KERNEL_VERSION=`basename rootfs/boot/vmlinuz-* | sed -e "s,^[^0-9]*-,,g"`
-
-            # Make sure fsck.ext4 is available as part of the initrd
-            ## update-initrd fsck script only adds fsck.ext4 if the interface is available during runtime
-            mkdir -p initrd; cd initrd;
-            sudo sh -c 'cat ../rootfs/boot/initrd.img | gunzip | cpio -i'
-            sudo cp ../rootfs/sbin/fsck.ext4 ../rootfs/sbin/e2fsck sbin/
-            sudo cp ../rootfs/lib/aarch64-linux-gnu/libext2fs.so.2 lib/aarch64-linux-gnu/
-            sudo cp ../rootfs/lib/aarch64-linux-gnu/libcom_err.so.2 lib/aarch64-linux-gnu/
-            sudo cp ../rootfs/lib/aarch64-linux-gnu/libe2p.so.2 lib/aarch64-linux-gnu/
-            sudo sh -c 'find . | cpio -o -H newc | gzip > ../rootfs/boot/initrd.img'
-            cd ..; sudo rm -rf initrd
-            sha1sum rootfs/boot/initrd.img | sudo tee rootfs/var/lib/initramfs-tools/${KERNEL_VERSION}
-
-            mkdir -p out/${BOARD}
-
-            # Build information
-            cat > out/${BOARD}/HEADER.textile << EOF
-
-            h4. Reference Platform Build - Debian - IoT
-
-            Build description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Developer Rootfs: "http://snapshots.linaro.org/debian/images/stretch/developer-arm64/$ROOTFS_BUILD_NUMBER":http://snapshots.linaro.org/debian/images/stretch/developer-arm64/$ROOTFS_BUILD_NUMBER
-            * Kernel: "linux-image-$KERNEL_VERSION":http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/l/linux/
-            * IoT Gateway Files: "$IOT_GATEWAY_FILES_GIT_VERSION":https://github.com/linaro-technologies/iot-gateway-files/tree/$IOT_GATEWAY_FILES_GIT_VERSION
-            EOF
-
-            # Create boot image
-            if [ "${BOARD}" == "hikey" ]; then
-                FASTBOOT_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-reference-uefi/MX_PLATFORM=hikey,MX_TYPE=RELEASE,label=docker-jessie-rp/lastStableBuild/buildNumber`
-                FASTBOOT_EFI_URL="http://snapshots.linaro.org/96boards/reference-platform/components/uefi/${FASTBOOT_EFI_BUILD_NUMBER}/release/hikey/AndroidFastbootApp.efi"
-                wget --progress=dot ${FASTBOOT_EFI_URL} -O fastboot.efi
-                GRUB_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-reference-grub-efi-arm64/lastStableBuild/buildNumber`
-                GRUB_EFI_URL="https://snapshots.linaro.org/96boards/reference-platform/components/grub/${GRUB_EFI_BUILD_NUMBER}/grubaa64.efi"
-                GRUB_SD_EFI_URL="https://snapshots.linaro.org/96boards/reference-platform/components/grub/${GRUB_EFI_BUILD_NUMBER}/grubaa64-sd.efi"
-                wget --progress=dot ${GRUB_EFI_URL} -O grubaa64.efi
-                wget --progress=dot ${GRUB_SD_EFI_URL} -O grubaa64-sd.efi
-
-                /sbin/mkfs.fat -F32 -n "boot" -C out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img 65536
-                mmd -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img EFI
-                mmd -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img EFI/BOOT
-                mcopy -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img fastboot.efi ::EFI/BOOT/fastboot.efi
-                mcopy -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img grubaa64.efi ::EFI/BOOT/grubaa64.efi
-                chmod 644 out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img
-
-                # Replicate boot image into the original img file
-                sudo rm -rf boot/*
-                sudo mkdir -p boot/EFI/BOOT
-                sudo cp fastboot.efi boot/EFI/BOOT/
-                # Boot partition for SD needs a different grub (default root search)
-                sudo cp grubaa64-sd.efi boot/EFI/BOOT/grubaa64.efi
-                sudo cp grubaa64-sd.efi boot/EFI/BOOT/BOOTAA64.EFI
-
-                # Compress boot partition image
-                gzip -9 out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img
-
-                cat >> out/${BOARD}/HEADER.textile << EOF
-            * Grub UEFI: "http://snapshots.linaro.org/96boards/reference-platform/components/grub/$GRUB_EFI_BUILD_NUMBER":http://snapshots.linaro.org/96boards/reference-platform/components/grub/$GRUB_EFI_BUILD_NUMBER
-            * ARM TF / EDK2 UEFI: "http://snapshots.linaro.org/96boards/reference-platform/components/uefi/$FASTBOOT_EFI_BUILD_NUMBER/release/hikey":http://snapshots.linaro.org/96boards/reference-platform/components/uefi/$FASTBOOT_EFI_BUILD_NUMBER/release/hikey
-            EOF
-                # Grub config to be set as part of the rootfs
-                ## FIXME: Make this generic
-                sudo mkdir rootfs/boot/grub/fonts
-                sudo cp rootfs/usr/share/grub/unicode.pf2 rootfs/boot/grub/fonts
-                sudo grub-editenv rootfs/boot/grubenv create
-                sed -e "s/KERNEL_VERSION/$KERNEL_VERSION/" configs/96boards-reference-platform-debian/grub/grub-hikey.cfg.in > grub.cfg
-                sed -e "s/root=(hd0,gpt9)/root=(hd1,msdos2)/g" -e "s/mmcblk0p9/mmcblk1p2/g" grub.cfg > grub-sd.cfg
-                sudo cp configs/96boards-reference-platform-debian/grub/grub-fastboot.cfg rootfs/boot/grub/custom.cfg
-                sudo cp -a rootfs/usr/lib/grub/arm64-efi rootfs/boot/grub
-                sudo cp hi6220-hikey.dtb rootfs/boot/hi6220-hikey.dtb-${KERNEL_VERSION}
-                sudo ln -s hi6220-hikey.dtb-${KERNEL_VERSION} rootfs/boot/hi6220-hikey.dtb
-                echo "KERNEL_DEVICETREE=hi6220-hikey" | sudo tee rootfs/etc/default/kernel
-                sudo sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT.*/GRUB_CMDLINE_LINUX_DEFAULT="efi=noruntime rw quiet"/g' rootfs/etc/default/grub
-
-                # Since it uses uefi, create the boot efi fstab entry
-                sudo mkdir rootfs/boot/efi
-                cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/boot   /boot/efi vfat defaults          0 0
-            EOF
-
-                # Bluetooth init script
-                sudo cp -av iot-gateway-files/usr-bin-btsetup-hikey.sh rootfs/usr/bin/btsetup-hikey.sh
-                sudo cp -av iot-gateway-files/etc-systemd-system-btsetup-hikey.service rootfs/etc/systemd/system/btsetup-hikey.service
-            fi
-
-            # Create the ext4fs (fastboot compatible)
-            sudo mkfs.ext4 -L rootfs ${BOARD}-rootfs-debian-stretch-iot-${VERSION}.emmc.img.raw 2500M
-            mkdir rootfs_ext4
-            sudo mount -o loop ${BOARD}-rootfs-debian-stretch-iot-${VERSION}.emmc.img.raw rootfs_ext4
-            sudo cp -a rootfs/* rootfs_ext4
-            ## Make grub specific to the image type (e.g. emmc, sd)
-            if [ -f grub.cfg ]; then
-                sudo cp grub.cfg rootfs_ext4/boot/grub
-                sudo cp grub-sd.cfg rootfs/boot/grub/grub.cfg
-            fi
-            sudo umount boot rootfs_ext4 rootfs
-            sudo ext2simg -v ${BOARD}-rootfs-debian-stretch-iot-${VERSION}.emmc.img.raw out/${BOARD}/${BOARD}-rootfs-debian-stretch-iot-${VERSION}.emmc.img
-
-            sudo kpartx -dv ${BOARD}-debian-stretch-iot-sdcard-${VERSION}.img
-            sudo rm -rf boot rootfs rootfs_ext4 ${BOARD}-rootfs-debian-stretch-iot-${VERSION}.emmc.img.raw
-
-            # Compress image
-            gzip -9 out/${BOARD}/${BOARD}-rootfs-debian-stretch-iot-${VERSION}.emmc.img
-            ## For SD Card or other boot medias
-            cp ${BOARD}-debian-stretch-iot-sdcard-${VERSION}.img out/${BOARD}/
-            gzip -9 out/${BOARD}/${BOARD}-debian-stretch-iot-sdcard-${VERSION}.img
-
-            # Create MD5SUMS files
-            (cd out/${BOARD} && md5sum *.gz > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              out/${BOARD} 96boards/reference-platform/debian-iot/${BUILD_NUMBER}/${BOARD}
-            python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --make-link 96boards/reference-platform/debian-iot/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'ricardo.salveti@linaro.org'
-        - email-ext:
-            recipients: 'ricardo.salveti@linaro.org, michael.scott@linaro.org'
-            always: true
diff --git a/rpb-debian-iot/hwpacks/linaro-hikey b/rpb-debian-iot/hwpacks/linaro-hikey
deleted file mode 100644
index f0c491639a..0000000000
--- a/rpb-debian-iot/hwpacks/linaro-hikey
+++ /dev/null
@@ -1,59 +0,0 @@
-format: '3.0'
-name: linaro-hikey
-architectures:
-- arm64
-origin: Linaro
-maintainer: Linaro Platform <linaro-dev@lists.linaro.org>
-support: supported
-serial_tty: ttyAMA3
-kernel_addr: '0x60000000'
-initrd_addr: '0x62000000'
-load_addr: '0x60008000'
-dtb_addr: '0x61000000'
-partition_layout: bootfs16_rootfs
-mmc_id: '0:1'
-kernel_file: boot/vmlinuz-*
-initrd_file: boot/initrd.img-*
-dtb_file: usr/lib/linux-image-*/hisilicon/hi6220-hikey.dtb
-boot_script: boot.scr
-boot_min_size: 65
-extra_serial_options:
-- console=tty0
-- console=ttyAMA3,115200n8
-assume_installed:
-- adduser
-- apt
-- apt-utils
-- debconf-i18n
-- debian-archive-keyring
-- gnupg
-- ifupdown
-- initramfs-tools
-- iproute2
-- irqbalance
-- isc-dhcp-client
-- kmod
-- netbase
-- udev
-- libpcap0.8
-- libnl-3-200
-- libnl-genl-3-200
-- init-system-helpers
-- logrotate
-- lsb-base
-packages:
-- grub-efi-arm64
-- firmware-linux
-- firmware-ti-connectivity
-- ti-calibrator
-- ti-wlconf
-- linux-image-reference-arm64
-- tcpdump
-- tinyproxy
-- mosquitto
-- jq
-- stm32flash
-sources:
-  debian: http://http.debian.net/debian/ stretch main contrib non-free
-  repo: http://repo.linaro.org/ubuntu/linaro-overlay stretch main
-  rsalveti: http://repo.linaro.org/ubuntu/rsalveti stretch main
diff --git a/rpb-debian.yaml b/rpb-debian.yaml
deleted file mode 100644
index 2b5c67c1e0..0000000000
--- a/rpb-debian.yaml
+++ /dev/null
@@ -1,293 +0,0 @@
-- job:
-    name: 96boards-reference-platform-debian
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/rpb-debian/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Reference Platform - Debian'
-    axes:
-        - axis:
-            type: user-defined
-            name: BOARD
-            values:
-                - hikey
-                - dragonboard410c
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-rp
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'BOARD=="hikey"'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv ${BOARD}-debian-*.img || true
-              rm -rf configs out
-            }
-
-            # Builder setup
-            sudo apt-get update
-            sudo apt-get install -y android-tools-fsutils grub-common kpartx libfdt-dev mtools python-requests dosfstools
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Create the hardware pack
-            cp -a configs/96boards-reference-platform-debian/hwpacks/linaro-${BOARD} .
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            linaro-hwpack-create --debug --backports linaro-${BOARD} ${VERSION}
-
-            # Get rootfs
-            export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=alip/lastSuccessfulBuild/buildNumber`
-            export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/debian-arm64-rootfs/label=docker-jessie-arm64,rootfs=alip/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-            export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/alip-arm64/${ROOTFS_BUILD_NUMBER}/linaro-jessie-alip-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-            wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-            ROOTFS_BUILD_TAR=linaro-jessie-alip-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz
-
-            # Create pre-built image(s)
-            linaro-media-create --dev fastmodel --output-directory ${WORKSPACE} --image-file ${BOARD}-debian-jessie-alip-sdcard-${VERSION}.img --image-size 2500M --binary ${ROOTFS_BUILD_TAR} --hwpack hwpack_linaro-${BOARD}_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-            # Create eMMC rootfs image(s)
-            mkdir boot rootfs
-            for device in $(sudo kpartx -avs ${BOARD}-debian-jessie-alip-sdcard-${VERSION}.img | cut -d' ' -f3); do
-              partition=$(echo ${device} | cut -d'p' -f3)
-              [ "${partition}" = "1" ] && sudo mount -o loop /dev/mapper/${device} boot
-              [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-            done
-
-            KERNEL_VERSION=`basename rootfs/boot/vmlinuz-* | sed -e "s,^[^0-9]*-,,g"`
-
-            mkdir -p out/${BOARD}
-
-            # Build information
-            cat > out/${BOARD}/HEADER.textile << EOF
-
-            h4. Reference Platform Build - Debian
-
-            Build description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * ALIP Rootfs: "http://snapshots.linaro.org/debian/images/alip-arm64/$ROOTFS_BUILD_NUMBER":http://snapshots.linaro.org/debian/images/alip-arm64/$ROOTFS_BUILD_NUMBER
-            * Kernel: "linux-image-$KERNEL_VERSION":http://repo.linaro.org/ubuntu/linaro-overlay/pool/main/l/linux/
-            EOF
-
-            # Create boot image
-            if [ "${BOARD}" == "hikey" ]; then
-                FASTBOOT_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-reference-uefi/MX_PLATFORM=hikey,MX_TYPE=RELEASE,label=docker-jessie-amd64/lastStableBuild/buildNumber`
-                FASTBOOT_EFI_URL="http://snapshots.linaro.org/96boards/reference-platform/components/uefi/${FASTBOOT_EFI_BUILD_NUMBER}/release/hikey/AndroidFastbootApp.efi"
-                wget --progress=dot ${FASTBOOT_EFI_URL} -O fastboot.efi
-                GRUB_EFI_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/job/96boards-reference-grub-efi-arm64/lastStableBuild/buildNumber`
-                GRUB_EFI_URL="https://snapshots.linaro.org/96boards/reference-platform/components/grub/${GRUB_EFI_BUILD_NUMBER}/grubaa64.efi"
-                GRUB_SD_EFI_URL="https://snapshots.linaro.org/96boards/reference-platform/components/grub/${GRUB_EFI_BUILD_NUMBER}/grubaa64-sd.efi"
-                wget --progress=dot ${GRUB_EFI_URL} -O grubaa64.efi
-                wget --progress=dot ${GRUB_SD_EFI_URL} -O grubaa64-sd.efi
-
-                /sbin/mkfs.fat -F32 -n "boot" -C out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img 65536
-                mmd -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img EFI
-                mmd -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img EFI/BOOT
-                mcopy -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img fastboot.efi ::EFI/BOOT/fastboot.efi
-                mcopy -i out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img grubaa64.efi ::EFI/BOOT/grubaa64.efi
-                chmod 644 out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img
-
-                # Replicate boot image into the original img file
-                sudo rm -rf boot/*
-                sudo mkdir -p boot/EFI/BOOT
-                sudo cp fastboot.efi boot/EFI/BOOT/
-                # Boot partition for SD needs a different grub (default root search)
-                sudo cp grubaa64-sd.efi boot/EFI/BOOT/grubaa64.efi
-                sudo cp grubaa64-sd.efi boot/EFI/BOOT/BOOTAA64.EFI
-
-                # Compress boot partition image
-                gzip -9 out/${BOARD}/${BOARD}-boot-linux-${VERSION}.uefi.img
-
-                cat >> out/${BOARD}/HEADER.textile << EOF
-            * Grub UEFI: "http://snapshots.linaro.org/96boards/reference-platform/components/grub/$GRUB_EFI_BUILD_NUMBER":http://snapshots.linaro.org/96boards/reference-platform/components/grub/$GRUB_EFI_BUILD_NUMBER
-            * ARM TF / EDK2 UEFI: "http://snapshots.linaro.org/96boards/reference-platform/components/uefi/$FASTBOOT_EFI_BUILD_NUMBER/release/hikey":http://snapshots.linaro.org/96boards/reference-platform/components/uefi/$FASTBOOT_EFI_BUILD_NUMBER/release/hikey
-            EOF
-                # Grub config to be set as part of the rootfs
-                ## FIXME: Make this generic
-                sudo mkdir rootfs/boot/grub/fonts
-                sudo cp rootfs/usr/share/grub/unicode.pf2 rootfs/boot/grub/fonts
-                sudo grub-editenv rootfs/boot/grubenv create
-                sed -e "s/KERNEL_VERSION/$KERNEL_VERSION/" configs/96boards-reference-platform-debian/grub/grub-hikey.cfg.in > grub.cfg
-                sed -e "s/root=(hd0,gpt9)/root=(hd1,msdos2)/g" -e "s/mmcblk0p9/mmcblk1p2/g" grub.cfg > grub-sd.cfg
-                sudo cp configs/96boards-reference-platform-debian/grub/grub-fastboot.cfg rootfs/boot/grub/custom.cfg
-                sudo cp -a rootfs/usr/lib/grub/arm64-efi rootfs/boot/grub
-                sudo cp hi6220-hikey.dtb rootfs/boot/hi6220-hikey.dtb-${KERNEL_VERSION}
-                sudo ln -s hi6220-hikey.dtb-${KERNEL_VERSION} rootfs/boot/hi6220-hikey.dtb
-                echo "KERNEL_DEVICETREE=hi6220-hikey" | sudo tee rootfs/etc/default/kernel
-                sudo sed -i 's/^GRUB_CMDLINE_LINUX_DEFAULT.*/GRUB_CMDLINE_LINUX_DEFAULT="efi=noruntime rw quiet"/g' rootfs/etc/default/grub
-
-                # Since it uses uefi, create the boot efi fstab entry
-                sudo mkdir rootfs/boot/efi
-                cat << EOF | sudo tee rootfs/etc/fstab
-            /dev/disk/by-partlabel/boot   /boot/efi vfat defaults          0 0
-            EOF
-
-            elif [ "${BOARD}" == "dragonboard410c" ]; then
-                # Boot image tools
-                git clone git://codeaurora.org/quic/kernel/skales
-                (cd skales && git log -1)
-                export PATH=`pwd`/skales:$PATH
-
-                ## FIXME: See if we can find a better way to package this
-                # Firmware (adreno, venus and WCN)
-                wget --progress=dot -e dotbytes=1M https://developer.qualcomm.com/download/db410c/firmware-410c-1.2.0.bin
-                yes | sh firmware-410c-1.2.0.bin > /dev/null
-                sudo cp -a linux-ubuntu-board-support-package-*/proprietary-ubuntu/* rootfs/lib/firmware
-                sudo rm -f rootfs/lib/firmware.tar
-
-                # add license file in the generated rootfs
-                wget https://git.linaro.org/landing-teams/working/qualcomm/lt-docs.git/blob_plain/HEAD:/license/license.txt
-                sudo cp -f license.txt rootfs/etc/license.txt
-
-                # Create device tree table (not really required by u-boot, but needed by mkbootimg)
-                dtbTool -o dt.img -s 2048 rootfs/usr/lib/linux-image-*/qcom
-                # mkbootimg also needs initrd, just use an empty one
-                touch initrd
-
-                # Create boot image (u-boot)
-                mkbootimg \
-                  --kernel rootfs/usr/lib/u-boot/dragonboard410c/u-boot.bin \
-                  --ramdisk initrd \
-                  --output out/${BOARD}/${BOARD}-boot-linux-${VERSION}.img \
-                  --dt dt.img \
-                  --pagesize "2048" \
-                  --base "0x80000000" \
-                  --cmdline ""
-                gzip -9 out/${BOARD}/${BOARD}-boot-linux-${VERSION}.img
-
-                # For U-Boot
-                sudo cp apq8016-sbc.dtb rootfs/boot/apq8016-sbc.dtb-${KERNEL_VERSION}
-                sudo ln -s apq8016-sbc.dtb-${KERNEL_VERSION} rootfs/boot/apq8016-sbc.dtb
-                echo "KERNEL_DEVICETREE=apq8016-sbc" | sudo tee rootfs/etc/default/kernel
-                sudo mkdir -p rootfs/boot/extlinux
-                sudo cp configs/96boards-reference-platform-debian/extlinux/dragonboard410c.conf extlinux.conf
-                sed -e "s/mmcblk0p10/mmcblk1p2/g" extlinux.conf > extlinux-sd.conf
-            fi
-
-            # Create the ext4fs (fastboot compatible)
-            sudo mkfs.ext4 -L rootfs ${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img.raw 2500M
-            mkdir rootfs_ext4
-            sudo mount -o loop ${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img.raw rootfs_ext4
-            sudo cp -a rootfs/* rootfs_ext4
-            ## Make grub specific to the image type (e.g. emmc, sd)
-            if [ -f grub.cfg ]; then
-                sudo cp grub.cfg rootfs_ext4/boot/grub
-                sudo cp grub-sd.cfg rootfs/boot/grub/grub.cfg
-            fi
-            ## Same for extlinux (used by dragonboard410c)
-            if [ -f extlinux.conf ]; then
-                sudo cp extlinux.conf rootfs_ext4/boot/extlinux
-                sudo cp extlinux-sd.conf rootfs/boot/extlinux/extlinux.conf
-            fi
-            sudo umount boot rootfs_ext4 rootfs
-            sudo ext2simg -v ${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img.raw out/${BOARD}/${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img
-
-            sudo kpartx -dv ${BOARD}-debian-jessie-alip-sdcard-${VERSION}.img
-            sudo rm -rf boot rootfs rootfs_ext4 ${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img.raw
-
-            # Compress image
-            gzip -9 out/${BOARD}/${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img
-
-            # Publish remaining files
-            mkdir -p out/${BOARD}/hwpack
-            cp hwpack* out/${BOARD}/hwpack
-            ## For SD Card or other boot medias
-            cp ${BOARD}-debian-jessie-alip-sdcard-${VERSION}.img out/${BOARD}/
-            gzip -9 out/${BOARD}/${BOARD}-debian-jessie-alip-sdcard-${VERSION}.img
-
-            # Create MD5SUMS files
-            (cd out/${BOARD} && md5sum *.gz > MD5SUMS.txt)
-            (cd out/${BOARD}/hwpack && md5sum * > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              out/${BOARD} 96boards/reference-platform/debian/${BUILD_NUMBER}/${BOARD}
-            python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --make-link 96boards/reference-platform/debian/${BUILD_NUMBER}
-
-            cat << EOF > post_build_lava_parameters
-            BOOT_URL=http://snapshots.linaro.org/96boards/reference-platform/debian/${BUILD_NUMBER}/${BOARD}/$(ls out/${BOARD}/${BOARD}-boot-linux-${VERSION}.*img.gz | xargs basename)
-            ROOTFS_BUILD_URL=http://snapshots.linaro.org/96boards/reference-platform/debian/${BUILD_NUMBER}/${BOARD}/${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img.gz
-            SYSTEM_URL=http://snapshots.linaro.org/96boards/reference-platform/debian/${BUILD_NUMBER}/${BOARD}/${BOARD}-rootfs-debian-jessie-alip-${VERSION}.emmc.img.gz
-            DTB=hi6220-hikey.dtb-${KERNEL_VERSION}
-            EOF
-        - inject:
-            properties-file: post_build_lava_parameters
-        - shell: |
-            case "${BOARD}" in
-              hikey)
-                export DEVICE_TYPE=hi6220-hikey
-                export root='$root'
-                ;;
-              dragonboard410c)
-                export DEVICE_TYPE=apq8016-sbc
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-            ./lci-build-tools/yaml-to-json.py configs/96boards-reference-platform-debian/lava-job-definitions/${DEVICE_TYPE}/template-wa2.yaml > custom_lava_job_definition_wa2.json
-
-            cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition_wa2.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-grub-efi-arm64.yaml b/rpb-grub-efi-arm64.yaml
deleted file mode 100644
index a6f773b16d..0000000000
--- a/rpb-grub-efi-arm64.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-- job:
-    name: 96boards-reference-grub-efi-arm64
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'Reference Platform - GRUB EFI'
-    wrappers:
-        - timestamps
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf out
-            }
-
-            GRUB_EFI_BIN_PKG=grub-efi-arm64-bin
-            echo "deb http://repo.linaro.org/ubuntu/linaro-overlay jessie main" > local.list
-            sudo cp local.list /etc/apt/sources.list.d/
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends $GRUB_EFI_BIN_PKG python-requests
-
-            mkdir out
-
-            cat << EOF > out/grub.configfile
-            search.fs_label rootfs root
-            set prefix=(\$root)'/boot/grub'
-            configfile \$prefix/grub.cfg
-            EOF
-
-            cat << EOF > out/grub-sd.configfile
-            set root=(hd1,msdos2)
-            set prefix=(\$root)'/boot/grub'
-            configfile \$prefix/grub.cfg
-            EOF
-
-            GRUB_MODULES="boot chain configfile echo efinet eval ext2 fat font gettext gfxterm gzio help linux loadenv lsefi normal part_gpt part_msdos read regexp search search_fs_file search_fs_uuid search_label terminal terminfo test tftp time"
-            grub-mkimage \
-              --verbose \
-              --config=out/grub.configfile \
-              --output=out/grubaa64.efi \
-              --format=arm64-efi \
-              $GRUB_MODULES
-
-            grub-mkimage \
-              --verbose \
-              --config=out/grub-sd.configfile \
-              --output=out/grubaa64-sd.efi \
-              --format=arm64-efi \
-              $GRUB_MODULES
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - GRUB UEFI
-
-            GRUB UEFI build consumed by the Reference Platform Builds
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Grub modules used:
-
-            EOF
-            echo -n "bc. " >> out/HEADER.textile
-            echo $GRUB_MODULES >> out/HEADER.textile
-            cat >> out/HEADER.textile << EOF
-
-            * Grub config used (roofs search with label):
-
-            EOF
-            echo -n "bc. " >> out/HEADER.textile
-            cat out/grub.configfile >> out/HEADER.textile
-            cat >> out/HEADER.textile << EOF
-
-            * Grub config used (sdcard):
-
-            EOF
-            echo -n "bc. " >> out/HEADER.textile
-            cat out/grub-sd.configfile >> out/HEADER.textile
-            cat >> out/HEADER.textile << EOF
-
-            * $GRUB_EFI_BIN_PKG package:
-
-            EOF
-            echo -n "bc. " >> out/HEADER.textile
-            apt-cache show $GRUB_EFI_BIN_PKG >> out/HEADER.textile
-
-            # Create MD5SUMS file
-            (cd out && md5sum g* > MD5SUMS.txt)
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/grub/${BUILD_NUMBER}
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-kernel-enterprise-rpm.yaml b/rpb-kernel-enterprise-rpm.yaml
deleted file mode 100644
index c576959a4a..0000000000
--- a/rpb-kernel-enterprise-rpm.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-- job:
-    name: rpb-reference-kernel-rpm
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: KERNEL_GIT_BRANCH
-            default: 'erp-noupstream'
-        - string:
-            name: KERNEL_GIT_URL
-            default: 'https://github.com/Linaro/rpk.git'
-        - string:
-            name: TARGET_REPO
-            default: 'ERP-RPM:17.08:staging'
-    disabled: false
-    node: docker-jessie-rp
-    display-name: 'Reference Platform - Linux Kernel (EE) for RPM'
-    scm:
-        - git:
-            url: ${KERNEL_GIT_URL}
-            refspec: +refs/heads/${KERNEL_GIT_BRANCH}:refs/remotes/origin/${KERNEL_GIT_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_GIT_BRANCH}
-            basedir: linux
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - credentials-binding:
-            - text:
-                credential-id: OSCRC_USER
-                variable: OSCRC_USER
-        - credentials-binding:
-            - text:
-                credential-id: OSCRC_PASS
-                variable: OSCRC_PASS
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo DEBIAN_FRONTEND=noninteractive apt-get update -qq
-            sudo DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y -q osc rpm-common xz-utils
-
-            cat > $HOME/.oscrc <<EOF
-            [general]
-            apiurl = https://obs.linaro.org
-
-            [https://obs.linaro.org]
-            user=$OSCRC_USER
-            pass=$OSCRC_PASS
-            EOF
-
-            # Checkout packaging
-            #
-            osc co ${TARGET_REPO} kernel-aarch64
-            rm ${TARGET_REPO}/kernel-aarch64/linux-*.tar.xz
-
-            # Export the kernel packaging version
-            cd ${WORKSPACE}/linux
-
-            kernel_version=$(make kernelversion)
-            kernel_rpm_pkg_version=$(echo ${kernel_version} | sed -e 's/\.0-rc/~rc/')
-            kernel_git=$(git rev-parse --short=7 HEAD)
-            pname=linux-${kernel_rpm_pkg_version}-${kernel_git}
-            git archive --prefix=${pname}/ --format=tar ${kernel_git} | xz -c > ~/${WORKSPACE}/${TARGET_REPO}/kernel-aarch64/${pname}.tar.xz
-
-            # Update OBS checkout
-            cd ${WORKSPACE}/${TARGET_REPO}/kernel-aarch64
-
-            sed -i -e "s/^%define rpmversion .*/%define rpmversion ${kernel_rpm_pkg_version}/" \
-                   -e "s/^%define gitrelease .*/%define gitrelease ${kernel_git}/" \
-                kernel-aarch64.spec
-            osc addremove .
-            osc ci . -m "Update to ${pname}"
-
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-kernel-enterprise.yaml b/rpb-kernel-enterprise.yaml
deleted file mode 100644
index 72861e9b70..0000000000
--- a/rpb-kernel-enterprise.yaml
+++ /dev/null
@@ -1,138 +0,0 @@
-- job:
-    name: 96boards-reference-kernel-enterprise
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: KERNEL_GIT_BRANCH
-            default: 'erp-noupstream'
-        - string:
-            name: KERNEL_GIT_URL
-            default: 'https://github.com/Linaro/rpk.git'
-        - string:
-            name: TARGET_REPO
-            default: 'ERP:staging'
-    disabled: false
-    node: docker-stretch-amd64
-    display-name: 'Reference Platform - Linux Kernel (EE)'
-    scm:
-        - git:
-            url: ${KERNEL_GIT_URL}
-            refspec: +refs/heads/${KERNEL_GIT_BRANCH}:refs/remotes/origin/${KERNEL_GIT_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_GIT_BRANCH}
-            basedir: linux
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo apt-get update -q=2
-            sudo apt-get install -y ccache python-requests quilt cpio rsync dh-exec
-
-            # Checkout source code
-            git clone --depth 1 -b rpb-stretch https://github.com/Linaro/debian-kernel-packaging.git debian-pkg
-
-            # Export the kernel packaging version
-            cd ${WORKSPACE}/linux
-
-            kernel_version=$(make kernelversion)
-            kernel_deb_pkg_version=$(echo ${kernel_version} | sed -e 's/\.0-rc/~rc/')
-            export KDEB_PKGVERSION="${kernel_deb_pkg_version}.linaro.${BUILD_NUMBER}-1"
-            git tag -f v${kernel_deb_pkg_version//\~/-}
-
-            # Build the debian source kernel
-            cd ${WORKSPACE}/debian-pkg
-
-            # Use build number as ABI
-            sed -i "s/^abiname:.*/abiname: ${BUILD_NUMBER}/g" debian/config/defines
-
-            cat << EOF > debian/changelog
-            linux ($KDEB_PKGVERSION) unstable; urgency=medium
-
-              * Auto build:
-                - URL: ${GIT_URL}
-                - Branch: ${GIT_BRANCH}
-                - Commit: ${GIT_COMMIT}
-
-             -- Fathi Boudra <fathi.boudra@linaro.org>  $(date -R)
-
-            EOF
-
-            debian/rules clean || true
-            debian/bin/genorig.py ../linux
-            debian/rules orig
-            fakeroot debian/rules source
-            debuild -S -uc -us -d
-            cd ..
-
-            cat > ${WORKSPACE}/build-package-params <<EOF
-            source=${BUILD_URL}/artifact/$(echo *.dsc)
-            repo=${TARGET_REPO}
-            EOF
-
-            # Final preparation for publishing
-            mkdir out
-            rm *.orig.tar.xz
-            cp -a orig/*.orig.tar.xz ${WORKSPACE}/
-            cp -a *.dsc *.changes *.debian.tar.xz *.orig.tar.xz out/
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - Linux Kernel
-
-            Linux Kernel build consumed by the Reference Platform Enterprise Builds
-
-            Build Description:
-            * Build URL: "${BUILD_URL}":${BUILD_URL}
-            * Git tree: "${GIT_URL}":${GIT_URL}
-            * Git branch: ${GIT_BRANCH}
-            * Git commit: ${GIT_COMMIT}
-            * Kernel version: ${kernel_version}
-            * Kernel deb version: ${KDEB_PKGVERSION}
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/linux/enterprise/${BUILD_NUMBER}/
-    publishers:
-        - archive:
-            artifacts: '*.dsc, *.xz'
-        - trigger-parameterized-builds:
-            - project: build-package-obs
-              property-file: build-package-params
-              condition: SUCCESS
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org packages@lists.linaro.org'
diff --git a/rpb-kernel-latest.yaml b/rpb-kernel-latest.yaml
deleted file mode 100644
index 06efd4b496..0000000000
--- a/rpb-kernel-latest.yaml
+++ /dev/null
@@ -1,75 +0,0 @@
-- job:
-    name: rpb-kernel-latest
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 60
-    parameters:
-        - string:
-            name: TARGET_REPO
-            default: 'ERP:staging'
-        - string:
-            name: OBS_RELEASE
-            default: 'Debian_9'
-    disabled: false
-    node: docker-stretch-arm64
-    display-name: 'Reference Platform - kernel metapackage'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            TR=$(echo ${TARGET_REPO} | sed -e 's,:,:/,g')
-            echo deb http://obs.linaro.org/${TR}/${OBS_RELEASE}/ ./ | sudo tee /etc/apt/sources.list.d/${TARGET_REPO}.list
-            echo deb-src http://obs.linaro.org/${TR}/${OBS_RELEASE}/ ./ | sudo tee -a /etc/apt/sources.list.d/${TARGET_REPO}.list
-            sudo apt-get update -q=2
-
-            kernel_abi_version=$(apt-cache search ^linux-image-4.*-arm64$|sed -e 's,-rc,~rc,' -e 's,-arm64 .*,,' -e 's,linux-image-,,'|sort --version-sort|tail -1|sed -e 's,~rc,-rc,')
-            old_kernel_abi_version=$(apt-cache show linux-image-reference-arm64|grep Depends:|sed -e 's,-rc,~rc,' -e 's,.*linux-image-,,' -e 's,-arm64$,,'|sort --version-sort|tail -1|sed -e 's,~rc,-rc,' )
-            if [ ${old_kernel_abi_version} == ${kernel_abi_version} ]; then
-                echo metapackage up to date at ${old_kernel_abi_version}
-                exit 0
-            fi
-
-            package_version=$(apt-cache showsrc linux-reference-source|awk '/^Version/ { print ($2)+1 }'|sort --version-sort|tail -1)
-            sudo apt-get install -y linux-support-${kernel_abi_version}
-
-            git clone --depth=1 https://github.com/Linaro/debian-linux-latest-reference
-            cd debian-linux-latest-reference
-            sed -i "s/KERNELVERSION :=.*/KERNELVERSION := ${kernel_abi_version}/" debian/rules.defs
-            ./debian/rules debian/control || true
-            EMAIL=packages@lists.linaro.org dch -v "${package_version}" -D stretch --force-distribution "bump ABI to ${kernel_abi_version}"
-            ./debian/rules debian/control || true
-            dpkg-buildpackage -S -d
-            cd ..
-
-            cat > ${WORKSPACE}/build-package <<EOF
-            source=${BUILD_URL}/artifact/$(echo *.dsc)
-            repo=${TARGET_REPO}
-            EOF
-    publishers:
-        - archive:
-            artifacts: '*.dsc, *.xz'
-            latest-only: true
-            allow-empty: true
-        - trigger-parameterized-builds:
-            - project: build-package-obs
-              property-file: build-package
-              condition: SUCCESS
-        - email:
-            recipients: 'packages@lists.linaro.org '
diff --git a/rpb-kernel-matrix.yaml b/rpb-kernel-matrix.yaml
deleted file mode 100644
index 4d0b9ba802..0000000000
--- a/rpb-kernel-matrix.yaml
+++ /dev/null
@@ -1,149 +0,0 @@
-- job:
-    name: 96boards-reference-kernel-matrix
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: true
-    node: build
-    display-name: 'Reference Platform - Linux Kernel (matrix)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MX_PLATFORM
-            values:
-                - hikey
-                - dragonboard410c
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-amd64
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'MX_PLATFORM=="hikey"'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            sudo apt-get update
-            sudo apt-get install -y ccache python-requests
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf linux
-              rm -rf out
-            }
-
-            export LANG=C
-            CCACHE_DIR="${HOME}/srv/ccache"
-            CCACHE_UNIFY=1
-            CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
-            export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS
-            export use_ccache=true
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=reference-${MX_PLATFORM}
-            export kernel_config="defconfig distro.config"
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-15.02/bin"
-            export toolchain_url="http://releases.linaro.org/15.02/components/toolchain/binaries/aarch64-linux-gnu/gcc-linaro-4.9-2015.02-3-x86_64_aarch64-linux-gnu.tar.xz"
-            export KERNEL_URL=https://github.com/rsalveti/linux.git
-
-            if [ "${MX_PLATFORM}" == "hikey" ]; then
-                KERNEL_BRANCH=reference-hikey-rebase
-            elif [ "${MX_PLATFORM}" == "dragonboard410c" ]; then
-                KERNEL_BRANCH=reference-qcom-rebase
-            fi
-
-            git clone -b ${KERNEL_BRANCH} --depth 1 ${KERNEL_URL} linux
-            cd linux
-            export JENKINS_WORKSPACE=${WORKSPACE}
-            unset WORKSPACE
-
-            # Export the kernel packaging version
-            kernel_version=`make kernelversion`
-            kernel_release=${kernel_version}-linaro-${kernel_flavour}
-            export KDEB_PKGVERSION="${kernel_release}-${BUILD_NUMBER}"
-
-            # Build the kernel
-            rm -rf lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            # Final preparation for publishing
-            cp -a *.dsc *.changes *.deb out/
-            cp linux*orig.tar.gz out/
-
-            # Build information
-            KERNEL_GIT_HEAD=`git log --format="%H" -1`
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - Linux Kernel ($MX_PLATFORM)
-
-            Linux Kernel build consumed by the Reference Platform Builds
-
-            Build Description:
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Kernel tree: "$KERNEL_URL":$KERNEL_URL
-            * Kernel branch: $KERNEL_BRANCH
-            * Kernel version: $kernel_version
-            * Kernel release: $kernel_release
-            * Kernel deb version: $KDEB_PKGVERSION
-            EOF
-
-            # Create MD5SUMS file
-            (cd out && md5sum *.tar.gz *.deb > MD5SUMS.txt)
-
-            unset WORKSPACE
-            export WORKSPACE=${JENKINS_WORKSPACE}
-            cd ${WORKSPACE}
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              linux/out 96boards/reference-platform/components/linux/${MX_PLATFORM}/${BUILD_NUMBER}/
-
-            CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-            CCACHE_DIR=${CCACHE_DIR} ccache -s
-
-            # Create post-build parameters (useful for other jobs)
-            cat << EOF >> post_build_parameters
-            KERNEL_VERSION=${kernel_version}
-            KERNEL_RELEASE=${kernel_release}
-            KDEB_PKGVERSION=${KDEB_PKGVERSION}
-            EOF
-        - inject:
-            properties-file: post_build_parameters
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-kernel.yaml b/rpb-kernel.yaml
deleted file mode 100644
index be46770149..0000000000
--- a/rpb-kernel.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-- job:
-    name: 96boards-reference-kernel
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 60
-        numToKeep: 60
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: KERNEL_GIT_BRANCH
-            default: 'erp-noupstream'
-        - string:
-            name: KERNEL_GIT_URL
-            default: 'https://github.com/Linaro/rpk.git'
-        - string:
-            name: TARGET_REPO
-            default: 'linaro-staging'
-    disabled: true
-    node: docker-jessie-rp
-    display-name: 'Reference Platform - Linux Kernel'
-    scm:
-        - git:
-            url: ${KERNEL_GIT_URL}
-            refspec: +refs/heads/${KERNEL_GIT_BRANCH}:refs/remotes/origin/${KERNEL_GIT_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_GIT_BRANCH}
-            basedir: linux
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo apt-get update
-            sudo apt-get install -y ccache python-requests quilt cpio rsync
-
-            # Checkout source code
-            git clone --depth 1 -b rpb-stretch https://github.com/Linaro/debian-kernel-packaging.git debian-pkg
-
-            # Export the kernel packaging version
-            cd ${WORKSPACE}/linux
-
-            kernel_version=$(make kernelversion)
-            kernel_deb_pkg_version=$(echo ${kernel_version} | sed -e 's/\.0-rc/~rc/')
-            export KDEB_PKGVERSION="${kernel_deb_pkg_version}.linaro.${BUILD_NUMBER}-1"
-            git tag v${kernel_deb_pkg_version//\~/-}
-
-            # Build the debian source kernel
-            cd ${WORKSPACE}/debian-pkg
-
-            # Allow our own versioning scheme
-            sed -i 's/dfsg/linaro/g' debian/bin/genorig.py debian/lib/python/debian_linux/debian.py
-
-            # Use build number as ABI
-            sed -i "s/^abiname:.*/abiname: ${BUILD_NUMBER}/g" debian/config/defines
-
-            cat << EOF > debian/changelog
-            linux ($KDEB_PKGVERSION) unstable; urgency=medium
-
-              * Auto build:
-                - URL: ${GIT_URL}
-                - Branch: ${GIT_BRANCH}
-                - Commit: ${GIT_COMMIT}
-
-             -- 96Boards Team <dev@lists.96boards.org>  $(date -R)
-
-            EOF
-
-            debian/rules clean || true
-            debian/bin/genorig.py ../linux
-            debian/rules orig
-            fakeroot debian/rules source
-            debuild -S -uc -us
-            cd ..
-
-            cat > ${WORKSPACE}/build-package-params-stretch <<EOF
-            source=${BUILD_URL}/artifact/$(echo *.dsc)
-            repo=${TARGET_REPO}
-            codename=stretch
-            appendversion=false
-            EOF
-
-            # Final preparation for publishing
-            mkdir out
-            rm *.orig.tar.xz
-            cp -a orig/*.orig.tar.xz ${WORKSPACE}/
-            cp -a *.dsc *.changes *.debian.tar.xz *.orig.tar.xz out/
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Reference Platform - Linux Kernel
-
-            Linux Kernel build consumed by the Reference Platform Builds
-
-            Build Description:
-            * Build URL: "${BUILD_URL}":${BUILD_URL}
-            * Git tree: "${GIT_URL}":${GIT_URL}
-            * Git branch: ${GIT_BRANCH}
-            * Git commit: ${GIT_COMMIT}
-            * Kernel version: ${kernel_version}
-            * Kernel deb version: ${KDEB_PKGVERSION}
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              out 96boards/reference-platform/components/linux/common/${BUILD_NUMBER}/
-    publishers:
-        - archive:
-            artifacts: '*.dsc, *.xz'
-        - trigger-parameterized-builds:
-            - project: build-package
-              property-file: build-package-params-stretch
-              condition: SUCCESS
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/rpb-openembedded-jethro.yaml b/rpb-openembedded-jethro.yaml
deleted file mode 100644
index 441d4fcbcf..0000000000
--- a/rpb-openembedded-jethro.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-- job:
-    name: 96boards-reference-platform-openembedded-jethro
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image rpb-console-image-test'
-        - string:
-            name: IMAGES_RPB
-            default: 'rpb-desktop-image rpb-desktop-image-test'
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: 'rpb-weston-image rpb-weston-image-test'
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'jethro'
-        - string:
-            name: BASE_URL
-            default: 'http://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'reference-platform/embedded/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: master
-    display-name: 'Reference Platform - OpenEmbedded (jethro)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - '96boards-64'
-                - 'bubblegum'
-                - 'dragonboard-410c'
-                - 'dragonboard-820c'
-                - 'hikey'
-                - 'sd-600eval'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-                - rpb-wayland
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-    builders:
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-        - shell: |
-            case "${MACHINE}" in
-              dragonboard-410c)
-                # FIXME convert to LAVA v2
-                #export DEVICE_TYPE=apq8016-sbc
-                ;;
-              stih410-b2260)
-                export DEVICE_TYPE=b2260
-                ;;
-              *)
-                echo "Skip DEVICE_TYPE for ${MACHINE}"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Handle LAVA v1 (json)/v2 (yaml) test definitions
-            case "${DEVICE_TYPE}" in
-              apq8016-sbc)
-                ./lci-build-tools/yaml-to-json.py configs/rpb-openembedded/lava-job-definitions/${DEVICE_TYPE}/template.yaml \
-                > custom_lava_job_definition.json
-
-                cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-              b2260)
-                sed -e "s|\${KERNEL_URL}|${KERNEL_URL}|" \
-                    -e "s|\${DTB_URL}|${DTB_URL}|" \
-                    -e "s|\${NFSROOTFS_URL}|${NFSROOTFS_URL}|" \
-                    -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                    < configs/rpb-openembedded/lava-job-definitions/${DEVICE_TYPE}/template.yaml \
-                    > custom_lava_job_definition.yaml
-
-                cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org, nicolas.dechesne@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-openembedded-krogoth.yaml b/rpb-openembedded-krogoth.yaml
deleted file mode 100644
index 6419bc2805..0000000000
--- a/rpb-openembedded-krogoth.yaml
+++ /dev/null
@@ -1,146 +0,0 @@
-- job:
-    name: 96boards-reference-platform-openembedded-krogoth
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image rpb-console-image-test'
-        - string:
-            name: IMAGES_RPB
-            default: 'rpb-desktop-image rpb-desktop-image-test'
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: 'rpb-weston-image rpb-weston-image-test'
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'krogoth'
-        - string:
-            name: BASE_URL
-            default: 'http://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'reference-platform/embedded/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/rpb-openembedded-${MANIFEST_BRANCH}/'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-    disabled: false
-    node: master
-    display-name: 'Reference Platform - OpenEmbedded (krogoth)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - '96boards-64'
-                - 'bubblegum'
-                - 'dragonboard-410c'
-                - 'dragonboard-820c'
-                - 'hikey'
-                - 'sd-600eval'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-                - rpb-wayland
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-    builders:
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-        - shell: |
-            case "${MACHINE}" in
-              dragonboard-410c)
-                # FIXME convert to LAVA v2
-                #export DEVICE_TYPE=apq8016-sbc
-                ;;
-              stih410-b2260)
-                export DEVICE_TYPE=b2260
-                ;;
-              *)
-                echo "Skip DEVICE_TYPE for ${MACHINE}"
-                ;;
-            esac
-
-            rm -rf configs lci-build-tools
-            git clone --depth 1 http://git.linaro.org/ci/lci-build-tools.git
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Handle LAVA v1 (json)/v2 (yaml) test definitions
-            case "${DEVICE_TYPE}" in
-              apq8016-sbc)
-                ./lci-build-tools/yaml-to-json.py configs/rpb-openembedded/lava-job-definitions/${DEVICE_TYPE}/template.yaml \
-                > custom_lava_job_definition.json
-
-                cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            BUNDLE_STREAM_NAME=${BUNDLE_STREAM_NAME}
-            CUSTOM_JSON_URL=${JOB_URL}/ws/custom_lava_job_definition.json
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-              b2260)
-                sed -e "s|\${KERNEL_URL}|${KERNEL_URL}|" \
-                    -e "s|\${DTB_URL}|${DTB_URL}|" \
-                    -e "s|\${NFSROOTFS_URL}|${NFSROOTFS_URL}|" \
-                    -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                    < configs/rpb-openembedded/lava-job-definitions/${DEVICE_TYPE}/template.yaml \
-                    > custom_lava_job_definition.yaml
-
-                cat << EOF > post_build_lava_parameters
-            DEVICE_TYPE=${DEVICE_TYPE}
-            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
-            LAVA_SERVER=${LAVA_SERVER}
-            EOF
-                ;;
-            esac
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
-    publishers:
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org, nicolas.dechesne@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-openembedded-master.yaml b/rpb-openembedded-master.yaml
deleted file mode 100644
index d6e94c3e76..0000000000
--- a/rpb-openembedded-master.yaml
+++ /dev/null
@@ -1,142 +0,0 @@
-- job:
-    name: 96boards-reference-platform-openembedded-master
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image rpb-console-image-test'
-        - string:
-            name: IMAGES_RPB
-            default: 'rpb-desktop-image rpb-desktop-image-test'
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: 'rpb-weston-image rpb-weston-image-test'
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'master'
-        - string:
-            name: BASE_URL
-            default: 'http://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'reference-platform/embedded/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'rpb-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'rpb'
-    disabled: false
-    node: master
-    display-name: 'Reference Platform - OpenEmbedded (master)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - 'am57xx-evm'
-#                - 'bubblegum'
-                - 'dragonboard-410c'
-                - 'dragonboard-820c'
-#                - 'juno'
-                - 'hikey960'
-                - 'hikey'
-#                - 'poplar'
-#                - 'sd-600eval'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-                - rpb-wayland
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              juno)
-                DEVICE_TYPE=juno
-                ;;
-              stih410-b2260)
-                DEVICE_TYPE=b2260
-                ;;
-              *)
-                echo "Skip DEVICE_TYPE for ${MACHINE}"
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-        - shell:
-            !include-raw: rpb-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - openembedded-lkft/postbuild.groovy
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org, nicolas.dechesne@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-openembedded-morty.yaml b/rpb-openembedded-morty.yaml
deleted file mode 100644
index 4e8893854c..0000000000
--- a/rpb-openembedded-morty.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-- job:
-    name: 96boards-reference-platform-openembedded-morty
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image rpb-console-image-test'
-        - string:
-            name: IMAGES_RPB
-            default: 'rpb-desktop-image rpb-desktop-image-test'
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: 'rpb-weston-image rpb-weston-image-test'
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: BASE_URL
-            default: 'http://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'reference-platform/embedded/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'rpb-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'rpb'
-    disabled: false
-    node: master
-    display-name: 'Reference Platform - OpenEmbedded (morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-#                - '96boards-64'
-                - 'am57xx-evm'
-                - 'bubblegum'
-                - 'dragonboard-410c'
-                - 'dragonboard-820c'
-                - 'juno'
-                - 'hikey960'
-                - 'hikey'
-                - 'orangepi-i96'
-                - 'poplar'
-                - 'sd-600eval'
-                - 'stih410-b2260'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-                - rpb-wayland
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              juno)
-                DEVICE_TYPE=juno
-                ;;
-              stih410-b2260)
-                DEVICE_TYPE=b2260
-                ;;
-              *)
-                echo "Skip DEVICE_TYPE for ${MACHINE}"
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-        - shell:
-            !include-raw: rpb-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - openembedded-lkft/postbuild.groovy
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org, nicolas.dechesne@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-openembedded-rocko.yaml b/rpb-openembedded-rocko.yaml
deleted file mode 100644
index 86e233b603..0000000000
--- a/rpb-openembedded-rocko.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-- job:
-    name: 96boards-reference-platform-openembedded-rocko
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image rpb-console-image-test'
-        - string:
-            name: IMAGES_RPB
-            default: 'rpb-desktop-image rpb-desktop-image-test'
-        - string:
-            name: IMAGES_RPB_WAYLAND
-            default: 'rpb-weston-image rpb-weston-image-test'
-        - string:
-            name: MANIFEST_URL
-            default: 'https://github.com/96boards/oe-rpb-manifest.git'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'rocko'
-        - string:
-            name: BASE_URL
-            default: 'http://snapshots.linaro.org/'
-        - string:
-            name: PUB_DEST
-            default: 'reference-platform/embedded/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}'
-        - string:
-            name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'rpb-oe'
-        - string:
-            name: QA_SERVER_TEAM
-            default: 'rpb'
-    disabled: false
-    node: master
-    display-name: 'Reference Platform - OpenEmbedded (rocko)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'am57xx-evm'
-                - 'bubblegum'
-                - 'dragonboard-410c'
-                - 'dragonboard-820c'
-                - 'juno'
-                - 'hikey960'
-                - 'hikey'
-                - 'orangepi-i96'
-                - 'poplar'
-                - 'sd-600eval'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-                - rpb-wayland
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              am57xx-evm)
-                DEVICE_TYPE=x15
-                ;;
-              dragonboard-410c)
-                DEVICE_TYPE=dragonboard-410c
-                ;;
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-              juno)
-                DEVICE_TYPE=juno
-                ;;
-              stih410-b2260)
-                DEVICE_TYPE=b2260
-                ;;
-              *)
-                echo "Skip DEVICE_TYPE for ${MACHINE}"
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: rpb-openembedded/builders.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw: rpb-openembedded/publishers.sh
-        - shell:
-            !include-raw: rpb-openembedded/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw:
-                  - openembedded-lkft/postbuild.groovy
-# We can only archive files that are located in the workspace
-#        - archive:
-#            artifacts: 'build/tmp-*glibc/deploy/images/${MACHINE}/*'
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org, nicolas.dechesne@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-openembedded/builders-lhg.sh b/rpb-openembedded/builders-lhg.sh
index 324b1212b4..4a077d4d38 100755
--- a/rpb-openembedded/builders-lhg.sh
+++ b/rpb-openembedded/builders-lhg.sh
@@ -20,7 +20,7 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-crypto python-requests texinfo vim-tiny whiptail"
+pkg_list="android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-crypto python3-crypto python-requests texinfo vim-tiny whiptail"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
@@ -48,25 +48,32 @@ if [ ! -e ".repo/manifest.xml" ]; then
    ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
 fi
 
-repo sync
-cp .repo/manifest.xml source-manifest.xml
-repo manifest -r -o pinned-manifest.xml
-MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
-
-# FIXME LHG Specific: clone restricted repository, which isn't in the public manifest
+# Some proprietary code is on lhg-review.org server and dev-private-review server
 cat << EOF > ${HOME}/lhg-review.sshconfig
 Host lhg-review.linaro.org
     User lhg-gerrit-bot
     UserKnownHostsFile /dev/null
     StrictHostKeyChecking no
+Host dev-private-review.linaro.org
+    User lhg-gerrit-bot
+    UserKnownHostsFile /dev/null
+    StrictHostKeyChecking no
 EOF
 chmod 0600 ${HOME}/lhg-review.sshconfig
-rm -rf layers/meta-lhg-prop
-git clone ssh://lhg-review.linaro.org:29418/lhg/meta-lhg-prop layers/meta-lhg-prop
+
+repo sync
+cp .repo/manifest.xml source-manifest.xml
+repo manifest -r -o pinned-manifest.xml
+MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
 
 # record changes since last build, if available
 if wget -q ${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
-    repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+    # https://github.com/96boards/oe-rpb-manifest/commit/0be354483a124903982103dc937f9e5c1a094a3a
+    if grep -q ".*linkfile.*\.\./\.\./\.repo/manifests/setup-environment" pinned-manifest-latest.xml ; then
+	echo "detected old style symlink with relative path, skipping diff report"
+    else
+	repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+    fi
 else
     echo "latest build published does not have pinned-manifest.xml, skipping diff report"
 fi
@@ -75,13 +82,18 @@ fi
 # make sure we get rid of old config.
 # let's remove the previous TMPDIR as well.
 # we want to preserve build/buildhistory though.
-rm -rf conf build/conf build/tmp-*glibc/
+rm -rf build/conf build/tmp-*glibc/
 
 # Accept EULA if/when needed
 export EULA_dragonboard410c=1
 export EULA_stih410b2260=1
 source setup-environment build
 
+# Accept freescale EULA
+cat << EOF >> conf/local.conf
+ACCEPT_FSL_EULA = "1"
+EOF
+
 # Add job BUILD_NUMBER to output files names
 cat << EOF >> conf/auto.conf
 IMAGE_NAME_append = "-${BUILD_NUMBER}"
@@ -109,9 +121,6 @@ EOF
 #[ "${DISTRO}" = "rpb-wayland" ] && IMAGES+=" rpb-weston-image rpb-weston-image-test"
 #[ "${MACHINE}" = "am57xx-evm" ] && IMAGES="rpb-console-image"
 
-# FIXME LHG Specific: add the layer
-bitbake-layers add-layer /srv/oe/layers/meta-lhg-prop
-
 time bitbake ${IMAGES}
 
 DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
@@ -124,10 +133,10 @@ cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
 
 # FIXME: Sparse images here, until it gets done by OE
 case "${MACHINE}" in
-  juno|stih410-b2260|orangepi-i96)
+  juno|stih410-b2260|orangepi-i96|imx8mqevk)
     ;;
   *)
-    for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
+    for rootfs in $(find ${DEPLOY_DIR_IMAGE} -type f -name *.rootfs.ext4.gz); do
       gunzip -k ${rootfs}
       sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
       rm -f ${rootfs%.gz}
diff --git a/rpb-openembedded/builders-ltp.sh b/rpb-openembedded/builders-ltp.sh
index f35f68a3f3..1c68d14631 100755
--- a/rpb-openembedded/builders-ltp.sh
+++ b/rpb-openembedded/builders-ltp.sh
@@ -27,8 +27,8 @@ if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; th
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
 
-# Install ruamel.yaml
-pip install --user --force-reinstall ruamel.yaml
+# Install ruamel.yaml==0.16.13
+pip install --user --force-reinstall ruamel.yaml==0.16.13
 
 set -ex
 
diff --git a/rpb-openembedded/builders-tux.sh b/rpb-openembedded/builders-tux.sh
new file mode 100644
index 0000000000..d3e11f4655
--- /dev/null
+++ b/rpb-openembedded/builders-tux.sh
@@ -0,0 +1,121 @@
+#!/bin/bash
+
+set -ex
+
+# install jflog client tool, v1, used for publishing artifacts
+(mkdir -p $HOME/bin && cd $HOME/bin && curl -fL https://getcli.jfrog.io | sh)
+
+# Get tuxsuite
+virtualenv --python=$(which python3) .venv
+source .venv/bin/activate
+pip install tuxsuite
+tuxsuite --version
+
+
+[ "${DISTRO}" = "rpb" ] && IMAGES+=" ${IMAGES_RPB}"
+[ "${DISTRO}" = "rpb-wayland" ] && IMAGES+=" ${IMAGES_RPB_WAYLAND}"
+
+# These machines only build the basic rpb-console-image
+case "${MACHINE}" in
+  am57xx-evm|intel-core2-32|intel-corei7-64)
+     IMAGES="rpb-console-image"
+     ;;
+esac
+
+# Default value for BB_OVERRIDE is set to new syntax
+if [ -z "${BB_OVERRIDE}" ]; then
+    BB_OVERRIDE=':'
+fi
+
+# Create Tux Job file
+cat << EOF > tux.json
+{
+  "sources": {
+    "repo": {
+        "url": "${MANIFEST_URL}",
+        "branch": "${MANIFEST_BRANCH}",
+        "manifest": "default.xml"
+      }
+  },
+  "container": "ubuntu-20.04",
+  "envsetup": "setup-environment",
+  "distro": "${DISTRO}",
+  "machine": "${MACHINE}",
+  "target": "${IMAGES}",
+  "artifacts": [],
+    "environment": {
+  },
+  "local_conf": [
+    "INHERIT += 'buildstats buildstats-summary'",
+    "INHERIT${BB_OVERRIDE}remove = 'rm_work'",
+    "IMAGE_NAME${BB_OVERRIDE}append = '-${BUILD_NUMBER}'",
+    "KERNEL_IMAGE_NAME${BB_OVERRIDE}append = '-${BUILD_NUMBER}'",
+    "MODULE_TARBALL_NAME${BB_OVERRIDE}append = '-${BUILD_NUMBER}'",
+    "DT_IMAGE_BASE_NAME${BB_OVERRIDE}append = '-${BUILD_NUMBER}'",
+    "BOOT_IMAGE_BASE_NAME${BB_OVERRIDE}append = '-${BUILD_NUMBER}'"
+  ]
+}
+EOF
+
+# Process top level job extra local.conf
+# This jq script will take the main JSON file and merge local_conf data
+if [ -f "${WORKSPACE}/local.conf.json" ]; then
+    cp tux.json tux.orig.json
+    jq 'reduce inputs.local_conf as $s (.; .local_conf += $s)' tux.orig.json "${WORKSPACE}/local.conf.json" > tux.json
+fi
+
+# Build, do not report tuxsuite return code, since we want to process json out
+tuxsuite bake submit --json-out status.json tux.json || true
+
+# cleanup virtualenv
+deactivate
+
+if [ ! -f status.json ]; then
+    echo "tux suite failed, infrastructure error, status.json does not exist"
+    exit 1
+fi
+
+url=$(cat status.json | jq -r ".download_url")
+state=$(cat status.json | jq -r ".state")
+result=$(cat status.json | jq -r ".result")
+
+if [ "$state" != "finished" ]; then
+    echo "tuxsuite failed, with an unexpected reason"
+    exit 1
+fi
+
+wget $url/build.log
+cat build.log
+
+echo "TUXBUILD_URL=$url" > parameters
+
+if [ "$result" != "pass" ]; then
+    echo "tuxsuite build failed"
+    exit 2
+fi
+
+# Prepare files to publish, if needed
+if [ -z "${PUBLISH_SERVER}" ]; then
+    exit 0
+fi
+
+DEPLOY_DIR_IMAGE=${PWD}/deploy_dir_images
+echo "DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}" >> parameters
+
+# files to download
+wget $url/?export=json -O root.json
+wget $url/images/${MACHINE}/?export=json -O images.json
+
+mkdir ${DEPLOY_DIR_IMAGE} && pushd ${DEPLOY_DIR_IMAGE}
+
+for j in ${WORKSPACE}/root.json ${WORKSPACE}/images.json; do
+    for f in $(cat $j | jq -r .files[].Url); do
+	wget $f
+    done
+done
+popd
+
+# Create MD5SUMS file
+find ${DEPLOY_DIR_IMAGE} -type f | xargs md5sum > MD5SUMS.txt
+sed -i "s|${DEPLOY_DIR_IMAGE}/||" MD5SUMS.txt
+mv MD5SUMS.txt ${DEPLOY_DIR_IMAGE}
diff --git a/rpb-openembedded/builders.sh b/rpb-openembedded/builders.sh
index 48d2bfd5ab..bde6b0a6d3 100755
--- a/rpb-openembedded/builders.sh
+++ b/rpb-openembedded/builders.sh
@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -e
+set -ex
+
+# install jflog client tool, v1, used for publishing artifacts
+(mkdir -p $HOME/bin && cd $HOME/bin && curl -fL https://getcli.jfrog.io | sh)
 
 # workaround EDK2 is confused by the long path used during the build
 # and truncate files name expected by VfrCompile
@@ -15,20 +18,31 @@ cleanup_exit()
     echo "Running cleanup_exit..."
 }
 
+# XXX: In Debian buster use newer tool img2simg because in certain cases ext2img corrupt rootfs images,
+# this workaround is meanwhile all RPB builds are switch to use Debian buster.
+if [ "$label" == "docker-buster-amd64" ]; then
+  android_tools="img2simg"
+  simg_cmd="img2simg"
+else
+  android_tools="android-tools-fsutils"
+  simg_cmd="ext2simg -v"
+fi
+
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
   echo "INFO: apt update error - try again in a moment"
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
 fi
-pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail"
+pkg_list="python-pip python3-pip python3-setuptools $android_tools chrpath cpio diffstat gawk libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev lz4 python-requests texinfo vim-tiny whiptail pigz zstd"
 if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
   echo "INFO: apt install error - try again in a moment"
   sleep 15
   sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
 fi
 
-# Install ruamel.yaml
-pip install --user --force-reinstall ruamel.yaml
+# Install ruamel.yaml==0.16.13
+pip install --user ruamel.yaml.clib==0.2.2
+pip install --user ruamel.yaml==0.16.13
 
 set -ex
 
@@ -41,14 +55,23 @@ export PATH=${HOME}/bin:${PATH}
 if [ ! -e ".repo/manifest.xml" ]; then
    repo init -u ${MANIFEST_URL} -b ${MANIFEST_BRANCH_PREFIX}${MANIFEST_BRANCH}
 
-   # link to shared downloads on persistent disk
-   # our builds config is expecting downloads and sstate-cache, here.
-   # DL_DIR = "${OEROOT}/sources/downloads"
-   # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
-   mkdir -p ${HOME}/srv/oe/downloads ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
-   mkdir -p build
-   ln -s ${HOME}/srv/oe/downloads
-   ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
+   # When set skip persistent disk space, useful for debug
+   if [ "${SKIP_PERSIST}" != "True" ]; then
+       # link to shared downloads on persistent disk
+       # our builds config is expecting downloads and sstate-cache, here.
+       # DL_DIR = "${OEROOT}/sources/downloads"
+       # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
+       mkdir -p ${HOME}/srv/oe/downloads-${MANIFEST_BRANCH} ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
+       mkdir -p build
+       ln -s ${HOME}/srv/oe/downloads-${MANIFEST_BRANCH} downloads
+       ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
+   fi
+fi
+
+
+if [ "${ghprbPullId}" ]; then
+    echo "Applying Github pull-request #${ghprbPullId} from ${ghprbGhRepository}"
+    sed -i -e "s|name=\"${ghprbGhRepository}\"|name=\"${ghprbGhRepository}\" revision=\"refs/pull/${ghprbPullId}/head\"|" .repo/manifests/default.xml
 fi
 
 repo sync
@@ -56,31 +79,60 @@ cp .repo/manifest.xml source-manifest.xml
 repo manifest -r -o pinned-manifest.xml
 MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
 
+# XXX: Disable manifest diff because at this moment link latest is not working so not latest pinned-manifest is available
 # record changes since last build, if available
-if wget -q ${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
-    repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
-else
+#if wget -q ${PUBLISH_SERVER}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
+#    # https://github.com/96boards/oe-rpb-manifest/commit/0be354483a124903982103dc937f9e5c1a094a3a
+#    if grep -q ".*linkfile.*\.\./\.\./\.repo/manifests/setup-environment" pinned-manifest-latest.xml ; then
+#	echo "detected old style symlink with relative path, skipping diff report"
+#    else
+#	repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+#    fi
+#else
     echo "latest build published does not have pinned-manifest.xml, skipping diff report"
+#fi
+
+if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; then
+    GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}"
+    cd `repo manifest | grep -ni $GERRIT_PROJECT\" | grep -Po 'path="\K[^"]*'`
+    if git pull ${GERRIT_URL} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then
+        git reset --hard
+        echo "Error: *** Error patch merge failed"
+        exit 1
+    fi
+    cd -
 fi
 
 # the setup-environment will create auto.conf and site.conf
 # make sure we get rid of old config.
 # let's remove the previous TMPDIR as well.
 # we want to preserve build/buildhistory though.
-rm -rf conf build/conf build/tmp-*glibc/
+rm -rf build/conf build/tmp-*glibc/
 
 # Accept EULA if/when needed
 export EULA_dragonboard410c=1
 export EULA_stih410b2260=1
 source setup-environment build
 
+# Support both pre-honister and honister+ override syntax
+if grep -q 'CONF_VERSION.*"1"' conf/local.conf ; then
+    BB_OVERRIDE='_'
+else
+    BB_OVERRIDE=':'
+fi
+
+# Accept freescale EULA
+cat << EOF >> conf/local.conf
+ACCEPT_FSL_EULA = "1"
+EOF
+
 # Add job BUILD_NUMBER to output files names
 cat << EOF >> conf/auto.conf
-IMAGE_NAME_append = "-${BUILD_NUMBER}"
-KERNEL_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-MODULE_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-DT_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
-BOOT_IMAGE_BASE_NAME_append = "-${BUILD_NUMBER}"
+IMAGE_NAME${BB_OVERRIDE}append = "-${BUILD_NUMBER}"
+KERNEL_IMAGE_NAME${BB_OVERRIDE}append = "-${BUILD_NUMBER}"
+MODULE_TARBALL_NAME${BB_OVERRIDE}append = "-${BUILD_NUMBER}"
+DT_IMAGE_BASE_NAME${BB_OVERRIDE}append = "-${BUILD_NUMBER}"
+BOOT_IMAGE_BASE_NAME${BB_OVERRIDE}append = "-${BUILD_NUMBER}"
 EOF
 
 # get build stats to make sure that we use sstate properly
@@ -88,16 +140,61 @@ cat << EOF >> conf/auto.conf
 INHERIT += "buildstats buildstats-summary"
 EOF
 
+# Make sure we don't use rm_work in CI slaves since they are non persistent build nodes
+cat << EOF >> conf/auto.conf
+INHERIT${BB_OVERRIDE}remove = "rm_work"
+EOF
+
+# allow the top level job to append to auto.conf
+if [ -f ${WORKSPACE}/auto.conf ]; then
+    cat ${WORKSPACE}/auto.conf >> conf/auto.conf
+fi
+
 # add useful debug info
 cat conf/{site,auto}.conf
 
 [ "${DISTRO}" = "rpb" ] && IMAGES+=" ${IMAGES_RPB}"
 [ "${DISTRO}" = "rpb-wayland" ] && IMAGES+=" ${IMAGES_RPB_WAYLAND}"
-[ "${MACHINE}" = "am57xx-evm" ] && IMAGES="rpb-console-image"
+
+# These machines only build the basic rpb-console-image
+case "${MACHINE}" in
+  am57xx-evm|intel-core2-32|intel-corei7-64)
+     IMAGES="rpb-console-image"
+     ;;
+esac
+
+# allow top level job to run a preprocessing command
+if [ -x ${WORKSPACE}/bitbake-pre ]; then
+    ${WORKSPACE}/bitbake-pre
+fi
 
 time bitbake ${IMAGES}
 
+# allow top level job to run a postprocessing command
+if [ -x ${WORKSPACE}/bitbake-post ]; then
+    ${WORKSPACE}/bitbake-post
+fi
+
+set +x
 DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
+set -x
+
+if [ "${BUILD_SDK}" ]; then
+  time bitbake ${BUILD_SDK} -c populate_sdk
+  set +x
+  SDK_DEPLOY=$(bitbake -e ${BUILD_SDK} -c populate_sdk | grep "^SDK_DEPLOY="| cut -d'=' -f2 | tr -d '"')
+  set -x
+
+  cp $SDK_DEPLOY/* $DEPLOY_DIR_IMAGE/
+fi
+
+# Get Kernel repo, branch and revision
+set +x
+KERNEL_ENV=$(bitbake -e virtual/kernel)
+KERNEL_REPO=$(echo "$KERNEL_ENV" | awk 'match($0, /^SRC_URI=(.*)/, a) {print a[1]}' | cut -d';' -f 1 | tr -d '"')
+KERNEL_BRANCH=$(echo "$KERNEL_ENV" | grep "^SRC_URI=" | awk 'match($0, /branch=(.*)/, a) {print a[1]}' | tr -d '"')
+KERNEL_COMMIT=$(echo "$KERNEL_ENV" | awk 'match($0, /^SRCREV=(.*)/, a) {print a[1]}' | tr -d '"')
+set -x
 
 # Prepare files to publish
 rm -f ${DEPLOY_DIR_IMAGE}/*.txt
@@ -105,16 +202,23 @@ find ${DEPLOY_DIR_IMAGE} -type l -delete
 mv /srv/oe/{source,pinned}-manifest.xml ${DEPLOY_DIR_IMAGE}
 cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
 
+# FIXME: IMAGE_FSTYPES_remove doesn't work
+rm -f ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4 \
+      ${DEPLOY_DIR_IMAGE}/*.rootfs.iso \
+      ${DEPLOY_DIR_IMAGE}/*.rootfs.wic \
+      ${DEPLOY_DIR_IMAGE}/*.iso \
+      ${DEPLOY_DIR_IMAGE}/*.stimg
+
 # FIXME: Sparse images here, until it gets done by OE
 case "${MACHINE}" in
   juno|stih410-b2260|orangepi-i96)
     ;;
   *)
-    for rootfs in ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4.gz; do
-      gunzip -k ${rootfs}
-      sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
+    for rootfs in $(find ${DEPLOY_DIR_IMAGE} -type f -name *.rootfs.ext4.gz); do
+      pigz -d -k ${rootfs}
+      sudo $simg_cmd ${rootfs%.gz} ${rootfs%.ext4.gz}.img
       rm -f ${rootfs%.gz}
-      gzip -9 ${rootfs%.ext4.gz}.img
+      pigz -9 ${rootfs%.ext4.gz}.img
     done
     ;;
 esac
@@ -149,18 +253,24 @@ EOF
 fi
 
 # Need different files for each machine
-BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | sort | xargs -r basename)
+BOOT_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "boot-*-${MACHINE}-*-${BUILD_NUMBER}*.img" | sort | head -n 1 | xargs -r basename)
 ROOTFS_EXT4_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename)
 ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
 ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
 ROOTFS_DESKTOP_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-desktop-image-test-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
-KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "uImage-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*Image-*-${MACHINE}-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+DISK_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "${IMAGES}-${MACHINE}-*-${BUILD_NUMBER}.rootfs.wic.gz" | xargs -r basename)
+
 case "${MACHINE}" in
   am57xx-evm)
     # LAVA image is too big for am57xx-evm
     ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
     # FIXME: several dtb files case
     ;;
+  intel-core2-32|intel-corei7-64)
+    # No LAVA testing on intel-core* machines
+    ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
+    ;;
   juno)
     # FIXME: several dtb files case
     ;;
@@ -170,19 +280,24 @@ case "${MACHINE}" in
 esac
 
 # Note: the main job script allows to override the default value for
-#       BASE_URL and PUB_DEST, typically used for OE RPB builds
+#       PUBLISH_SERVER and PUB_DEST, typically used for OE RPB builds
 cat << EOF > ${WORKSPACE}/post_build_lava_parameters
 DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
 MANIFEST_COMMIT=${MANIFEST_COMMIT}
-BOOT_URL=${BASE_URL}${PUB_DEST}/${BOOT_IMG}
-ROOTFS_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_EXT4_IMG}
-ROOTFS_SPARSE_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_IMG}
-ROOTFS_DESKTOP_SPARSE_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_DESKTOP_IMG}
-SYSTEM_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_EXT4_IMG}
-KERNEL_URL=${BASE_URL}${PUB_DEST}/${KERNEL_IMG}
-DTB_URL=${BASE_URL}${PUB_DEST}/${DTB_IMG}
-NFSROOTFS_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_TARXZ_IMG}
-RECOVERY_IMAGE_URL=${BASE_URL}${PUB_DEST}/juno-oe-uboot.zip
+BOOT_URL=${PUBLISH_SERVER}${PUB_DEST}/${BOOT_IMG}
+ROOTFS_BUILD_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_EXT4_IMG}
+ROOTFS_SPARSE_BUILD_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_IMG}
+ROOTFS_DESKTOP_SPARSE_BUILD_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_DESKTOP_IMG}
+SYSTEM_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_EXT4_IMG}
+KERNEL_URL=${PUBLISH_SERVER}${PUB_DEST}/${KERNEL_IMG}
+DTB_URL=${PUBLISH_SERVER}${PUB_DEST}/${DTB_IMG}
+NFSROOTFS_URL=${PUBLISH_SERVER}${PUB_DEST}/${ROOTFS_TARXZ_IMG}
+RECOVERY_IMAGE_URL=${PUBLISH_SERVER}${PUB_DEST}/juno-oe-uboot.zip
 LXC_BOOT_IMG=${BOOT_IMG}
 LXC_ROOTFS_IMG=$(basename ${ROOTFS_IMG} .gz)
+INITRD_URL="${INITRD_URL}"
+KERNEL_ARGS=""
+KERNEL_REPO=$KERNEL_REPO
+KERNEL_BRANCH=$KERNEL_BRANCH
+KERNEL_COMMIT=$KERNEL_COMMIT
 EOF
diff --git a/rpb-openembedded/buildinfo-protected.sh b/rpb-openembedded/buildinfo-protected.sh
new file mode 100755
index 0000000000..bc43a08643
--- /dev/null
+++ b/rpb-openembedded/buildinfo-protected.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+cat > ${WORKSPACE}/BUILD-INFO.txt << EOF
+Format-Version: 0.5
+
+Files-Pattern: *
+License-Type: protected
+Auth-Groups: ${AUTH_GROUPS}
+EOF
diff --git a/rpb-openembedded/device_type.sh b/rpb-openembedded/device_type.sh
new file mode 100755
index 0000000000..b138cc81f4
--- /dev/null
+++ b/rpb-openembedded/device_type.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+# Mapping for MACHINE -> DEVICE_TYPE
+case "${MACHINE}" in
+  am57xx-evm)
+    DEVICE_TYPE=x15
+    ;;
+  hikey)
+    DEVICE_TYPE=hi6220-hikey-r2
+    ;;
+  intel-core2-32)
+    DEVICE_TYPE=i386
+    ;;
+  intel-corei7-64)
+    DEVICE_TYPE=x86
+    ;;
+  juno)
+    DEVICE_TYPE=juno
+    ;;
+  stih410-b2260)
+    DEVICE_TYPE=b2260
+    ;;
+  *)
+    echo "Skip DEVICE_TYPE for ${MACHINE}"
+    ;;
+esac
+
+echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
diff --git a/rpb-openembedded/lava-job-definitions/dragonboard-410c/template-boot.yaml b/rpb-openembedded/lava-job-definitions/dragonboard-410c/template-boot.yaml
index 30e37d5123..afb8811b83 100644
--- a/rpb-openembedded/lava-job-definitions/dragonboard-410c/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/dragonboard-410c/template-boot.yaml
@@ -59,21 +59,12 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r27.0.0-linux.zip
-          - unzip platform-tools_r27.0.0-linux.zip > /dev/null
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2700
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r27.0.0-linux.zip'
 
 - test:
     namespace: tlxc
diff --git a/rpb-openembedded/lava-job-definitions/hi6220-hikey-r2/template-boot.yaml b/rpb-openembedded/lava-job-definitions/hi6220-hikey-r2/template-boot.yaml
new file mode 100644
index 0000000000..44ccc4137e
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/hi6220-hikey-r2/template-boot.yaml
@@ -0,0 +1,97 @@
+device_type: ${DEVICE_TYPE}
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+priority: medium
+visibility: public
+
+context:
+  test_character_delay: 10
+  kernel_start_message: "EFI stub: Using DTB from configuration table"
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-oe
+    template: debian
+    distribution: debian
+    release: stretch
+
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - adb
+    - fastboot
+    os: debian
+
+- boot:
+    namespace: tlxc
+    prompts:
+    - 'root@(.*):/#'
+    - 'hikey:/'
+    timeout:
+      minutes: 5
+    method: lxc
+
+- deploy:
+    timeout:
+      minutes: 15
+    to: fastboot
+    namespace: rpb-hikey
+    connection: lxc
+    images:
+      ptable:
+        url: http://images.validation.linaro.org/builds.96boards.org/snapshots/reference-platform/components/uefi-staging/49/hikey/release/ptable-linux-8g.img
+        reboot: hard-reset
+      boot:
+        url: ${BOOT_URL}
+        reboot: hard-reset
+      system:
+        url: ${ROOTFS_SPARSE_BUILD_URL}
+        compression: gz
+        apply-overlay: true
+    os: oe
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+
+- boot:
+    namespace: rpb-hikey
+    auto_login:
+      login_prompt: 'login:'
+      username: linaro
+      login_commands:
+        # Become super user to run tests
+        - su
+    prompts:
+    - 'hikey:~'
+    - 'root@(.*):(.*)#'
+    timeout:
+      minutes: 5
+    method: grub
+    commands: installed
+    protocols:
+      lava-lxc:
+      - action: grub-sequence-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/hi6220-hikey/template-boot.yaml b/rpb-openembedded/lava-job-definitions/hi6220-hikey/template-boot.yaml
deleted file mode 100644
index 99bced8cce..0000000000
--- a/rpb-openembedded/lava-job-definitions/hi6220-hikey/template-boot.yaml
+++ /dev/null
@@ -1,118 +0,0 @@
-device_type: ${DEVICE_TYPE}
-job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
-
-timeouts:
-  job:
-    minutes: 60
-  action:
-    minutes: 10
-  connection:
-    minutes: 2
-priority: medium
-visibility: public
-
-context:
-  test_character_delay: 10
-
-protocols:
-  lava-lxc:
-    name: lxc-hikey-oe
-    template: debian
-    distribution: debian
-    release: stretch
-
-actions:
-- deploy:
-    namespace: tlxc
-    timeout:
-      minutes: 15
-    to: lxc
-    packages:
-    - wget
-    - unzip
-    os: debian
-
-- boot:
-    namespace: tlxc
-    prompts:
-    - 'root@(.*):/#'
-    - 'hikey:/'
-    timeout:
-      minutes: 5
-    method: lxc
-
-- test:
-    namespace: tlxc
-    timeout:
-      minutes: 10
-    definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r27.0.0-linux.zip
-          - unzip platform-tools_r27.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
-
-- deploy:
-    timeout:
-      minutes: 15
-    to: fastboot
-    namespace: rpb-hikey
-    connection: lxc
-    images:
-      ptable:
-        url: http://releases.linaro.org/reference-platform/embedded/hikey/16.12/rpb/bootloader/ptable-linux-8g.img
-        reboot: hard-reset
-      boot:
-        url: ${BOOT_URL}
-        reboot: hard-reset
-      system:
-        url: ${ROOTFS_SPARSE_BUILD_URL}
-        compression: gz
-        apply-overlay: true
-    os: oe
-    protocols:
-      lava-lxc:
-      - action: fastboot-deploy
-        request: pre-power-command
-        timeout:
-          minutes: 2
-
-- boot:
-    namespace: rpb-hikey
-    auto_login:
-      login_prompt: 'login:'
-      username: linaro
-      login_commands:
-        # Become super user to run tests
-        - su
-    prompts:
-    - 'hikey:~'
-    - 'root@(.*):(.*)#'
-    timeout:
-      minutes: 5
-    method: uefi-menu
-    commands: fastboot
-    protocols:
-      lava-lxc:
-      # other action could be boot-fastboot
-      - action: uefi-commands
-        request: pre-os-command
-        timeout:
-          minutes: 2
-
-metadata:
-  machine: ${MACHINE}
-  manifest branch: ${MANIFEST_BRANCH}
-  manifest commit: ${MANIFEST_COMMIT}
-  build url: ${BUILD_URL}
-  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/hi6220-hikey/template.yaml b/rpb-openembedded/lava-job-definitions/hi6220-hikey/template.yaml
deleted file mode 100644
index e3271dae92..0000000000
--- a/rpb-openembedded/lava-job-definitions/hi6220-hikey/template.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-actions:
-- command: deploy_linaro_android_image
-  parameters:
-    images:
-    - partition: 'ptable'
-      url: 'http://releases.linaro.org/96boards/archive/reference-platform/debian/hikey/16.03/bootloader/ptable-linux-8g.img'
-    - partition: 'boot'
-      url: '${BOOT_URL}'
-    - partition: 'system'
-      url: '${SYSTEM_URL}'
-    target_type: 'ubuntu'
-- command: boot_linaro_image
-- command: submit_results
-  parameters:
-    server: 'http://${LAVA_SERVER}'
-    stream: '${BUNDLE_STREAM_NAME}'
-device_type: '${DEVICE_TYPE}'
-job_name: '${BUILD_URL}'
-timeout: 18000
diff --git a/rpb-openembedded/lava-job-definitions/i386/template-boot.yaml b/rpb-openembedded/lava-job-definitions/i386/template-boot.yaml
new file mode 100644
index 0000000000..abf73e6829
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/i386/template-boot.yaml
@@ -0,0 +1,58 @@
+device_type: ${DEVICE_TYPE}
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 45
+  action:
+    minutes: 10
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  test_character_delay: 10
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-oe
+    template: debian
+    distribution: debian
+    release: stretch
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tftp
+    kernel:
+      url: ${KERNEL_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_URL}
+      compression: xz
+    os: oe
+- boot:
+    namespace: target
+    timeout:
+      minutes: 10
+    method: ipxe
+    commands: nfs
+    parameters:
+      shutdown-message: 'reboot: Restarting system'
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      login_commands:
+      - su
+    prompts:
+    - 'root@intel-core2-32:'
+    - 'root@intel-corei7-64:'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/juno/template-boot.yaml b/rpb-openembedded/lava-job-definitions/juno/template-boot.yaml
index 1303de5a70..6123de18c5 100644
--- a/rpb-openembedded/lava-job-definitions/juno/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/juno/template-boot.yaml
@@ -7,16 +7,16 @@ timeouts:
   action:
     minutes: 5
   actions:
-    u-boot-interrupt:
+    bootloader-interrupt:
       seconds: 120
-    u-boot-commands:
+    bootloader-commands:
       seconds: 120
     uboot-retry:
       seconds: 180
   connections:
-    u-boot-interrupt:
+    bootloader-interrupt:
       seconds: 120
-    u-boot-commands:
+    bootloader-commands:
       seconds: 120
     uboot-retry:
       seconds: 180
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml
new file mode 100644
index 0000000000..5c2c68bf71
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemuarm/template-boot.yaml
@@ -0,0 +1,79 @@
+device_type: qemu
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 55
+  action:
+    minutes: 25
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+ 
+context:
+  arch: arm
+  netdevice: tap
+  machine: virt,highmem=off
+  cpu: cortex-a15
+  guestfs_interface: virtio
+  extra_kernel_args: \"${KERNEL_ARGS}\"
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      bios:
+        image_arg: '-bios {bios}'
+        url: https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-ARM-RELEASE-111bbcf87621
+      rootfs:
+        image_arg: -drive id=disk0,file={rootfs},if=none,format=raw -device virtio-blk-device,drive=disk0 -m 1024 -nographic
+        url: ${EXT4_IMAGE_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      kernel:
+        image_arg: -kernel {kernel} --append "console=ttyAMA0 root=/dev/vda rw"
+        url: ${KERNEL_URL}
+        type: image
+    os: oe
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 10
+    method: qemu
+    media: tmpfs
+    expect_shell: False
+    boot_finished:
+     - 'reboot: Restarting system'
+     - 'reboot: System halted'
+     - 'Requesting system halt'
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 25
+    method: qemu
+    media: tmpfs
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: "Password:"
+      password: ledge
+      login_commands:
+        - sudo -s
+    prompts:
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml
new file mode 100644
index 0000000000..b3a1565d17
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemuarm64/template-boot.yaml
@@ -0,0 +1,79 @@
+device_type: qemu
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 55
+  action:
+    minutes: 25
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  arch: arm64
+  netdevice: tap
+  machine: virt
+  cpu: cortex-a57
+  guestfs_interface: virtio
+  extra_kernel_args: \"${KERNEL_ARGS}\"
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      bios:
+        image_arg: '-bios {bios}'
+        url: https://storage.kernelci.org/images/uefi/111bbcf87621/QEMU_EFI.fd-AARCH64-RELEASE-111bbcf87621
+      rootfs:
+        image_arg: -drive id=disk0,file={rootfs},if=none,format=raw -device virtio-blk-device,drive=disk0 -m 4096 -smp 4 -nographic
+        url: ${EXT4_IMAGE_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      kernel:
+        image_arg: -kernel {kernel} --append "console=ttyAMA0 root=/dev/vda rw"
+        url: ${KERNEL_URL}
+        type: image
+    os: oe
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 10
+    method: qemu
+    media: tmpfs
+    expect_shell: False
+    boot_finished:
+     - 'reboot: Restarting system'
+     - 'reboot: System halted'
+     - 'Requesting system halt'
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 25
+    method: qemu
+    media: tmpfs
+    auto_login:
+      login_prompt: 'login::'
+      username: ledge
+      password_prompt: "Password:"
+      password: ledge
+      login_commands:
+        - sudo -s
+    prompts:
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml
new file mode 100644
index 0000000000..2d9cf3bd4b
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemuarm64_atf_fip/template-boot.yaml
@@ -0,0 +1,78 @@
+device_type: qemu
+job_name: LEDGE RPB OE atf optee uboot boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 60
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  arch: aarch64
+  machine: virt,secure=on
+  cpu: cortex-a57
+  guestfs_interface: virtio
+  netdevice: user
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      1rootfs:
+        image_arg: -drive id=disk1,file={1rootfs},if=none,format=raw -device virtio-blk-device,drive=disk1
+          -nographic -device i6300esb,id=watchdog0 -m 2048 -smp 4
+        url: ${SYSTEM_URL} 
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      2certs:
+        image_arg: -drive id=disk0,file={2certs},if=none,format=raw -device virtio-blk-device,drive=disk0
+        url: ${CERTS_URL}
+      3bios:
+        image_arg: -drive if=pflash,unit=0,readonly=off,file={3bios},format=raw
+        url: ${FIRMWARE_URL}
+    os: oe
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 60
+    method: qemu
+    media: tmpfs
+    docker:
+      image:  linaro/ci-amd64-ledge:stable
+      binary: /usr/bin/qemu-system-aarch64
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: 'Password:'
+      password: ledge
+      login_commands:
+      - sudo -s
+    prompts:
+    - 'ledge-.*:~\$$'
+    - 'ledge-qemuarm64:/(.*)#'
+
+- test:
+    namespace: target
+    timeout:
+      minutes: 15
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/fwts/fwts.yaml
+      name: fwts-unit-tests
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml
new file mode 100644
index 0000000000..4e99992e48
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemuarm64uefi/template-boot.yaml
@@ -0,0 +1,82 @@
+device_type: qemu
+job_name: LEDGE RPB OE edk2 boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 55
+  action:
+    minutes: 25
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  arch: aarch64
+  netdevice: user
+  machine: virt
+  cpu: cortex-a57
+  guestfs_interface: virtio
+  extra_options:
+  - -m 2048
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      1rootfs:
+        image_arg: -drive id=disk1,file={1rootfs},if=none,format=raw -device virtio-blk-device,drive=disk1
+          -smp 4 -serial stdio -nographic -device i6300esb,id=watchdog0
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      2certs:
+        image_arg: -drive id=disk0,file={2certs},if=none,format=raw -device virtio-blk-device,drive=disk0
+        url: ${CERTS}
+      3bios:
+        image_arg: -pflash {3bios}
+        url: ${FIRMWARE_EDK2}
+      4efivars:
+        image_arg: -pflash {4efivars}
+        url: ${FIRMWARE_EDK2_VARS}
+    os: oe
+- boot:
+    namespace: target
+    timeout:
+      minutes: 60
+    method: qemu
+    media: tmpfs
+    docker:
+      image: linaro/ci-amd64-ledge:stable
+      binary: /usr/bin/qemu-system-aarch64
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: 'Password:'
+      password: ledge
+      login_commands:
+      - sudo -s
+    prompts:
+    - ledge-.*:~\$$
+    - ledge-qemuarm64:/(.*)#
+
+- test:
+    namespace: target
+    timeout:
+      minutes: 15
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/fwts/fwts.yaml
+      name: fwts-unit-tests
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarm_atf_fip/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarm_atf_fip/template-boot.yaml
new file mode 100644
index 0000000000..8b466f4560
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemuarm_atf_fip/template-boot.yaml
@@ -0,0 +1,78 @@
+device_type: qemu
+job_name: LEDGE RPB OE atf optee uboot boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 75
+  action:
+    minutes: 65
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  arch: arm64
+  machine: virt,secure=on
+  cpu: cortex-a15
+  guestfs_interface: virtio
+  netdevice: user
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      0bios:
+        image_arg: -bios {0bios} -d unimp
+        url: ${FIRMWARE_URL}
+      1rootfs:
+        image_arg: -drive id=disk1,file={1rootfs},if=none,format=raw -device virtio-blk-device,drive=disk1
+          -smp 4 -nographic -device i6300esb,id=watchdog0
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      2certs:
+        image_arg: -drive id=disk0,file={2certs},if=none,format=raw -device virtio-blk-device,drive=disk0
+        url: ${CERTS_URL}
+    os: oe
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 60
+    method: qemu
+    media: tmpfs
+    docker:
+      image: linaro/ci-amd64-ledge:stable
+      binary: /usr/bin/qemu-system-arm
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: 'Password:'
+      password: ledge
+      login_commands:
+      - sudo -s
+    prompts:
+    - 'ledge-.*:~\$$'
+    - 'ledge-qemuarm:/(.*)#'
+
+- test:
+    namespace: target
+    timeout:
+      minutes: 15
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/fwts/fwts.yaml
+      name: fwts-unit-tests
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml
new file mode 100644
index 0000000000..296ebbe29d
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemuarmuefi/template-boot.yaml
@@ -0,0 +1,81 @@
+device_type: qemu
+job_name: LEDGE RPB OE arm edk2 boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 60
+  action:
+    minutes: 60
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+ 
+context:
+  arch: arm
+  machine: virt
+  cpu: cortex-a15
+  guestfs_interface: virtio
+  netdevice: user
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      1rootfs:
+        image_arg: -drive id=disk1,file={1rootfs},if=none,format=raw -device virtio-blk-device,drive=disk1
+          -smp 4 -serial stdio -nographic -device i6300esb,id=watchdog0
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      2certs:
+        image_arg: -drive id=disk0,file={2certs},if=none,format=raw -device virtio-blk-device,drive=disk0
+        url: ${CERTS}
+      3bios:
+        image_arg: -pflash {3bios}
+        url: ${FIRMWARE_EDK2}
+      4efivars:
+        image_arg: -pflash {4efivars}
+        url: ${FIRMWARE_EDK2_VARS}
+    os: oe
+- boot:
+    namespace: target
+    timeout:
+      minutes: 60
+    method: qemu
+    media: tmpfs
+    docker:
+      image: linaro/ci-amd64-ledge:stable
+      binary: /usr/bin/qemu-system-arm
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: 'Password:'
+      password: ledge
+      login_commands:
+      - sudo -s
+    prompts:
+    - ledge-.*:~\$$
+    - ledge-qemuarm:/(.*)#
+
+
+- test:
+    namespace: target
+    timeout:
+      minutes: 15
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/fwts/fwts.yaml
+      name: fwts-unit-tests
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml
new file mode 100644
index 0000000000..d00fdfef75
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/qemux86_64uefi/template-boot.yaml
@@ -0,0 +1,73 @@
+device_type: qemu
+job_name: LEDGE RPB OE edk2 boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 55
+  action:
+    minutes: 25
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  arch: x86_64
+  netdevice: user
+  guestfs_interface: virtio
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tmpfs
+    images:
+      rootfs:
+        image_arg: -drive id=disk0,file={rootfs},format=raw
+          -m 2048 -smp 4 -serial mon:stdio -object rng-random,filename=/dev/urandom,id=rng0 -device virtio-rng-pci,rng=rng0 -device i6300esb,id=watchdog0
+        url: ${SYSTEM_URL}
+        compression: gz
+        apply-overlay: true
+        sparse: false
+      bios:
+        image_arg: -drive if=pflash,format=raw,file={bios}
+        url: ${FIRMWARE_EDK2}
+    os: oe
+
+- boot:
+    namespace: target
+    timeout:
+      minutes: 60
+    method: qemu
+    media: tmpfs
+    docker:
+      image: linaro/ci-amd64-ledge:stable
+      binary: /usr/bin/qemu-system-x86_64
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: 'Password:'
+      password: ledge
+      login_commands:
+      - sudo -s
+    prompts:
+    - ledge-.*:~\$$
+    - ledge-qemux86-64:/(.*)#
+
+- test:
+    namespace: target
+    timeout:
+      minutes: 15
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/fwts/fwts.yaml
+      name: fwts-unit-tests
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml b/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
new file mode 100644
index 0000000000..587b48ea4d
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/stm32mp157c-dk2/template-boot.yaml
@@ -0,0 +1,66 @@
+device_type: ${DEVICE_TYPE}
+job_name: LEDGE RP ${DEVICE_TYPE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 95
+  action:
+    minutes: 60
+  connection:
+    minutes: 5
+
+priority: medium
+visibility: public
+
+context:
+  test_character_delay: 10
+
+actions:
+- deploy:
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      tarball:
+        url: ${STM32_FLASH_IMAGE_URL}
+      layout:
+        url: ${STM32_FLASH_IMAGE_LAYOUT}
+    os: oe
+
+- boot:
+    timeout:
+      minutes: 25
+    method: minimal
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: "Password:"
+      password: ledge
+      login_commands:
+      - sudo -s
+    prompts:
+    - 'ledge@debian:~#'
+    - '/ #'
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
+
+    transfer_overlay:
+      download_command: /sbin/udhcpc -i eth0; cd /tmp ; wget
+      unpack_command: tar -C / -xzf
+
+- test:
+    timeout:
+        minutes: 45
+    definitions:
+        - repository: https://git.linaro.org/ledge/lava-test-definitions.git
+          from: git
+          path: ledge/tpm2-test.yaml
+          name: TPMv2-testsuite
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml b/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml
new file mode 100644
index 0000000000..a139857cb9
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/synquacer/template-boot.yaml
@@ -0,0 +1,74 @@
+device_type: ${DEVICE_TYPE}
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 45
+  action:
+    minutes: 10
+  connection:
+    minutes: 20
+
+priority: medium
+visibility: public
+
+context:
+  test_character_delay: 10
+
+actions:
+- deploy:
+    timeout:
+      minutes: 15
+    to: tftp
+    kernel:
+      url: ${KERNEL_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_URL}
+      compression: xz
+    os: oe
+
+- boot:
+    role:
+        - developerbox
+    timeout:
+        minutes: 90
+    method: grub
+    parameters:
+        shutdown-message: "reboot: Restarting system"
+    commands:
+        - insmod efinet
+        - net_ls_addr
+        - 'linux (tftp,{SERVER_IP})/{KERNEL}  root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 ip=dhcp'
+        - clear
+        - boot
+    expect_shell: false
+    boot_finished:
+     - 'reboot: Restarting system'
+     - 'reboot: System halted'
+     - Requesting system halt
+- boot:
+    role:
+    - developerbox
+    timeout:
+      minutes: 90
+    method: grub
+    parameters:
+      shutdown-message: 'reboot: Restarting system'
+    commands:
+    - insmod efinet
+    - net_ls_addr
+    - linux (tftp,{SERVER_IP})/{KERNEL}  root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3
+      ip=dhcp
+    - clear
+    - boot
+    prompts:
+    - 'ledge-(.*)# '
+    - 'ledge-(.*)~: '
+    - 'ledge-.*:~\$$'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml b/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml
new file mode 100644
index 0000000000..638f8e421f
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/x15-bl_uefi/template-boot.yaml
@@ -0,0 +1,59 @@
+device_type: x15-bl
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 161
+  action:
+    minutes: 25
+  connection:
+    minutes: 2
+context:
+  test_character_delay: 10
+priority: 25
+visibility: public
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 10
+    to: flasher
+    images:
+      IMAGE:
+        url: ${SYSTEM_URL}
+        compression: gz
+- boot:
+    timeout:
+      minutes: 20
+    namespace: target
+    method: minimal
+    expect_shell: False
+    boot_finished:
+     - 'reboot: Restarting system'
+     - 'reboot: System halted'
+     - 'Requesting system halt'
+
+- boot:
+    timeout:
+      minutes: 25
+    namespace: target
+    method: minimal
+    auto_login:
+      login_prompt: 'login:'
+      username: ledge
+      password_prompt: "Password:"
+      password: ledge
+      login_commands:
+        - sudo -s
+
+    prompts:
+    - 'ledge-.*:~\$$'
+    - 'ledge-ti-am572x:/(.*)#'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/lava-job-definitions/x15/template-boot.yaml b/rpb-openembedded/lava-job-definitions/x15/template-boot.yaml
index 21d06a0ddc..f3466ab48a 100644
--- a/rpb-openembedded/lava-job-definitions/x15/template-boot.yaml
+++ b/rpb-openembedded/lava-job-definitions/x15/template-boot.yaml
@@ -45,21 +45,12 @@ actions:
     timeout:
       minutes: 10
     definitions:
-    - from: inline
-      name: install-google-fastboot
-      path: inline/install-google-fastboot.yaml
-      repository:
-        metadata:
-          format: Lava-Test Test Definition 1.0
-          name: install-fastboot
-          description: "Install fastboot provided by google"
-        run:
-          steps:
-          - wget https://dl.google.com/android/repository/platform-tools_r27.0.0-linux.zip
-          - unzip platform-tools_r27.0.0-linux.zip
-          - ln -s `pwd`/platform-tools/fastboot /usr/bin/fastboot
-          - ln -s `pwd`/platform-tools/adb /usr/bin/adb
-          - fastboot --version
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2700
+      parameters:
+        LINK: 'https://dl.google.com/android/repository/platform-tools_r27.0.0-linux.zip'
 
 - deploy:
     timeout:
diff --git a/rpb-openembedded/lava-job-definitions/x86/template-boot.yaml b/rpb-openembedded/lava-job-definitions/x86/template-boot.yaml
new file mode 100644
index 0000000000..f62563c5c1
--- /dev/null
+++ b/rpb-openembedded/lava-job-definitions/x86/template-boot.yaml
@@ -0,0 +1,62 @@
+device_type: ${DEVICE_TYPE}
+job_name: RPB OE boot ${MACHINE} ${MANIFEST_BRANCH} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 45
+  action:
+    minutes: 25
+  connection:
+    minutes: 2
+priority: 25
+visibility: public
+
+context:
+  test_character_delay: 10
+  extra_kernel_args: ${KERNEL_ARGS}
+
+protocols:
+  lava-lxc:
+    name: lxc-hikey-oe
+    template: debian
+    distribution: debian
+    release: stretch
+
+actions:
+- deploy:
+    namespace: target
+    timeout:
+      minutes: 15
+    to: tftp
+    kernel:
+      url: ${KERNEL_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_URL}
+      compression: xz
+    os: oe
+- boot:
+    namespace: target
+    timeout:
+      minutes: 10
+    method: ipxe
+    commands: nfs
+    parameters:
+      shutdown-message: 'reboot: Restarting system'
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      login_commands:
+      - su
+    prompts:
+    - 'root@intel-core2-32:'
+    - 'root@intel-corei7-64:'
+    - 'root@ledge-qemux86-64:~#'
+    - 'root@(.*):(.*)/#'
+    - '~ #'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${BASE_URL}${PUB_DEST}
diff --git a/rpb-openembedded/postbuild.groovy b/rpb-openembedded/postbuild.groovy
new file mode 100644
index 0000000000..ad1437f5bd
--- /dev/null
+++ b/rpb-openembedded/postbuild.groovy
@@ -0,0 +1,8 @@
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+  def publish_server = manager.envVars["PUBLISH_SERVER"]
+  def pub_dest = manager.envVars["PUB_DEST"]
+
+  def desc = "&nbsp;<a href='${publish_server}${pub_dest}'>Build location</a><br />"
+
+  manager.build.setDescription(desc)
+}
diff --git a/rpb-openembedded/publishers-lhg.sh b/rpb-openembedded/publishers-lhg.sh
deleted file mode 100755
index 5c9dcae04f..0000000000
--- a/rpb-openembedded/publishers-lhg.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-cat > ${WORKSPACE}/BUILD-INFO.txt << EOF
-Format-Version: 0.5
-
-Files-Pattern: *
-License-Type: protected
-Auth-Groups: playready-confidential-access
-EOF
-
-# Publish
-test -d ${HOME}/bin || mkdir ${HOME}/bin
-wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-  --server ${PUBLISH_SERVER} \
-  --build-info ${WORKSPACE}/BUILD-INFO.txt \
-  ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-time python ${HOME}/bin/linaro-cp.py \
-  --server ${PUBLISH_SERVER} \
-  --make-link \
-  $(dirname ${PUB_DEST})
diff --git a/rpb-openembedded/publishers.sh b/rpb-openembedded/publishers.sh
index e7b6a74f92..ba9df1e935 100755
--- a/rpb-openembedded/publishers.sh
+++ b/rpb-openembedded/publishers.sh
@@ -1,12 +1,40 @@
 #!/bin/bash
 
+set -ex
+
+if [ -f ${WORKSPACE}/BUILD-INFO.txt ];then
+    BUILD_INFO="--build-info ${WORKSPACE}/BUILD-INFO.txt"
+else
+    BUILD_INFO=""
+fi
+
+if [ -z "${DEPLOY_DIR_IMAGE}" ] || [ -z "${PUB_DEST}" ]
+then
+    echo "== missing publishing variables =="
+    echo "DEPLOY_DIR_IMAGE = ${DEPLOY_DIR_IMAGE}"
+    echo "PUB_DEST         = ${PUB_DEST}"
+    exit 1
+fi
+
 # Publish
 test -d ${HOME}/bin || mkdir ${HOME}/bin
 wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-time python ${HOME}/bin/linaro-cp.py \
-  --server ${PUBLISH_SERVER} \
-  ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-time python ${HOME}/bin/linaro-cp.py \
-  --server ${PUBLISH_SERVER} \
-  --make-link \
-  $(dirname ${PUB_DEST})
+time python3 ${HOME}/bin/linaro-cp.py \
+     ${BUILD_INFO} \
+     ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
+
+# Some (most?) of our OE jobs publish images in a $DISTRO subfolder, so we need
+# to strip the folder when we create the 'latest' link
+# However some job, build a single distro, and there is no such subfolder, in which
+# case we want to link to use PUB_DEST directly.
+
+# Warning. Bashism here. But we use bash, so.. use Bash regexp to catch if PUB_DEST
+# ends with BUILD_NUMBER or not, and we catch trailing '/' just in case it's there
+
+if [[ "$PUB_DEST" =~ ^.*/${BUILD_NUMBER}/?$ ]]; then
+    time python3 ${HOME}/bin/linaro-cp.py \
+         --make-link ${PUB_DEST}
+else
+    time python3 ${HOME}/bin/linaro-cp.py \
+         --make-link $(dirname ${PUB_DEST})
+fi
diff --git a/rpb-openembedded/submit_for_testing.sh b/rpb-openembedded/submit_for_testing.sh
index 1d653cc3de..2156646390 100755
--- a/rpb-openembedded/submit_for_testing.sh
+++ b/rpb-openembedded/submit_for_testing.sh
@@ -1,7 +1,18 @@
 #!/bin/bash
 
+[ -z "${KSELFTEST_PATH}" ] && export KSELFTEST_PATH="/opt/kselftests/mainline/"
+[ -z "${LAVA_JOB_PRIORITY}" ] && export LAVA_JOB_PRIORITY="25"
+[ -z "${SANITY_LAVA_JOB_PRIORITY}" ] && export SANITY_LAVA_JOB_PRIORITY="30"
+[ -z "${SKIP_LAVA}" ] || unset DEVICE_TYPE
+[ -z "${QA_SERVER_TEAM}" ] && export QA_SERVER_TEAM=rpb
+[ -z "${TOOLCHAIN}" ] && export TOOLCHAIN="unknown"
+[ -z "${TDEFINITIONS_REVISION}" ] && export TDEFINITIONS_REVISION="kselftest-5.1"
+[ -z "${MANIFEST_COMMIT}" ] && export MANIFEST_COMMIT="HEAD"
+
 rm -rf configs
 git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+# for manual run from current directory
+#git clone --depth 1 . configs
 
 # Used by DB410C's template:
 export RESIZE_ROOTFS=${RESIZE_ROOTFS:-}
diff --git a/rpb-uefi-staging.yaml b/rpb-uefi-staging.yaml
deleted file mode 100644
index 37099af6b9..0000000000
--- a/rpb-uefi-staging.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-- job:
-    name: 96boards-reference-uefi-staging
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: EDK2_VERSION
-            default: 'origin/release-prep'
-        - string:
-            name: ATF_VERSION
-            default: 'v1.4'
-        - string:
-            name: OPTEE_VERSION
-            default: '2.6.0'
-    disabled: false
-    node: master
-    child-workspace: .
-    display-name: 'Reference Platform - UEFI (staging)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MX_PLATFORM
-            values:
-                - hikey
-                - hikey960
-        - axis:
-            type: user-defined
-            name: MX_TYPE
-            values:
-                - RELEASE
-                - DEBUG
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrapper:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - shell:
-            !include-raw: rpb-uefi/staging/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/${BUILD_TYPE}/BUILD-INFO.txt \
-              out/${BUILD_TYPE} 96boards/reference-platform/components/uefi-staging/${BUILD_NUMBER}/${BUILD_TYPE}/${MX_PLATFORM}/
-            python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --make-link 96boards/reference-platform/components/uefi-staging/${BUILD_NUMBER}
-    publishers:
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, qa-team@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-uefi.yaml b/rpb-uefi.yaml
deleted file mode 100644
index 60bcf645c2..0000000000
--- a/rpb-uefi.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-- job:
-    name: 96boards-reference-uefi
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    parameters:
-        - string:
-            name: EDK2_VERSION
-            default: 'HEAD'
-        - string:
-            name: ATF_VERSION
-            default: 'v1.3'
-        - string:
-            name: OPTEE_VERSION
-            default: '2.4.0'
-    disabled: false
-    node: master
-    child-workspace: .
-    display-name: 'Reference Platform - UEFI'
-    axes:
-        - axis:
-            type: user-defined
-            name: MX_PLATFORM
-            values:
-                - hikey
-        - axis:
-            type: user-defined
-            name: MX_TYPE
-            values:
-                - RELEASE
-                - DEBUG
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-rp
-    execution-strategy:
-        sequential: false
-    wrapper:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - shell:
-            !include-raw: rpb-uefi/stable/builders.sh
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --build-info out/${BUILD_TYPE}/BUILD-INFO.txt \
-              out/${BUILD_TYPE} 96boards/reference-platform/components/uefi/${BUILD_NUMBER}/${BUILD_TYPE}/${MX_PLATFORM}/
-            python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --make-link 96boards/reference-platform/components/uefi/${BUILD_NUMBER}
-    publishers:
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, qa-team@linaro.org'
-            always: true
-            matrix-trigger: only-parent
diff --git a/rpb-uefi/stable/builders.sh b/rpb-uefi/stable/builders.sh
deleted file mode 100755
index b67c401059..0000000000
--- a/rpb-uefi/stable/builders.sh
+++ /dev/null
@@ -1,179 +0,0 @@
-#!/bin/bash
-
-export JOB_NAME=96boards-reference-uefi
-echo "JOB_URL: ${JOB_URL}"
-echo "BUILD_URL: ${BUILD_URL}"
-echo "WORKSPACE: ${WORKSPACE}"
-echo "BUILD_NUMBER: ${BUILD_NUMBER}"
-
-# Create lower case debug/release string for use in paths
-BUILD_TYPE="${MX_TYPE,,}"
-
-sudo apt-get update
-sudo apt-get install -y libssl-dev nasm python-requests python-crypto python-wand zip
-
-set -ex
-
-trap cleanup_exit INT TERM EXIT
-
-cleanup_exit()
-{
-    cd ${WORKSPACE}
-    rm -rf arm-trusted-firmware
-    rm -rf uefi-tools
-    rm -rf l-loader
-    rm -rf OpenPlatformPkg
-    rm -rf optee_os
-    rm -rf edk2/Build
-}
-
-# sbin isn't in the PATH by default and prevent to find sgdisk
-export PATH="/usr/sbin:/sbin:$PATH"
-
-# Use pre-installed linaro toolchain
-export PATH="${HOME}/srv/toolchain/gcc-linaro-6.4.1-2017.08-x86_64_aarch64-linux-gnu/bin:$PATH"
-export PATH="${HOME}/srv/toolchain/gcc-linaro-6.4.1-2017.08-x86_64_arm-linux-gnueabihf/bin:$PATH"
-
-# Common git repositories to fetch
-UEFI_TOOLS_GIT_URL=https://git.linaro.org/uefi/uefi-tools.git
-UEFI_TOOLS_GIT_BRANCH=master
-EDK2_GIT_URL=https://github.com/tianocore/edk2.git
-EDK2_GIT_VERSION=$EDK2_VERSION
-ATF_GIT_URL=https://github.com/ARM-software/arm-trusted-firmware.git
-ATF_GIT_VERSION=$ATF_VERSION
-## Temporarily switch to a dev tree/branch
-OPEN_PLATFORM_PKG_GIT_URL=https://git.linaro.org/uefi/OpenPlatformPkg.git
-OPEN_PLATFORM_PKG_GIT_BRANCH=master
-OPTEE_OS_GIT_URL=https://github.com/OP-TEE/optee_os.git
-OPTEE_GIT_VERSION=$OPTEE_VERSION
-
-# So we can easily identify the build number via build path
-mkdir ${BUILD_NUMBER}; cd ${BUILD_NUMBER}
-
-# Per board repositories overrides
-if [ "${MX_PLATFORM}" = "hikey" ]; then
-    EDK2_GIT_URL=https://github.com/96boards-hikey/edk2.git
-    EDK2_GIT_VERSION="origin/hikey-aosp"
-    ATF_GIT_URL=https://github.com/96boards-hikey/arm-trusted-firmware.git
-    ATF_GIT_VERSION="origin/hikey"
-    OPEN_PLATFORM_PKG_GIT_URL=https://github.com/96boards-hikey/OpenPlatformPkg.git
-    OPEN_PLATFORM_PKG_GIT_BRANCH=hikey-aosp
-fi
-
-# Force cap GCC build profile to GCC49, still preferred by upstream
-TOOLCHAIN=GCC49
-export AARCH64_TOOLCHAIN=GCC49
-
-# Clone the repos
-git clone -b $UEFI_TOOLS_GIT_BRANCH $UEFI_TOOLS_GIT_URL uefi-tools
-cd uefi-tools; UEFI_TOOLS_GIT_VERSION=`git log --format="%H" -1`; cd ..
-
-git clone $EDK2_GIT_URL edk2
-cd edk2; git checkout -b stable-baseline $EDK2_GIT_VERSION
-EDK2_GIT_VERSION=$(git rev-parse $EDK2_GIT_VERSION)
-cd ..
-
-git clone -b $OPEN_PLATFORM_PKG_GIT_BRANCH $OPEN_PLATFORM_PKG_GIT_URL OpenPlatformPkg
-cd edk2; rm -rf OpenPlatformPkg; ln -s ../OpenPlatformPkg; cd ..
-cd OpenPlatformPkg; OPEN_PLATFORM_PKG_GIT_VERSION=`git log --format="%H" -1`; cd ..
-
-git clone $ATF_GIT_URL arm-trusted-firmware
-cd arm-trusted-firmware; git checkout -b stable-baseline $ATF_GIT_VERSION;
-ATF_GIT_VERSION=$(git rev-parse $ATF_GIT_VERSION)
-cd ..
-
-git clone $OPTEE_OS_GIT_URL optee_os
-cd optee_os; git checkout -b stable-baseline $OPTEE_GIT_VERSION;
-OPTEE_OS_GIT_VERSION=`git log --format="%H" -1`; cd ..
-
-# Build setup
-export EDK2_DIR=${WORKSPACE}/${BUILD_NUMBER}/edk2
-export OPP_DIR=${WORKSPACE}/${BUILD_NUMBER}/OpenPlatformPkg
-export ATF_DIR=${WORKSPACE}/${BUILD_NUMBER}/arm-trusted-firmware
-export OPTEE_OS_DIR=${WORKSPACE}/${BUILD_NUMBER}/optee_os
-export UEFI_TOOLS_DIR=${WORKSPACE}/${BUILD_NUMBER}/uefi-tools
-export JENKINS_WORKSPACE=${WORKSPACE}
-
-# WORKSPACE is used by uefi-build.sh
-unset WORKSPACE
-
-# Build UEFI for the desired platform, with the specified build type
-cd ${EDK2_DIR}
-bash -x ${UEFI_TOOLS_DIR}/uefi-build.sh -T ${TOOLCHAIN} -b ${MX_TYPE} -a ${ATF_DIR} -s ${OPTEE_OS_DIR} ${MX_PLATFORM}
-
-unset WORKSPACE
-export WORKSPACE=${JENKINS_WORKSPACE}
-
-# Find out the artifacts and image dir so we can publish the correct output files
-IMAGES=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} images`
-IMAGE_DIR=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} -o UEFI_IMAGE_DIR get`
-BUILD_ATF=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} -o BUILD_ATF get`
-BUILD_TOS=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} -o BUILD_TOS get`
-
-cd ${WORKSPACE}
-mkdir -p out/${BUILD_TYPE}
-for image in ${IMAGES}; do
-    cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/${image} out/${BUILD_TYPE}/
-done
-
-cat > out/${BUILD_TYPE}/BUILD-INFO.txt << EOF
-Format-Version: 0.5
-
-Files-Pattern: *
-License-Type: open
-EOF
-
-if [ "${MX_PLATFORM}" = "hikey" ]; then
-    # Additional components for hikey, such as fastboot and l-loader
-    cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/AARCH64/AndroidFastbootApp.efi out/${BUILD_TYPE}
-    cd ${WORKSPACE}/${BUILD_NUMBER}
-    git clone --depth 1 https://github.com/96boards-hikey/l-loader.git
-    cd l-loader
-    ln -s ${WORKSPACE}/out/${BUILD_TYPE}/bl1.bin
-    make
-    cp -a l-loader.bin ptable*.img ${WORKSPACE}/out/${BUILD_TYPE}
-    wget https://raw.githubusercontent.com/96boards/burn-boot/master/hisi-idt.py -O ${WORKSPACE}/out/${BUILD_TYPE}/hisi-idt.py
-    # Ship nvme.img with UEFI binaries for convenience
-    dd if=/dev/zero of=${WORKSPACE}/out/${BUILD_TYPE}/nvme.img bs=128 count=1024
-
-    # Ship files needed to build OP-TEE test suite
-    tar -C ${OPTEE_OS_DIR}/out -acvf \
-      ${WORKSPACE}/out/${BUILD_TYPE}/optee-arm-plat-hikey.tar.xz \
-      arm-plat-hikey/export-ta_arm64 arm-plat-hikey/export-ta_arm32
-fi
-cd ${WORKSPACE}
-
-# Create MD5SUMS file
-(cd out/${BUILD_TYPE} && md5sum * > MD5SUMS.txt)
-
-# Build information
-cat > out/${BUILD_TYPE}/HEADER.textile << EOF
-
-h4. Reference Platform - UEFI
-
-Tianocore EDK2 UEFI build consumed by the Reference Platform Builds
-
-Build Description:
-* Build URL: "$BUILD_URL":$BUILD_URL
-* UEFI Tools: "$UEFI_TOOLS_GIT_URL":$UEFI_TOOLS_GIT_URL
-* UEFI Tools head: $UEFI_TOOLS_GIT_VERSION
-* EDK2: "$EDK2_GIT_URL":$EDK2_GIT_URL
-* EDK2 head: $EDK2_GIT_VERSION
-* OpenPlatformPkg: "$OPEN_PLATFORM_PKG_GIT_URL":$OPEN_PLATFORM_PKG_GIT_URL
-* OpenPlatformPkg branch: $OPEN_PLATFORM_PKG_GIT_BRANCH
-* OpenPlatformPkg head: $OPEN_PLATFORM_PKG_GIT_VERSION
-EOF
-
-if [ "$BUILD_ATF" = "yes" ]; then
-    cat >> out/${BUILD_TYPE}/HEADER.textile << EOF
-* ARM Trusted Firmware: "$ATF_GIT_URL":$ATF_GIT_URL
-* ARM Trusted Firmware head: $ATF_GIT_VERSION
-EOF
-fi
-
-if [ "$BUILD_TOS" = "yes" ]; then
-    cat >> out/${BUILD_TYPE}/HEADER.textile << EOF
-* OP-TEE OS: "$OPTEE_OS_GIT_URL":$OPTEE_OS_GIT_URL
-* OP-TEE OS head: $OPTEE_OS_GIT_VERSION
-EOF
-fi
diff --git a/rpb-uefi/staging/builders.sh b/rpb-uefi/staging/builders.sh
index c748ea570b..d13c8213a1 100755
--- a/rpb-uefi/staging/builders.sh
+++ b/rpb-uefi/staging/builders.sh
@@ -40,7 +40,7 @@ UEFI_TOOLS_GIT_BRANCH=master
 #EDK2_GIT_URL=https://github.com/tianocore/edk2.git
 EDK2_GIT_URL=https://git.linaro.org/uefi/linaro-edk2.git
 EDK2_GIT_VERSION=$EDK2_VERSION
-ATF_GIT_URL=https://github.com/ARM-software/arm-trusted-firmware.git
+ATF_GIT_URL=https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git
 ATF_GIT_VERSION=$ATF_VERSION
 ## Temporarily switch to a dev tree/branch
 OPEN_PLATFORM_PKG_GIT_URL=https://git.linaro.org/uefi/OpenPlatformPkg.git
@@ -91,109 +91,72 @@ git clone $OPTEE_OS_GIT_URL optee_os
 cd optee_os; git checkout -b stable-baseline $OPTEE_GIT_VERSION;
 OPTEE_OS_GIT_VERSION=`git log --format="%H" -1`; cd ..
 
+git clone --depth 1 https://github.com/96boards-hikey/atf-fastboot.git
+
 # Build setup
 export EDK2_DIR=${WORKSPACE}/${BUILD_NUMBER}/edk2
 export OPP_DIR=${WORKSPACE}/${BUILD_NUMBER}/OpenPlatformPkg
 export ATF_DIR=${WORKSPACE}/${BUILD_NUMBER}/arm-trusted-firmware
 export OPTEE_OS_DIR=${WORKSPACE}/${BUILD_NUMBER}/optee_os
 export UEFI_TOOLS_DIR=${WORKSPACE}/${BUILD_NUMBER}/uefi-tools
-export JENKINS_WORKSPACE=${WORKSPACE}
-
-# WORKSPACE is used by uefi-build.sh
-unset WORKSPACE
 
-# NOTE: If using upstream ATF, we should set TOS_BIN to tee-pager.bin
-if [ "${MX_PLATFORM}" = "hikey" ]; then
-    sed -i "s|^TOS_BIN=tee.bin|TOS_BIN=tee-pager.bin|" ${UEFI_TOOLS_DIR}/platforms.config
-fi
+export BUILD_PATH=${WORKSPACE}/${BUILD_NUMBER}
 
 # Build UEFI for the desired platform, with the specified build type
 cd ${EDK2_DIR}
-bash -x ${UEFI_TOOLS_DIR}/uefi-build.sh -T ${TOOLCHAIN} -b ${MX_TYPE} -a ${ATF_DIR} -s ${OPTEE_OS_DIR} ${MX_PLATFORM}
 
-unset WORKSPACE
-export WORKSPACE=${JENKINS_WORKSPACE}
+ln -sf ../OpenPlatformPkg
 
-# Find out the artifacts and image dir so we can publish the correct output files
-IMAGES=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} images`
-IMAGE_DIR=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} -o UEFI_IMAGE_DIR get`
-BUILD_ATF=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} -o BUILD_ATF get`
-BUILD_TOS=`$UEFI_TOOLS_DIR/parse-platforms.py -c $UEFI_TOOLS_DIR/platforms.config -p ${MX_PLATFORM} -o BUILD_TOS get`
+export LOADER_DIR=${BUILD_PATH}/l-loader
 
-cd ${WORKSPACE}
-mkdir -p out/${BUILD_TYPE}
-for image in ${IMAGES}; do
-    cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/${image} out/${BUILD_TYPE}/
-done
+cd ${WORKSPACE}/${BUILD_NUMBER}
+git clone --depth 1 -b ${L_LOADER_GIT_BRANCH} ${L_LOADER_GIT_URL} l-loader
+cd $LOADER_DIR
 
-cat > out/${BUILD_TYPE}/BUILD-INFO.txt << EOF
-Format-Version: 0.5
+sed -i "s/#GENERATE_PTABLE=1/GENERATE_PTABLE=1/g" build_uefi.sh
+sed -i "s/BUILD_OPTION=DEBUG/BUILD_OPTION=RELEASE/g" build_uefi.sh
 
-Files-Pattern: *
-License-Type: open
-EOF
+./build_uefi.sh  ${MX_PLATFORM}
 
-if [ "${MX_PLATFORM}" = "hikey" ]; then
-    # HiKey requires an ATF fork for the recovery mode
-    git clone --depth 1 https://github.com/96boards-hikey/atf-fastboot.git
-    DEBUG=0; [ "${BUILD_TYPE}" = "debug" ] && DEBUG=1
-    cd atf-fastboot; CROSS_COMPILE=aarch64-linux-gnu- make PLAT=${MX_PLATFORM} DEBUG=${DEBUG}; cd ..
-
-    # Additional components for hikey, such as fastboot and l-loader
-    cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/AARCH64/AndroidFastbootApp.efi out/${BUILD_TYPE}
-    cd ${WORKSPACE}/${BUILD_NUMBER}
-    git clone --depth 1 -b ${L_LOADER_GIT_BRANCH} ${L_LOADER_GIT_URL} l-loader
-    cd l-loader
-    ln -s ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/bl1.bin
-    ln -s ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/bl2.bin
-    ln -s ${WORKSPACE}/atf-fastboot/build/${MX_PLATFORM}/${BUILD_TYPE}/bl1.bin fastboot.bin
-    make -f ${MX_PLATFORM}.mk recovery.bin
-    make -f ${MX_PLATFORM}.mk l-loader.bin
-    for ptable in aosp-4g aosp-8g linux-4g linux-8g; do
-        PTABLE=${ptable} SECTOR_SIZE=512 bash -x generate_ptable.sh
-        mv prm_ptable.img ptable-${ptable}.img
-    done
-    cp -a l-loader.bin recovery.bin ptable*.img ${WORKSPACE}/out/${BUILD_TYPE}
-    wget https://raw.githubusercontent.com/96boards/burn-boot/master/hisi-idt.py -O ${WORKSPACE}/out/${BUILD_TYPE}/hisi-idt.py
-    # Ship nvme.img with UEFI binaries for convenience
-    dd if=/dev/zero of=${WORKSPACE}/out/${BUILD_TYPE}/nvme.img bs=128 count=1024
+cd ${WORKSPACE}
+mkdir -p out/${BUILD_TYPE}
 
+if [ "${MX_PLATFORM}" = "hikey" ]; then
     # Ship files needed to build OP-TEE test suite
     tar -C ${OPTEE_OS_DIR}/out -acvf \
       ${WORKSPACE}/out/${BUILD_TYPE}/optee-arm-plat-hikey.tar.xz \
       arm-plat-hikey/export-ta_arm64 arm-plat-hikey/export-ta_arm32
+    wget https://raw.githubusercontent.com/96boards/burn-boot/master/hisi-idt.py -O ${WORKSPACE}/out/${BUILD_TYPE}/hisi-idt.py
+    dd if=/dev/zero of=${WORKSPACE}/out/${BUILD_TYPE}/nvme.img bs=128 count=1024
+    cp -L ${LOADER_DIR}/fip.bin ${LOADER_DIR}/l-loader.bin ${LOADER_DIR}/recovery.bin ${LOADER_DIR}/*ptable.img ${WORKSPACE}/out/${BUILD_TYPE}
 fi
+
 if [ "${MX_PLATFORM}" = "hikey960" ]; then
-    # Additional components for hikey960, such as fastboot and l-loader
-    cp -a ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/AARCH64/AndroidFastbootApp.efi out/${BUILD_TYPE}
-    cd ${WORKSPACE}/${BUILD_NUMBER}
-    git clone --depth 1 -b ${L_LOADER_GIT_BRANCH} ${L_LOADER_GIT_URL} l-loader
-    cd l-loader
-    ln -s ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/bl1.bin
-    ln -s ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/bl2.bin
-    ln -s ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/fip.bin
-    ln -s ${EDK2_DIR}/Build/${IMAGE_DIR}/${MX_TYPE}_*/FV/BL33_AP_UEFI.fd
-    make -f ${MX_PLATFORM}.mk recovery.bin
-    make -f ${MX_PLATFORM}.mk l-loader.bin
-    PTABLE=aosp-32g SECTOR_SIZE=4096 SGDISK=./sgdisk bash -x generate_ptable.sh
-    cp -a l-loader.bin recovery.bin prm_ptable.img ${WORKSPACE}/out/${BUILD_TYPE}
-    cd ${WORKSPACE}/${BUILD_NUMBER}
+    cp -L ${LOADER_DIR}/fip.bin ${LOADER_DIR}/l-loader.bin ${LOADER_DIR}/recovery.bin ${LOADER_DIR}/*ptable.img ${WORKSPACE}/out/${BUILD_TYPE}
     git clone --depth 1 https://github.com/96boards-hikey/tools-images-hikey960.git
     cd tools-images-hikey960
     cat > config << EOF
-sec_usb_xloader.img 0x00020000
-sec_uce_boot.img 0x6A908000
+hisi-sec_usb_xloader.img 0x00020000
+hisi-sec_uce_boot.img 0x6A908000
 recovery.bin 0x1AC00000
 EOF
-    cp -a config hikey_idt sec_uce_boot.img sec_usb_xloader.img sec_xloader.img ${WORKSPACE}/out/${BUILD_TYPE}/
+    cp -L config hikey_idt hisi-sec_uce_boot.img hisi-sec_usb_xloader.img hisi-sec_xloader.img ${WORKSPACE}/out/${BUILD_TYPE}/
 fi
+
 cd ${WORKSPACE}
 
+cat > ${WORKSPACE}/out/${BUILD_TYPE}/BUILD-INFO.txt << EOF
+Format-Version: 0.5
+
+Files-Pattern: *
+License-Type: open
+EOF
+
 # Create MD5SUMS file
-(cd out/${BUILD_TYPE} && md5sum * > MD5SUMS.txt)
+(cd ${WORKSPACE}/out/${BUILD_TYPE} && md5sum * > MD5SUMS.txt)
 
 # Build information
-cat > out/${BUILD_TYPE}/HEADER.textile << EOF
+cat > ${WORKSPACE}/out/${BUILD_TYPE}/HEADER.textile << EOF
 
 h4. Reference Platform - UEFI
 
@@ -211,14 +174,14 @@ Build Description:
 EOF
 
 if [ "$BUILD_ATF" = "yes" ]; then
-    cat >> out/${BUILD_TYPE}/HEADER.textile << EOF
+    cat >> ${WORKSPACE}/out/${BUILD_TYPE}/HEADER.textile << EOF
 * ARM Trusted Firmware: "$ATF_GIT_URL":$ATF_GIT_URL
 * ARM Trusted Firmware head: $ATF_GIT_VERSION
 EOF
 fi
 
 if [ "$BUILD_TOS" = "yes" ]; then
-    cat >> out/${BUILD_TYPE}/HEADER.textile << EOF
+    cat >> ${WORKSPACE}/out/${BUILD_TYPE}/HEADER.textile << EOF
 * OP-TEE OS: "$OPTEE_OS_GIT_URL":$OPTEE_OS_GIT_URL
 * OP-TEE OS head: $OPTEE_OS_GIT_VERSION
 EOF
diff --git a/rsalveti-db410c-debian-gateway.yaml b/rsalveti-db410c-debian-gateway.yaml
deleted file mode 100644
index 3228203180..0000000000
--- a/rsalveti-db410c-debian-gateway.yaml
+++ /dev/null
@@ -1,313 +0,0 @@
-- job:
-    name: rsalveti-db410c-debian-gateway
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: VENDOR
-            default: 'rsalveti'
-        - string:
-            name: OS_FLAVOUR
-            default: 'jessie'
-        - string:
-            name: PLATFORM_NAME
-            default: 'qcom-snapdragon-arm64'
-        - string:
-            name: ROOTFS
-            default: 'developer,arm64,1800M'
-        - string:
-            name: DTBS
-            default: 'msm8916-mtp.dtb apq8016-sbc.dtb'
-        - string:
-            name: SERIAL_CONSOLE
-            default: 'ttyMSM0'
-        - string:
-            name: KERNEL_BRANCH
-            default: 'rsalveti-qcomlt-4.4'
-        - string:
-            name: QCOM_FIRMWARE
-            default: 'http://snapshots.linaro.org/96boards/dragonboard410c/binaries/20160620/linux-board-support-package-v1.3.zip'
-        - string:
-            name: QCOM_FIRMWARE_MD5
-            default: '810c7d39c86f8e39f3eb64eb1122aefb'
-    disabled: true
-    node: docker-jessie-amd64
-    display-name: 'Personal DB410c debian-based gateway image for rsalveti'
-    scm:
-        - git:
-            url: https://github.com/rsalveti/linux.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo kpartx -dv out/${VENDOR}-${OS_FLAVOUR}-*.sd.img || true
-              rm -rf lci-build-tools
-              rm -rf builddir*
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y kpartx python-requests device-tree-compiler zip libfdt-dev mtools android-tools-fsutils
-            wget -q \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/linaro-image-tools_2016.05-1linarojessie1_amd64.deb \
-              http://repo.linaro.org/ubuntu/linaro-tools/pool/main/l/linaro-image-tools/python-linaro-image-tools_2016.05-1linarojessie1_all.deb
-            sudo dpkg -i --force-all *.deb
-            rm -f *.deb
-
-            # get the boot image tools, and keep track of commit info in the traces
-            git clone git://codeaurora.org/quic/kernel/skales
-            (cd skales && git log -1)
-            export PATH=`pwd`/skales:$PATH
-
-            export LANG=C
-            export make_bootwrapper=false
-            export make_install=true
-            export kernel_flavour=rsalveti-lt-qcom
-            export kernel_config="defconfig distro.config"
-            export MAKE_DTBS=true
-            export ARCH=arm64
-            export tcbindir="${HOME}/srv/toolchain/arm64-tc-14.09/bin"
-            export toolchain_url=http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz
-
-            test -d lci-build-tools || git clone https://git.linaro.org/git/ci/lci-build-tools.git lci-build-tools
-            bash -x lci-build-tools/jenkins_kernel_build_inst
-
-            # Create the hardware pack
-            cat << EOF > ${VENDOR}-lt-qcom.default
-            format: '3.0'
-            name: ${VENDOR}-lt-qcom
-            architectures:
-            - arm64
-            origin: Linaro
-            maintainer: Linaro Platform <linaro-dev@lists.linaro.org>
-            support: supported
-            serial_tty: ${SERIAL_CONSOLE}
-            kernel_addr: '0x80208000'
-            initrd_addr: '0x83000000'
-            load_addr: '0x60008000'
-            dtb_addr: '0x61000000'
-            partition_layout: bootfs_rootfs
-            mmc_id: '0:1'
-            kernel_file: boot/Image-*-qcom
-            initrd_file: boot/initrd.img-*-qcom
-            dtb_file: lib/firmware/*-qcom/device-tree/msm8916-mtp.dtb
-            boot_script: boot.scr
-            boot_min_size: 64
-            extra_serial_options:
-            - console=tty0
-            - console=${SERIAL_CONSOLE},115200n8
-            assume_installed:
-            - adduser
-            - apt
-            - apt-utils
-            - debconf-i18n
-            - debian-archive-keyring
-            - gcc-4.9
-            - gnupg
-            - ifupdown
-            - initramfs-tools
-            - iproute2
-            - irqbalance
-            - isc-dhcp-client
-            - kmod
-            - netbase
-            - udev
-            - linaro-artwork
-            sources:
-              qcom: http://repo.linaro.org/ubuntu/qcom-overlay ${OS_FLAVOUR} main
-              repo: http://repo.linaro.org/ubuntu/linaro-overlay ${OS_FLAVOUR} main
-              rsalveti: http://repo.linaro.org/ubuntu/rsalveti ${OS_FLAVOUR} main
-              debian: http://ftp.debian.org/debian/ ${OS_FLAVOUR} main contrib non-free
-              backports: http://ftp.debian.org/debian/ ${OS_FLAVOUR}-backports main
-            packages:
-            - linux-image-arm64
-            - linux-headers-arm64
-            - firmware-linux
-            - wcnss-wlan
-            - wcnss-bt
-            - wcnss-start
-            - ndppd
-            - radvd
-            - bluez
-            - libbluetooth3
-            EOF
-
-            # Download license file and firmware
-            rm -f license.txt
-            wget https://git.linaro.org/landing-teams/working/qualcomm/lt-docs.git/blob_plain/HEAD:/license/license.txt
-
-            rm -rf qcom_firmware && mkdir qcom_firmware && cd qcom_firmware
-            wget -q ${QCOM_FIRMWARE}
-            echo "${QCOM_FIRMWARE_MD5}  $(basename ${QCOM_FIRMWARE})" > MD5
-            md5sum -c MD5
-            unzip $(basename ${QCOM_FIRMWARE})
-            cd -
-            rm -f qcom_firmware/linux-board-support-package-*/proprietary-linux/wlan/macaddr0
-            rm -f qcom_firmware/linux-board-support-package-*/proprietary-linux/firmware.tar
-            sudo MTOOLS_SKIP_CHECK=1 mcopy -i qcom_firmware/linux-board-support-package-*/bootloaders-linux/NON-HLOS.bin \
-                        ::image/modem.* ::image/mba.mbn qcom_firmware/linux-board-support-package-*/proprietary-linux
-
-            ## Default config file templates
-            # Enable forwarding by default, required by radvd
-            cat << EOF > gateway.conf
-            #net.ipv6.conf.wlan0.accept_ra=2
-            #net.ipv6.conf.all.forwarding=1
-            #net.ipv6.conf.all.proxy_ndp=1
-            EOF
-            # Default address for the bt le 6lowpan interface
-            cat << EOF > bt0
-            #auto bt0
-            #allow-hotplug bt0
-            #iface bt0 inet6 static
-            #    address 2001:db8::4
-            #    netmask 68
-            EOF
-            cat << EOF > radvd.conf
-            #interface bt0
-            #{
-            #    IgnoreIfMissing on;
-            #    AdvSendAdvert on;
-            #    prefix 2001:db8::/64
-            #    {
-            #        AdvOnLink off;
-            #        AdvAutonomous on;
-            #        AdvRouterAddr on;
-            #    };
-            #};
-            EOF
-            cat << EOF > ndppd.conf
-            #route-ttl 30000
-            #proxy wlan0 {
-            #   router yes
-            #   timeout 500
-            #   ttl 30000
-            #   rule 2001:db8::/68 {
-            #      static
-            #   }
-            #}
-            EOF
-
-            for rootfs in ${ROOTFS}; do
-
-              rootfs_arch=$(echo $rootfs | cut -f2 -d,)
-              rootfs_sz=$(echo $rootfs | cut -f3 -d,)
-              rootfs=$(echo $rootfs | cut -f1 -d,)
-
-              cat ${VENDOR}-lt-qcom.default > ${VENDOR}-lt-qcom
-
-              rm -f `ls hwpack_${VENDOR}-lt-qcom_*_${rootfs_arch}_supported.tar.gz`
-              VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-              linaro-hwpack-create --debug --backports ${VENDOR}-lt-qcom ${VERSION}
-              linaro-hwpack-replace -t `ls hwpack_${VENDOR}-lt-qcom_*_${rootfs_arch}_supported.tar.gz` -p `ls linux-image-*-${VENDOR}-lt-qcom_*.deb` -r linux-image -d -i
-              linaro-hwpack-replace -t `ls hwpack_${VENDOR}-lt-qcom_*_${rootfs_arch}_supported.tar.gz` -p `ls linux-headers-*-${VENDOR}-lt-qcom_*.deb` -r linux-headers -d -i
-
-              # Get rootfs
-              export ROOTFS_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/debian-${rootfs_arch}-rootfs/label=docker-jessie-${rootfs_arch},rootfs=${rootfs}/lastSuccessfulBuild/buildNumber`
-              export ROOTFS_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/debian-${rootfs_arch}-rootfs/label=docker-jessie-${rootfs_arch},rootfs=${rootfs}/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-              export ROOTFS_BUILD_URL="http://snapshots.linaro.org/debian/images/${rootfs}-${rootfs_arch}/${ROOTFS_BUILD_NUMBER}/linaro-${OS_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz"
-              wget --progress=dot -e dotbytes=2M ${ROOTFS_BUILD_URL}
-
-              # Create pre-built image(s)
-              linaro-media-create --dev fastmodel --output-directory ${WORKSPACE}/out --image-file ${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img --image-size 2G --binary linaro-${OS_FLAVOUR}-${rootfs}-${ROOTFS_BUILD_TIMESTAMP}-${ROOTFS_BUILD_NUMBER}.tar.gz --hwpack hwpack_${VENDOR}-lt-qcom_*.tar.gz --hwpack-force-yes --bootloader uefi
-
-              # Create eMMC rootfs image(s)
-              mkdir rootfs
-              for device in $(sudo kpartx -avs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img | cut -d' ' -f3); do
-                partition=$(echo ${device} | cut -d'p' -f3)
-                [ "${partition}" = "2" ] && sudo mount -o loop /dev/mapper/${device} rootfs
-              done
-
-              sudo rm -rf rootfs/dev rootfs/var/lib/apt/lists
-              sudo mkdir rootfs/dev rootfs/var/lib/apt/lists
-
-              # clean up fstab
-              sudo sed -i '/UUID/d' rootfs/etc/fstab
-
-              # add license file in the generated rootfs
-              sudo cp -f license.txt rootfs/etc/license.txt
-
-              # add firmware (adreno, venus and WCN)
-              sudo cp -a qcom_firmware/linux-board-support-package-*/proprietary-linux/* rootfs/lib/firmware
-
-              # add default config file templates
-              sudo cp gateway.conf rootfs/etc/sysctl.d/
-              sudo cp bt0 rootfs/etc/network/interfaces.d/
-              sudo cp radvd.conf rootfs/etc/radvd.conf
-              sudo cp ndppd.conf rootfs/etc/ndppd.conf
-
-              sudo mkfs.ext4 -L rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw ${rootfs_sz}
-              mkdir rootfs2
-              sudo mount -o loop out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw rootfs2
-              sudo cp -a rootfs/* rootfs2
-              rootfs_sz_real=$(sudo du -sh rootfs2 | cut -f1)
-              sudo umount rootfs2 rootfs
-              sudo ext2simg -v out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img
-              sudo kpartx -dv out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img
-              sudo rm -rf rootfs out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.sd.img rootfs2 out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img.raw
-
-              # Compress image(s)
-              gzip -9 out/${VENDOR}-${OS_FLAVOUR}-${rootfs}-${PLATFORM_NAME}-${VERSION}.img
-
-            done
-
-            # Move all relevant DTBs in out/
-            for f in ${DTBS} ; do
-              mv out/dtbs/${f} out/
-            done
-            rm -rf out/dtbs
-
-            # Create device tree table
-            dtbTool -o out/dt.img -s 2048 out/
-
-            # Create boot image
-            mkbootimg \
-              --kernel out/Image \
-              --ramdisk out/initrd.img-* \
-              --output out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img \
-              --dt out/dt.img \
-              --pagesize "2048" \
-              --base "0x80000000" \
-              --cmdline "root=/dev/disk/by-partlabel/rootfs rw rootwait console=tty0 console=${SERIAL_CONSOLE},115200n8"
-            gzip -9 out/boot-${VENDOR}-${OS_FLAVOUR}-${PLATFORM_NAME}-${VERSION}.img
-
-            # Final preparation for publishing
-            cp -a linux-*.deb out/
-
-            # Create MD5SUMS file
-            (cd out && md5sum * > MD5SUMS.txt)
-
-    publishers:
-        - archive:
-            artifacts: 'out/*'
-        - email:
-            recipients: 'ricardo.salveti@linaro.org'
diff --git a/run-jjb.py b/run-jjb.py
index d8caf386f9..62b200b1d6 100755
--- a/run-jjb.py
+++ b/run-jjb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
 
 import os
 import shutil
@@ -6,22 +6,42 @@ import signal
 import string
 import subprocess
 import sys
+import xml.etree.ElementTree
 from distutils.spawn import find_executable
 
 
+# provide a convenience wrapper for running a command.  If command
+# fails for any reason, it should raise a ValueError and let caller
+# handle it
+def safe_run(args, check=True):
+    try:
+        proc = subprocess.run(
+                        args,
+                        stdout=subprocess.PIPE,
+                        stderr=subprocess.STDOUT,
+                        check=check)
+    except(OSError, ValueError) as e:
+        raise ValueError("command '%s' failed: %s" % (" ".join(args), e))
+    except(subprocess.CalledProcessError) as e:
+        raise ValueError("command '%s' failed with %s:\n%s" % (
+            e.cmd, e.returncode, e.output.decode()))
+    except(Exception) as e:
+        raise ValueError("unknown error running command '%s':\n%s" %
+            (" ".join(args), e))
+
+    return proc
+
+
 def findparentfiles(fname):
     filelist = []
     newlist = []
     args = ['grep', '-rl', '--exclude-dir=.git', fname]
-    proc = subprocess.Popen(args,
-                            stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE,
-                            universal_newlines=False,
-                            preexec_fn=lambda:
-                            signal.signal(signal.SIGPIPE, signal.SIG_DFL))
-    data = proc.communicate()[0]
-    if proc.returncode != 0:
-        return filelist
+
+    # Set False for the check argument to subprocess run... we don't care
+    # if grep doesn't find any files
+    proc = safe_run(args, False)
+    data = proc.stdout.decode()
+
     for filename in data.splitlines():
         if filename.endswith('.yaml') and '/' not in filename:
             filelist.append(filename)
@@ -50,36 +70,58 @@ if jjb_user is not None and jjb_password is not None:
         f.write(jenkins_jobs_ini)
     jjb_args.append('--conf=jenkins_jobs.ini')
 
-jjb_args.extend(['update', 'template.yaml'])
+jjb_test_args = list(jjb_args)
+jjb_delete_args = list(jjb_args)
+
+# !!! "update" below and through out this file is replaced by "test" (using sed)
+# !!! in the sanity-check job.
+main_action = 'update'
+jjb_args.extend([main_action, 'template.yaml'])
+jjb_test_args.extend(['test', '-o', 'out/', 'template.yaml'])
+jjb_delete_args.extend(['delete'])
+
+if main_action == 'test':
+    # Dry-run, don't delete jobs.
+    jjb_delete_args.insert(0, 'echo')
 
 try:
-    git_args = ['git', 'diff', '--name-only',
+    git_args = ['git', 'diff', '--raw',
                 os.environ.get('GIT_PREVIOUS_COMMIT'),
                 os.environ.get('GIT_COMMIT')]
-    proc = subprocess.Popen(git_args,
-                            stdin=subprocess.PIPE,
-                            stdout=subprocess.PIPE,
-                            universal_newlines=False,
-                            preexec_fn=lambda:
-                            signal.signal(signal.SIGPIPE, signal.SIG_DFL))
-except (OSError, ValueError) as e:
+    proc = safe_run(git_args)
+    data = proc.stdout.decode()
+except (ValueError) as e:
     raise ValueError("%s" % e)
 
-data = proc.communicate()[0]
-if proc.returncode != 0:
-    raise ValueError("command has failed with code '%s'" % proc.returncode)
-
 filelist = []
+deletelist = []
 files = []
-for filename in data.splitlines():
+for line in data.splitlines():
+    # Format of the git-diff; we only need OPERATION and FILE1
+    #
+    # :<OLD MODE> <NEW MODE> <OLD REF> <NEW REF> <OPERATION> <FILE1> <FILE2>
+    elems = line.split()
+    operation = elems[4][0]
+    filename = elems[5]
+
     if filename.endswith('.yaml') and '/' not in filename:
+        # No point trying to test deleted jobs because they don't exist any
+        # more.
+        if operation == 'D':
+            deletelist.append(filename[:-5])
+            continue
+        # operation R100 is 100% rename, which means sixth element is the renamed file
+        if operation == 'R':
+            filename = elems[6]
+            # delete old job name
+            deletelist.append(elems[5][:-5])
         filelist.append(filename)
     else:
         files = findparentfiles(filename)
         for tempname in files:
             filelist.append(tempname)
 
-# Remove dplicate entries in the list
+# Remove duplicate entries in the list
 filelist = list(set(filelist))
 
 for conf_filename in filelist:
@@ -93,22 +135,57 @@ for conf_filename in filelist:
             LAVA_TOKEN=os.environ.get('LAVA_TOKEN'))
         with open('template.yaml', 'w') as f:
             f.write(buffer)
+
+        proc = safe_run(jjb_args)
+        data = proc.stdout.decode()
+
         try:
-            proc = subprocess.Popen(jjb_args,
-                                    stdin=subprocess.PIPE,
-                                    stdout=subprocess.PIPE,
-                                    universal_newlines=False,
-                                    preexec_fn=lambda:
-                                    signal.signal(signal.SIGPIPE, signal.SIG_DFL))
+            shutil.rmtree('out/', ignore_errors=True)
+
+            proc = safe_run(jjb_test_args)
+            data = proc.stdout.decode()
+
+            proc = safe_run(['ls', 'out/'])
+            data = proc.stdout.decode()
+
+            for filename in data.splitlines():
+                # old job conf might have been removed because the job is now generated through the template
+                # do not delete the job in this case
+                if filename in deletelist:
+                    deletelist.remove(filename)
+
+                conf_name=os.path.splitext(conf_filename)[0]
+                conf_name=conf_name[:len(filename)]
+                if not filename.startswith(conf_name):
+                    raise ValueError("Job name %s does not match the file it is in: %s" % (filename, conf_name))
+                try:
+                    xmlroot = xml.etree.ElementTree.parse('out/' + filename).getroot()
+                    disabled = next(xmlroot.iterfind('disabled')).text
+                    if disabled != 'true':
+                        continue
+                    displayName = next(xmlroot.iterfind('displayName')).text
+                    if displayName != 'DELETE ME':
+                        continue
+                except:
+                    continue
+
+                deletelist.append(filename)
+
         except (OSError, ValueError) as e:
             raise ValueError("%s" % e)
 
-        data = proc.communicate()[0]
-        if proc.returncode != 0:
-            raise ValueError("command has failed with code '%s'" % proc.returncode)
-
+        shutil.rmtree('out/', ignore_errors=True)
         os.remove('template.yaml')
-        #shutil.rmtree('out')
+
+
+for deletejob in deletelist:
+    delete_args = list(jjb_delete_args)
+    delete_args.extend([deletejob])
+
+    proc = safe_run(delete_args)
+    data = proc.stdout.decode()
+
+    print(data)
 
 if os.path.exists('jenkins_jobs.ini'):
     os.remove('jenkins_jobs.ini')
diff --git a/schneider-openembedded-dunfell-4.19.yaml b/schneider-openembedded-dunfell-4.19.yaml
new file mode 100644
index 0000000000..a51adf2d71
--- /dev/null
+++ b/schneider-openembedded-dunfell-4.19.yaml
@@ -0,0 +1,150 @@
+- job:
+    name: schneider-openembedded-dunfell-4.19
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'prod-image dev-image'
+        - string:
+            name: SUBMODULES
+            default: 'all'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@github.com/SE-DeviceIntelligence'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'linaro-dunfell'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'dunfell-4.19'
+        - string:
+            name: KERNEL_VERSION_PATCHLEVEL
+            default: '4.19'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (dunfell 4.19)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'rzn1d'
+                - 'soca9'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+                - '4840cea9-f64c-4d03-82d6-bd773f5229ae'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'cve-*.txt, base-cve-*.txt'
+        - postbuildscript:
+            builders:
+                - role: MASTER
+                  build-on:
+                    - SUCCESS
+                    - UNSTABLE
+                    - FAILURE
+                    - NOT_BUILT
+                    - ABORTED
+                  build-steps:
+                    - shell:
+                        !include-raw: schneider-openembedded/cve-summary.sh
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+                  - schneider-openembedded/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org, milan.stevanovic@se.com'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
+            body: |
+                $DEFAULT_CONTENT
+
+                CVE summary:
+                ${FILE,path="cve.sum"}
+            attachments: "cve.html"
diff --git a/schneider-openembedded-dunfell-5.10.yaml b/schneider-openembedded-dunfell-5.10.yaml
new file mode 100644
index 0000000000..b8d0a3fa93
--- /dev/null
+++ b/schneider-openembedded-dunfell-5.10.yaml
@@ -0,0 +1,151 @@
+- job:
+    name: schneider-openembedded-dunfell-5.10
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'prod-image dev-image'
+        - string:
+            name: SUBMODULES
+            default: 'all'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@github.com/SE-DeviceIntelligence'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'linaro-dunfell'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'dunfell-5.10'
+        - string:
+            name: KERNEL_VERSION_PATCHLEVEL
+            default: '5.10'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (dunfell 5.10)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'am64x'
+                - 'rzn1d'
+                - 'soca9'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: true
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+                - '4840cea9-f64c-4d03-82d6-bd773f5229ae'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'cve-*.txt, base-cve-*.txt'
+        - postbuildscript:
+            builders:
+                - role: MASTER
+                  build-on:
+                    - SUCCESS
+                    - UNSTABLE
+                    - FAILURE
+                    - NOT_BUILT
+                    - ABORTED
+                  build-steps:
+                    - shell:
+                        !include-raw: schneider-openembedded/cve-summary.sh
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+                  - schneider-openembedded/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org, milan.stevanovic@se.com'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
+            body: |
+                $DEFAULT_CONTENT
+
+                CVE summary:
+                ${FILE,path="cve.sum"}
+            attachments: "cve.html"
diff --git a/schneider-openembedded-dunfell-5.4.yaml b/schneider-openembedded-dunfell-5.4.yaml
new file mode 100644
index 0000000000..d9b4359f28
--- /dev/null
+++ b/schneider-openembedded-dunfell-5.4.yaml
@@ -0,0 +1,150 @@
+- job:
+    name: schneider-openembedded-dunfell-5.4
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'prod-image dev-image'
+        - string:
+            name: SUBMODULES
+            default: 'all'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@github.com/SE-DeviceIntelligence'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'linaro-dunfell'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'dunfell-5.4'
+        - string:
+            name: KERNEL_VERSION_PATCHLEVEL
+            default: '5.4'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (dunfell 5.4)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'rzn1d'
+                - 'soca9'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+                - '4840cea9-f64c-4d03-82d6-bd773f5229ae'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'cve-*.txt, base-cve-*.txt'
+        - postbuildscript:
+            builders:
+                - role: MASTER
+                  build-on:
+                    - SUCCESS
+                    - UNSTABLE
+                    - FAILURE
+                    - NOT_BUILT
+                    - ABORTED
+                  build-steps:
+                    - shell:
+                        !include-raw: schneider-openembedded/cve-summary.sh
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+                  - schneider-openembedded/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org, milan.stevanovic@se.com'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
+            body: |
+                $DEFAULT_CONTENT
+
+                CVE summary:
+                ${FILE,path="cve.sum"}
+            attachments: "cve.html"
diff --git a/schneider-openembedded-sumo.yaml b/schneider-openembedded-sumo.yaml
new file mode 100644
index 0000000000..2f654a568a
--- /dev/null
+++ b/schneider-openembedded-sumo.yaml
@@ -0,0 +1,122 @@
+- job:
+    name: schneider-openembedded-sumo
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'dip-image dip-image-dev dip-image-edge'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@dev-private-git.linaro.org/schneider'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'linaro-sumo'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'schneider'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (sumo)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'rzn1d'
+                - 'soca9'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-stretch-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
diff --git a/schneider-openembedded-test-am64x.yaml b/schneider-openembedded-test-am64x.yaml
new file mode 100644
index 0000000000..0c99f8165b
--- /dev/null
+++ b/schneider-openembedded-test-am64x.yaml
@@ -0,0 +1,149 @@
+- job:
+    name: schneider-openembedded-test-am64x
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'prod-image dev-image'
+        - string:
+            name: SUBMODULES
+            default: 'all'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@github.com/SE-DeviceIntelligence'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'rfs-ti-am64xx'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'dunfell-5.10'
+        - string:
+            name: KERNEL_VERSION_PATCHLEVEL
+            default: '5.10'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (AM64x test)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'am64x'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+                - '4840cea9-f64c-4d03-82d6-bd773f5229ae'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'cve-*.txt, base-cve-*.txt'
+        - postbuildscript:
+            builders:
+                - role: MASTER
+                  build-on:
+                    - SUCCESS
+                    - UNSTABLE
+                    - FAILURE
+                    - NOT_BUILT
+                    - ABORTED
+                  build-steps:
+                    - shell:
+                        !include-raw: schneider-openembedded/cve-summary.sh
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+                  - schneider-openembedded/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org, milan.stevanovic@se.com'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
+            body: |
+                $DEFAULT_CONTENT
+
+                CVE summary:
+                ${FILE,path="cve.sum"}
+            attachments: "cve.html"
diff --git a/schneider-openembedded-test-notify.yaml b/schneider-openembedded-test-notify.yaml
new file mode 100644
index 0000000000..47e003b677
--- /dev/null
+++ b/schneider-openembedded-test-notify.yaml
@@ -0,0 +1,74 @@
+- job:
+    name: schneider-openembedded-test-notify
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: master
+    concurrent: false
+    display-name: 'Schneider OpenEmbedded Test Notify'
+    wrappers:
+        - timeout:
+            timeout: 60
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+            pwd
+            echo "Get previous"
+            wget -nv -O last.cve https://snapshots.linaro.org//openembedded/schneider/linaro-warrior-4.19/rzn1d/latest/dip/dip-image-rzn1-snarc.rootfs.cve
+            echo "Get baseline"
+            wget -nv -O base.cve https://releases.linaro.org/members/schneider/openembedded/2019.09-warrior.2/rzn1d-4.19/dip-image-rzn1-snarc-linaro-rel-2019.09-warrior.2-internal-70.rootfs.cve
+    publishers:
+        - postbuildscript:
+            builders:
+                - role: MASTER
+                  build-on:
+                    - SUCCESS
+                  build-steps:
+                    - shell: |
+                        echo "Combining CVEs"
+                        #sort -u ${JENKINS_HOME}/jobs/${JOB_NAME}/configurations/axis-DISTRO/dip/axis-MACHINE/*/axis-label/docker-stretch-amd64/builds/${BUILD_NUMBER}/archive/cve-*.txt > cve.txt
+                        sort -u ${JENKINS_HOME}/jobs/schneider-openembedded-warrior-4.19-rfs/configurations/axis-DISTRO/dip/axis-MACHINE/*/axis-label/docker-stretch-amd64/builds/31/archive/cve-*.txt > cve.txt
+                        cat cve.txt
+                        echo "HTMLify CVEs"
+                        perl -F'\t' -lane '($type, $cve, $pkg, $url, @rest) = @F; push @{$foo{$type}}, ("<a href=\"$url\">$cve</a> $pkg" . list(@rest)); sub list { return @_ ? join("", "<ul>\n", map("<li>$_</li>\n", @_), "</ul>") : ""} ; END { foreach (reverse sort keys %foo) { print "<b>$_ CVEs</b>", list(@{$foo{$_}}) if @{$foo{$_}} }}' cve.txt > cve.html
+                        echo "Summarize CVEs"
+                        printf "NEW=%d CHANGED=%d FIXED=%d\n" `grep NEW cve.txt|wc -l` >cve.sum
+
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - schneider-openembedded/postbuild.groovy
+        - email-ext:
+            # Send custom email generated in jenkins job
+            recipients: 'ralph.siemsen@linaro.org'
+            subject: 'Schneider OpenEmbedded Test Notify'
+            body: |
+                $DEFAULT_CONTENT
+
+                CVE summary: ${FILE,path="cve.sum"}
+            attachments: "cve.html"
+            success: true
+        - email:
+             recipients: 'ralph.siemsen@linaro.org'
diff --git a/schneider-openembedded-warrior-4.19.yaml b/schneider-openembedded-warrior-4.19.yaml
new file mode 100644
index 0000000000..d837aa9e6a
--- /dev/null
+++ b/schneider-openembedded-warrior-4.19.yaml
@@ -0,0 +1,149 @@
+- job:
+    name: schneider-openembedded-warrior-4.19
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'dip-image dip-image-dev dip-image-edge'
+        - string:
+            name: SUBMODULES
+            default: 'all'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@dev-private-git.linaro.org/schneider'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'linaro-warrior'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'warrior-4.19'
+        - string:
+            name: KERNEL_VERSION_PATCHLEVEL
+            default: '4.19'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (warrior 4.19)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'rzn1d'
+                - 'soca9'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - archive:
+            artifacts: 'cve-*.txt, base-cve-*.txt'
+        - postbuildscript:
+            builders:
+                - role: MASTER
+                  build-on:
+                    - SUCCESS
+                    - UNSTABLE
+                    - FAILURE
+                    - NOT_BUILT
+                    - ABORTED
+                  build-steps:
+                    - shell:
+                        !include-raw: schneider-openembedded/cve-summary.sh
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+                  - schneider-openembedded/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
+            body: |
+                $DEFAULT_CONTENT
+
+                CVE summary:
+                ${FILE,path="cve.sum"}
+            attachments: "cve.html"
diff --git a/schneider-openembedded-warrior-4.9.yaml b/schneider-openembedded-warrior-4.9.yaml
new file mode 100644
index 0000000000..5d44ebb513
--- /dev/null
+++ b/schneider-openembedded-warrior-4.9.yaml
@@ -0,0 +1,128 @@
+- job:
+    name: schneider-openembedded-warrior-4.9
+    project-type: matrix
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+        artifactNumToKeep: 1
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            ralph.siemsen@linaro.org:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: IMAGES
+            default: 'dip-image dip-image-dev dip-image-edge'
+        - string:
+            name: SUBMODULES
+            default: 'all'
+        - string:
+            name: IMAGES_RPB
+            default: ''
+        - string:
+            name: IMAGES_RPB_WAYLAND
+            default: ''
+        - string:
+            name: DISTRO_URL_BASE
+            default: 'ssh://git@dev-private-git.linaro.org/schneider'
+        - string:
+            name: DISTRO_DIR
+            default: 'DIP-Yocto-Linux-Distro'
+        - string:
+            name: MANIFEST_BRANCH
+            default: 'linaro-warrior'
+        - string:
+            name: BASE_URL
+            default: 'https://snapshots.linaro.org/'
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: STAGING_LAVA_SERVER
+            default: 'https://staging.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'schneider'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'warrior-4.9'
+        - string:
+            name: KERNEL_VERSION_PATCHLEVEL
+            default: '4.9'
+        - string:
+            name: TEST_LEVEL
+            default: 'normal'
+    disabled: false
+    node: master
+    display-name: 'Schneider OpenEmbedded (warrior 4.9)'
+    axes:
+        - axis:
+            type: user-defined
+            name: MACHINE
+            values:
+                - 'rzn1d'
+                - 'soca9'
+        - axis:
+            type: user-defined
+            name: DISTRO
+            values:
+                - dip
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-buster-amd64
+    execution-strategy:
+        sequential: false
+    wrappers:
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            echo "PUB_DEST=openembedded/schneider/${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}/${MACHINE}/${BUILD_NUMBER}/${DISTRO}" > pub_dest_parameters
+        - inject:
+            properties-file: pub_dest_parameters
+        - shell:
+            !include-raw: schneider-openembedded/builders.sh
+        - inject:
+            properties-file: post_build_lava_parameters
+        - linaro-publish-token
+        - shell:
+            !include-raw: rpb-openembedded/publishers.sh
+        - shell:
+            !include-raw: schneider-openembedded/submit_for_testing.sh
+    publishers:
+        - groovy-postbuild:
+            script:
+                !include-raw:
+                  - rpb-openembedded/postbuild.groovy
+                  - openembedded-lkft/postbuild.groovy
+        - email-ext:
+            recipients: 'fathi.boudra@linaro.org, ralph.siemsen@linaro.org'
+            always: true
+            failure: false
+            matrix-trigger: only-parent
diff --git a/schneider-openembedded/builders.sh b/schneider-openembedded/builders.sh
new file mode 100755
index 0000000000..ff174923f0
--- /dev/null
+++ b/schneider-openembedded/builders.sh
@@ -0,0 +1,573 @@
+#!/bin/bash
+set -e
+
+# workaround EDK2 is confused by the long path used during the build
+# and truncate files name expected by VfrCompile
+sudo mkdir -p /srv/oe
+sudo chown buildslave:buildslave /srv/oe
+cd /srv/oe
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    echo "Running cleanup_exit..."
+}
+
+replace_dmverity_var()
+{
+	local variable
+	local localconf
+	local newvalue
+
+	variable="DM_VERITY_IMAGE_NAME"
+	localconf="conf/local.conf"
+	newvalue="${1}"
+
+	sed -i 's/'${variable}' ?=.*/'${variable}' ?= "'${newvalue}'"/' ${localconf}
+	grep ${variable} ${localconf} || true
+}
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="python-pip android-tools-fsutils chrpath cpio diffstat gawk gfortran libmagickwand-dev libmath-prime-util-perl libsdl1.2-dev libssl-dev python-requests texinfo vim-tiny whiptail"
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+# Install ruamel.yaml (version pinned for Python-2.7 compat)
+pip install --user 'ruamel.yaml.clib==0.2.2'
+pip install --user 'ruamel.yaml<0.17'
+
+set -ex
+
+#DEL mkdir -p ${HOME}/bin
+#DEL curl https://storage.googleapis.com/git-repo-downloads/repo > ${HOME}/bin/repo
+#DEL chmod a+x ${HOME}/bin/repo
+#DEL export PATH=${HOME}/bin:${PATH}
+
+# initialize repo if not done already
+if [ ! -e ".repo/manifest.xml" ]; then
+   #DEL repo init -u ${MANIFEST_URL} -b ${MANIFEST_BRANCH_PREFIX}${MANIFEST_BRANCH}
+
+   # link to shared downloads on persistent disk
+   # our builds config is expecting downloads and sstate-cache, here.
+   # DL_DIR = "${OEROOT}/sources/downloads"
+   # SSTATE_DIR = "${OEROOT}/build/sstate-cache"
+   sstatecache=${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH}
+   if [[ "${IMAGES}" == *clean* ]]; then
+     rm -rf ${sstatecache}
+   fi
+   mkdir -p ${HOME}/srv/oe/downloads-${MANIFEST_BRANCH} ${sstatecache}
+   #DEL mkdir -p build
+   #DEL ln -s ${HOME}/srv/oe/downloads
+   #DEL ln -s ${HOME}/srv/oe/sstate-cache-${DISTRO}-${MANIFEST_BRANCH} sstate-cache
+fi
+
+
+#DEL if [ "${ghprbPullId}" ]; then
+#DEL     echo "Applying Github pull-request #${ghprbPullId} from ${ghprbGhRepository}"
+#DEL     sed -i -e "s|name=\"${ghprbGhRepository}\"|name=\"${ghprbGhRepository}\" revision=\"refs/pull/${ghprbPullId}/head\"|" .repo/manifest.xml
+#DEL fi
+
+#DEL repo sync
+#DEL cp .repo/manifest.xml source-manifest.xml
+#DEL repo manifest -r -o pinned-manifest.xml
+#DEL MANIFEST_COMMIT=$(cd .repo/manifests && git rev-parse --short HEAD)
+
+#DEL  record changes since last build, if available
+#DEL if wget -q ${BASE_URL}${PUB_DEST/\/${BUILD_NUMBER}\//\/latest\/}/pinned-manifest.xml -O pinned-manifest-latest.xml; then
+#DEL     repo diffmanifests ${PWD}/pinned-manifest-latest.xml ${PWD}/pinned-manifest.xml > manifest-changes.txt
+#DEL else
+#DEL     echo "latest build published does not have pinned-manifest.xml, skipping diff report"
+#DEL fi
+
+#DEL if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; then
+#DEL     GERRIT_URL="http://${GERRIT_HOST}/${GERRIT_PROJECT}"
+#DEL     cd `grep -rni $GERRIT_PROJECT\" .repo/manifest.xml | grep -Po 'path="\K[^"]*'`
+#DEL     if git pull ${GERRIT_URL} ${GERRIT_REFSPEC} | grep -q "Automatic merge failed"; then
+#DEL         git reset --hard
+#DEL         echo "Error: *** Error patch merge failed"
+#DEL         exit 1
+#DEL     fi
+#DEL     cd -
+#DEL fi
+
+# RFS 2021/04/02 workaround "Host key verification failed" on github cloud
+export GIT_SSH_COMMAND="ssh -o StrictHostKeyChecking=no"
+
+git clone ${DISTRO_URL_BASE}/${DISTRO_DIR} -b ${MANIFEST_BRANCH}
+cd ${DISTRO_DIR}
+git log -1
+git submodule init
+git submodule update
+
+# the setup-environment will create auto.conf and site.conf
+# make sure we get rid of old config.
+# let's remove the previous TMPDIR as well.
+# we want to preserve build/buildhistory though.
+#DEL rm -rf conf build/conf build/tmp/
+
+# Accept EULA if/when needed
+#DEL export EULA_dragonboard410c=1
+#DEL export EULA_stih410b2260=1
+#DEL source setup-environment build
+
+# Set the machine to the value expected by the Yocto environment
+# We set it back again later
+machine_orig=${MACHINE}
+case "${MACHINE}" in
+  *rzn1*)
+    MACHINE=rzn1d400-bestla
+    ;;
+  *soca9*)
+    MACHINE=snarc-soca9
+    ;;
+  *am64x*)
+    MACHINE=am64xx-evm
+    ;;
+esac
+
+# SUBMODULES is set to:
+#	none		no update
+#	''		update default set in setup-env...
+#	all		tell setup-env... to update all submodules
+#	'<something>'	pass the variable to submodule update
+if [[ ${MANIFEST_BRANCH} == linaro-* ]];
+then
+	if [[ "${SUBMODULES}" != "none" ]]; then
+	  ./setup-environment -s build-${machine_orig}/
+
+	  # Temporary 2021/12/07 go back to pinned version of tensorflow
+	  # due to upstream switch to cmake, conflicts with our local fix
+	  # for segfaults on LCES2 due to incorrect VFP mode
+	  git submodule update sources/meta-tensorflow-lite
+
+	  # Also avoid updating meta-ti layer for two reasons:
+	  # 1) want to use older tagged version to avoid SPL boot failure
+	  # 2) latest version is not compatible with dunfell branch
+	  git submodule update sources/meta-ti
+	fi
+fi
+
+source ./setup-environment build-${machine_orig}/
+
+ln -s ${HOME}/srv/oe/downloads-${MANIFEST_BRANCH} downloads
+ln -s ${sstatecache} sstate-cache
+
+# Add job BUILD_NUMBER to output files names, overriding the
+# default suffix of "-${DATETIME}" from bitbake.conf
+cat << EOF >> conf/auto.conf
+IMAGE_VERSION_SUFFIX = "-${BUILD_NUMBER}"
+EOF
+
+# get build stats to make sure that we use sstate properly
+cat << EOF >> conf/auto.conf
+INHERIT += "buildstats buildstats-summary"
+EOF
+
+# Make sure we don't use rm_work in CI slaves since they are non persistent build nodes
+cat << EOF >> conf/auto.conf
+INHERIT_remove = "rm_work"
+EOF
+
+# allow the top level job to append to auto.conf
+if [ -f ${WORKSPACE}/auto.conf ]; then
+    cat ${WORKSPACE}/auto.conf >> conf/auto.conf
+fi
+
+# add useful debug info
+cat conf/auto.conf
+
+[ "${DISTRO}" = "rpb" ] && IMAGES+=" ${IMAGES_RPB}"
+[ "${DISTRO}" = "rpb-wayland" ] && IMAGES+=" ${IMAGES_RPB_WAYLAND}"
+
+# These machines only build the basic rpb-console-image
+case "${MACHINE}" in
+  am57xx-evm|intel-core2-32|intel-corei7-64)
+     IMAGES="rpb-console-image"
+     ;;
+esac
+
+postfile=$(mktemp /tmp/postfile.XXXXX.conf)
+echo KERNEL_VERSION_PATCHLEVEL = \"${KERNEL_VERSION_PATCHLEVEL}\" > ${postfile}
+echo PREFERRED_VERSION_linux-rzn1 = \"${KERNEL_VERSION_PATCHLEVEL}.%\" >> ${postfile}
+echo PREFERRED_VERSION_linux-socfpga = \"${KERNEL_VERSION_PATCHLEVEL}.%\" >> ${postfile}
+echo PREFERRED_VERSION_linux-ti-staging = \"${KERNEL_VERSION_PATCHLEVEL}.%\" >> ${postfile}
+cat ${postfile}
+bbopt="-R ${postfile}"
+
+if [ "${clean_packages}" != "" ]; then
+    bitbake ${bbopt} -c cleansstate ${clean_packages}
+    bitbake ${bbopt} ${build_packages}
+fi
+
+# Cleanup mbedtls/edgeagent repos, the gitsm fetcher gets confused easily
+#rm -rf ${HOME}/srv/oe/downloads/git2/*mbedtls*
+#rm -rf ${HOME}/srv/oe/downloads/git2/*optiga*
+#rm -rf ${HOME}/srv/oe/downloads/git2/*EdgeAgent*
+#rm -rf ${HOME}/srv/oe/downloads/git2/*Azure*
+#rm -rf ${HOME}/srv/oe/downloads/git2/*Microsoft*
+#rm -rf ${HOME}/srv/oe/downloads/git2/*kgabis.parson*
+#bitbake ${bbopt} -c cleansstate mbedtls edgeagent
+
+# Build all ${IMAGES}
+dipimg="prod-image"
+devimg="dev-image"
+sdkimg="sdk-image"
+
+DEPLOY_DIR_IMAGE=$(bitbake -e | grep "^DEPLOY_DIR_IMAGE="| cut -d'=' -f2 | tr -d '"')
+
+if [[ "${IMAGES}" == *"${dipimg}"* ]]; then
+	replace_dmverity_var "${dipimg}"
+
+	grep -c ^processor /proc/cpuinfo
+	grep ^cpu\\scores /proc/cpuinfo | uniq |  awk '{print $4}'
+
+	time bitbake ${bbopt} ${dipimg} || true
+	ls -ld tmp/*/*/edgeagent downloads/git2/*EdgeAgent* downloads/git2/*cmocka* downloads/git2/*Azure* downloads/git2/*Microsoft* downloads/git2/*kgabis* || true
+
+	# Make a copy of the CVE report using a fixed filename, because:
+	# 1) later invocations of bitbake may overwrite the report, and
+	# 2) facilitate later retrieval from snapshots.linaro.org via "latest" link.
+	cp ${DEPLOY_DIR_IMAGE}/${dipimg}-${MACHINE}.cve ${DEPLOY_DIR_IMAGE}/${dipimg}-${MACHINE}.rootfs.cve
+
+	case "${MACHINE}" in
+		*rzn1*)
+			cat tmp/work-shared/${MACHINE}/dm-verity/prod-image.squashfs-lzo.verity.env || true
+			;;
+	esac
+
+	ls -al ${DEPLOY_DIR_IMAGE} || true
+	ls -al ${DEPLOY_DIR_IMAGE}/optee || true
+	ls -al ${DEPLOY_DIR_IMAGE}/cm3 || true
+	ls -al ${DEPLOY_DIR_IMAGE}/u-boot || true
+	ls -al ${DEPLOY_DIR_IMAGE}/fsbl || true
+
+	# Copy license and manifest information into the deploy dir
+	cp -aR ./tmp/deploy/licenses/prod-image-*/*.manifest ${DEPLOY_DIR_IMAGE}
+fi
+
+if [[ "${IMAGES}" == *"${devimg}"* ]]; then
+	replace_dmverity_var ""
+	time bitbake ${bbopt} ${devimg} || true
+	ls -ld tmp/*/*/edgeagent downloads/git2/*EdgeAgent* downloads/git2/*cmocka* downloads/git2/*Azure* downloads/git2/*Microsoft* downloads/git2/*kgabis* || true
+
+	# Make a copy of the CVE report using a fixed filename
+	cp ${DEPLOY_DIR_IMAGE}/${devimg}-${MACHINE}.cve ${DEPLOY_DIR_IMAGE}/${devimg}-${MACHINE}.rootfs.cve
+
+	ls -al ${DEPLOY_DIR_IMAGE} || true
+	ls -al ${DEPLOY_DIR_IMAGE}/cm3 || true
+	ls -al ${DEPLOY_DIR_IMAGE}/u-boot || true
+	ls -al ${DEPLOY_DIR_IMAGE}/fsbl || true
+	ls -al ${DEPLOY_DIR_IMAGE}/optee || true
+
+	time bitbake ${bbopt} ${sdkimg}
+
+	# Make a copy of the CVE report using a fixed filename
+	cp ${DEPLOY_DIR_IMAGE}/${sdkimg}-${MACHINE}.cve ${DEPLOY_DIR_IMAGE}/${sdkimg}-${MACHINE}.rootfs.cve
+
+	DEPLOY_DIR_SDK=$(bitbake -e | grep "^DEPLOY_DIR="| cut -d'=' -f2 | tr -d '"')/sdk
+	cp -aR ${DEPLOY_DIR_SDK} ${DEPLOY_DIR_IMAGE}
+fi
+
+# Prepare files to publish
+rm -f ${DEPLOY_DIR_IMAGE}/*.txt
+find ${DEPLOY_DIR_IMAGE} -type l -delete
+#DEL mv /srv/oe/{source,pinned}-manifest.xml ${DEPLOY_DIR_IMAGE}
+#DEL cat ${DEPLOY_DIR_IMAGE}/pinned-manifest.xml
+
+### Begin CVE check
+
+if [ -e ${DEPLOY_DIR_IMAGE}/${dipimg}-${MACHINE}.rootfs.cve ] ; then
+
+	# Get the current CVE report
+	cp ${DEPLOY_DIR_IMAGE}/${dipimg}-${MACHINE}.rootfs.cve cve-${MACHINE}.new
+
+	# Fetch previous CVE report
+	LATEST_DEST=$(echo $PUB_DEST | sed -e "s#/$BUILD_NUMBER/#/latest/#")
+	rm -f cve-${MACHINE}.old
+	wget -nv -O cve-${MACHINE}.old ${BASE_URL}/${LATEST_DEST}/prod-image-${MACHINE}.rootfs.cve || true
+
+	# Download may fail (404 error), or might not contain the report (auth error)
+	if ! grep -q "PACKAGE NAME" cve-${MACHINE}.old 2>/dev/null; then
+		# Use current CVE list, to avoid diff-against-nothing
+		cp cve-${MACHINE}.new cve-${MACHINE}.old
+		# Append a fake entry that will appear in the diff
+		cat <<-EOF >>cve-${MACHINE}.old
+		PACKAGE NAME: failed-to-download-previous-CVEs
+		PACKAGE VERSION: 0.0
+		CVE: CVE-xxxx-yyyy
+		CVE STATUS: Unpatched
+		CVE SUMMARY: Unable to download CVE results for previous build. Comparison disabled.
+		CVSS v2 BASE SCORE: 0.0
+		CVSS v3 BASE SCORE: 0.0
+		VECTOR: LOCAL
+		MORE INFORMATION: none
+		EOF
+	fi
+
+	# Do diffs between old and current CVE report.
+	wget -nv -O diff-cve https://git.linaro.org/ci/job/configs.git/plain/schneider-openembedded/diff-cve
+	gawk -f diff-cve cve-${MACHINE}.old cve-${MACHINE}.new | tee ${WORKSPACE}/cve-${MACHINE}.txt
+
+	# Same thing, but against arbitrary (but fixed) baseline
+	case "${MACHINE}" in
+		*rzn1*)
+		wget -nv -O cve-${MACHINE}.base https://releases.linaro.org/members/schneider/openembedded/2021.08.dunfell/rzn1d-5.10/prod-image-rzn1d400-bestla.rootfs.cve
+		;;
+		*soca9*)
+		wget -nv -O cve-${MACHINE}.base https://releases.linaro.org/members/schneider/openembedded/2021.08.dunfell/soca9-5.10/prod-image-snarc-soca9.rootfs.cve
+		;;
+		*am64x*)
+		# TODO: update this URL for baseline on am64x.
+		#wget -nv -O cve-${MACHINE}.base https://releases.linaro.org/members/schneider/openembedded/2021.08.dunfell/soca9-5.10/prod-image-snarc-soca9.rootfs.cve
+		# For now just copy the current report as the baseline
+		cp cve-${MACHINE}.new cve-${MACHINE}.base
+		;;
+	esac
+	gawk -f diff-cve cve-${MACHINE}.base cve-${MACHINE}.new > ${WORKSPACE}/base-cve-${MACHINE}.txt
+fi
+
+### End CVE check
+
+# FIXME: IMAGE_FSTYPES_remove doesn't work
+rm -f ${DEPLOY_DIR_IMAGE}/*.rootfs.ext4 \
+      ${DEPLOY_DIR_IMAGE}/*.rootfs.iso \
+      ${DEPLOY_DIR_IMAGE}/*.iso \
+      ${DEPLOY_DIR_IMAGE}/*.jffs* \
+      ${DEPLOY_DIR_IMAGE}/*.cpio.gz \
+      ${DEPLOY_DIR_IMAGE}/*.stimg
+
+# FIXME: Sparse images here, until it gets done by OE
+case "${MACHINE}" in
+  *rzn1*)
+    pushd ${DEPLOY_DIR_IMAGE}
+    rm -f uImage*
+    popd
+    ;;
+  *soca9*)
+    # re-create the SoCA9 DTB with a shorter filename
+    pushd ${DEPLOY_DIR_IMAGE}
+    mv zImage-*soca9*_bestla_512m*.dtb zImage-soca9_qspi_micronN25Q_bestla_512m.dtb || true
+    mv zImage-*soca9*.dtb zImage-soca9_qspi_micronN25Q_bestla_512m.dtb || true
+    rm -f *[12]G*.dtb || true
+    rm -f *freja*.dtb || true
+    rm -f *socfpga_cyclone5_socdk*.dtb || true
+    popd
+    ;;
+  *am64x*)
+    pushd ${DEPLOY_DIR_IMAGE}
+    # TODO delete unnecessary files
+    popd
+    ;;
+  juno|stih410-b2260|orangepi-i96)
+    ;;
+  *)
+    for rootfs in $(find ${DEPLOY_DIR_IMAGE} -type f -name *.rootfs.ext4.gz); do
+      gunzip -k ${rootfs}
+      sudo ext2simg -v ${rootfs%.gz} ${rootfs%.ext4.gz}.img
+      rm -f ${rootfs%.gz}
+      gzip -9 ${rootfs%.ext4.gz}.img
+    done
+    ;;
+esac
+
+ls -al ${DEPLOY_DIR_IMAGE}/*
+
+# Create MD5SUMS file
+find ${DEPLOY_DIR_IMAGE} -type f | xargs md5sum > MD5SUMS.txt
+sed -i "s|${DEPLOY_DIR_IMAGE}/||" MD5SUMS.txt
+mv MD5SUMS.txt ${DEPLOY_DIR_IMAGE}
+
+# Build information
+cat > ${DEPLOY_DIR_IMAGE}/HEADER.textile << EOF
+
+h4. Reference Platform Build - CE OpenEmbedded
+
+Build description:
+* Build URL: "$BUILD_URL":$BUILD_URL
+* Manifest URL: "${MANIFEST_URL}":${MANIFEST_URL}
+* Manifest branch: ${MANIFEST_BRANCH_PREFIX}${MANIFEST_BRANCH}
+* Manifest commit: "${MANIFEST_COMMIT}":${MANIFEST_URL/.git/\/commit}/${MANIFEST_COMMIT}
+EOF
+
+if [ -e "/srv/oe/manifest-changes.txt" ]; then
+  # the space after pre.. tag is on purpose
+  cat > ${DEPLOY_DIR_IMAGE}/README.textile << EOF
+
+h4. Manifest changes
+
+pre.. 
+EOF
+  cat /srv/oe/manifest-changes.txt >> ${DEPLOY_DIR_IMAGE}/README.textile
+  mv /srv/oe/manifest-changes.txt ${DEPLOY_DIR_IMAGE}
+fi
+
+# Identify snapshots as public
+touch ${DEPLOY_DIR_IMAGE}/OPEN-EULA.txt
+
+# Need different files for each machine
+ROOTFS_EXT4_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-*rzn1*-*-${BUILD_NUMBER}.rootfs.ext4.gz" | xargs -r basename)
+ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-*rzn1*-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
+ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-test-*rzn1*-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
+ROOTFS_DESKTOP_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-desktop-image-test-*rzn1*-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
+KERNEL_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*-*rzn1*-*-${BUILD_NUMBER}.bin" | xargs -r basename)
+case "${MACHINE}" in
+  am57xx-evm)
+    # LAVA image is too big for am57xx-evm
+    ROOTFS_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.img.gz" | xargs -r basename)
+    # FIXME: several dtb files case
+    ;;
+  intel-core2-32|intel-corei7-64)
+    # No LAVA testing on intel-core* machines
+    ROOTFS_TARXZ_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "rpb-console-image-${MACHINE}-*-${BUILD_NUMBER}.rootfs.tar.xz" | xargs -r basename)
+    ;;
+  juno)
+    # FIXME: several dtb files case
+    ;;
+  *rzn1*)
+    ROOTFS_TAR_BZ2=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-${MACHINE}-${BUILD_NUMBER}.rootfs.tar.bz2" | xargs -r basename)
+    ROOTFS_DEV_TAR_BZ2=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.tar.bz2" | xargs -r basename)
+    WIC_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-rzn1*-${BUILD_NUMBER}.rootfs.wic.bz2" | xargs -r basename)
+    WIC_BMAP=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-rzn1*-${BUILD_NUMBER}.rootfs.wic.bmap" | xargs -r basename)
+
+    # The following images will have their size reported to SQUAD
+    UBOOT=$(find ${DEPLOY_DIR_IMAGE}/u-boot -type f -name "u-boot-${MACHINE}-${BUILD_NUMBER}.bin.spkg")
+    UBOOT_IMG=$(basename ${UBOOT})
+    UBOOT_FIT=$(find ${DEPLOY_DIR_IMAGE}/u-boot -type f -name "u-boot-${MACHINE}-${BUILD_NUMBER}.itb")
+    UBOOT_FIT_IMG=$(basename ${UBOOT_FIT})
+    DTB=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*rzn1*bestla*.dtb")
+    DTB_IMG=$(basename ${DTB})
+    KERNEL=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage--*rzn1*.bin")
+    KERNEL_IMG=$(basename ${KERNEL})
+    KERNEL_FIT=$(find ${DEPLOY_DIR_IMAGE} -type f -name "fitImage*.itb")
+    KERNEL_FIT_IMG=$(basename ${KERNEL_FIT})
+    FSBL=$(find ${DEPLOY_DIR_IMAGE}/fsbl -type f -name "fsbl-fip-${MACHINE}-${BUILD_NUMBER}.spkg")
+    FSBL_IMG=$(basename ${FSBL})
+    OPTEE_FIT=$(find ${DEPLOY_DIR_IMAGE}/optee -type f -name "optee-os-${MACHINE}-${BUILD_NUMBER}.itb")
+    OPTEE_FIT_IMG=$(basename ${OPTEE_FIT})
+    UBI=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-${MACHINE}-${BUILD_NUMBER}.rootfs.fitubi")
+    UBI_IMG=$(basename ${UBI})
+    WIC_DEV=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.wic.bz2")
+    WIC_DEV_IMG=$(basename ${WIC_DEV})
+    WIC_DEV_BMAP=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.wic.bmap" | xargs -r basename)
+    ;;
+  *soca9*)
+    ROOTFS_TAR_BZ2=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-snarc-soca9-${BUILD_NUMBER}.rootfs.tar.bz2" | xargs -r basename)
+    ROOTFS_DEV_TAR_BZ2=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-snarc-soca9*-${BUILD_NUMBER}.rootfs.tar.bz2" | xargs -r basename)
+    WIC_BMAP=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-snarc-soca9-${BUILD_NUMBER}.rootfs.wic.bmap" | xargs -r basename)
+
+    # The following images will have their size reported to SQUAD
+    UBOOT=$(find ${DEPLOY_DIR_IMAGE} -type f -name "u-boot-with-spl-${BUILD_NUMBER}.sfp")
+    UBOOT_IMG=$(basename ${UBOOT})
+    DTB=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage-*soca9*.dtb")
+    DTB_IMG=$(basename ${DTB})
+    KERNEL=$(find ${DEPLOY_DIR_IMAGE} -type f -name "zImage--*soca9*.bin")
+    KERNEL_IMG=$(basename ${KERNEL})
+    WIC=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-snarc-soca9-${BUILD_NUMBER}.rootfs.wic.bz2")
+    WIC_IMG=$(basename ${WIC})
+    WIC_DEV=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-snarc-soca9-${BUILD_NUMBER}.rootfs.wic.bz2")
+    WIC_DEV_IMG=$(basename ${WIC_DEV})
+    WIC_DEV_BMAP=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-snarc-soca9-${BUILD_NUMBER}.rootfs.wic.bmap" | xargs -r basename)
+    ;;
+  *am64x*)
+    ROOTFS_TAR_BZ2=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-${MACHINE}-${BUILD_NUMBER}.rootfs.tar.bz2" | xargs -r basename)
+    ROOTFS_DEV_TAR_BZ2=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.tar.bz2" | xargs -r basename)
+    WIC_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.wic.bz2" | xargs -r basename)
+    WIC_BMAP=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.wic.bmap" | xargs -r basename)
+
+    # The following images will have their size reported to SQUAD
+    UBOOT=$(find ${DEPLOY_DIR_IMAGE} -type f -name "u-boot-${MACHINE}-*.img")
+    UBOOT_IMG=$(basename ${UBOOT})
+    #UBOOT_FIT=$(find ${DEPLOY_DIR_IMAGE}/u-boot -type f -name "u-boot-${MACHINE}-*.img")
+    #UBOOT_FIT_IMG=$(basename ${UBOOT_FIT})
+    DTB=$(find ${DEPLOY_DIR_IMAGE} -type f -name "k3-am642-evm-*.dtb")
+    DTB_IMG=$(basename ${DTB})
+    KERNEL=$(find ${DEPLOY_DIR_IMAGE} -type f -name "Image-*.bin")
+    KERNEL_IMG=$(basename ${KERNEL})
+    #KERNEL_FIT=$(find ${DEPLOY_DIR_IMAGE} -type f -name "fitImage*.itb")
+    #KERNEL_FIT_IMG=$(basename ${KERNEL_FIT})
+    #FSBL=$(find ${DEPLOY_DIR_IMAGE}/fsbl -type f -name "fsbl-fip-${MACHINE}-${BUILD_NUMBER}.spkg")
+    #FSBL_IMG=$(basename ${FSBL})
+    OPTEE_FIT=$(find ${DEPLOY_DIR_IMAGE}/optee -type f -name "bl32.bin")
+    OPTEE_FIT_IMG=$(basename ${OPTEE_FIT})
+    #UBI=$(find ${DEPLOY_DIR_IMAGE} -type f -name "prod-image-${MACHINE}-${BUILD_NUMBER}.rootfs.fitubi")
+    #UBI_IMG=$(basename ${UBI})
+    WIC_DEV=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.wic.bz2")
+    WIC_DEV_IMG=$(basename ${WIC_DEV})
+    WIC_DEV_BMAP=$(find ${DEPLOY_DIR_IMAGE} -type f -name "dev-image-${MACHINE}-${BUILD_NUMBER}.rootfs.wic.bmap" | xargs -r basename)
+    ;;
+  *)
+    DTB_IMG=$(find ${DEPLOY_DIR_IMAGE} -type f -name "*-${MACHINE}-*-${BUILD_NUMBER}.dtb" | xargs -r basename)
+    ;;
+esac
+
+# Set MACHINE back to the origin value
+MACHINE=${machine_orig}
+
+send_image_size_to_squad()
+{
+    local metric=$1
+    local filename=$2
+    local image_size=0
+
+    # get file size
+    if [ ! -z "{filename}" ] && [ -e "${filename}" ]; then
+        image_size=$(stat --printf="%s" ${filename})
+    fi
+
+    echo metric=$metric
+    echo filename=$(basename $filename)
+    echo image_size=$image_size
+
+    # send the metric to SQUAD
+    curl --header "Auth-Token: ${QA_REPORTS_TOKEN}" --form metrics='{"'${metric}'": "'${image_size}'"}' ${QA_SERVER}/api/submit/${QA_SERVER_TEAM}/${QA_SERVER_PROJECT}/${BUILD_NUMBER}/${MACHINE}
+}
+
+# Send image sizes to SQUAD
+# note: we specifically want to report a zero image size if the image doesn't exist
+#       this works around a SQUAD bug and allows metrics graphs showing multiple
+#       boards to look sane when one of those boards has no values for the metric
+send_image_size_to_squad "IMG_SIZE_UBOOT"      "${UBOOT}"
+send_image_size_to_squad "IMG_SIZE_UBOOT_FIT"  "${UBOOT_FIT}"
+send_image_size_to_squad "IMG_SIZE_DTB"        "${DTB}"
+send_image_size_to_squad "IMG_SIZE_KERNEL"     "${KERNEL}"
+send_image_size_to_squad "IMG_SIZE_KERNEL_FIT" "${KERNEL_FIT}"
+send_image_size_to_squad "IMG_SIZE_FSBL"       "${FSBL}"
+send_image_size_to_squad "IMG_SIZE_OPTEE_FIT"  "${OPTEE_FIT}"
+send_image_size_to_squad "IMG_SIZE_UBI"        "${UBI}"
+send_image_size_to_squad "IMG_SIZE_WIC"        "${WIC}"
+send_image_size_to_squad "IMG_SIZE_WIC_DEV"    "${WIC_DEV}"
+
+# Note: the main job script allows to override the default value for
+#       BASE_URL and PUB_DEST, typically used for OE RPB builds
+cat << EOF > ${WORKSPACE}/post_build_lava_parameters
+DEPLOY_DIR_IMAGE=${DEPLOY_DIR_IMAGE}
+MANIFEST_COMMIT=${BUILD_NUMBER}
+ROOTFS_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_EXT4_IMG}
+ROOTFS_SPARSE_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_IMG}
+ROOTFS_DESKTOP_SPARSE_BUILD_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_DESKTOP_IMG}
+SYSTEM_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_EXT4_IMG}
+OPTEE_ITB_URL=${BASE_URL}${PUB_DEST}/optee/${OPTEE_FIT_IMG}
+FSBL_URL=${BASE_URL}${PUB_DEST}/fsbl/${FSBL_IMG}
+UBOOT_ITB_URL=${BASE_URL}${PUB_DEST}/u-boot/${UBOOT_FIT_IMG}
+KERNEL_FIT_URL=${BASE_URL}${PUB_DEST}/${KERNEL_FIT_IMG}
+KERNEL_ZIMAGE_URL=${BASE_URL}${PUB_DEST}/${KERNEL_IMG}
+WIC_IMAGE_URL=${BASE_URL}${PUB_DEST}/${WIC_IMG}
+WIC_BMAP_URL=${BASE_URL}${PUB_DEST}/${WIC_BMAP}
+WIC_DEV_IMAGE_URL=${BASE_URL}${PUB_DEST}/${WIC_DEV_IMG}
+WIC_DEV_BMAP_URL=${BASE_URL}${PUB_DEST}/${WIC_DEV_BMAP}
+UBI_IMAGE_URL=${BASE_URL}${PUB_DEST}/${UBI_IMG}
+DTB_URL=${BASE_URL}${PUB_DEST}/${DTB_IMG}
+NFSROOTFS_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_TAR_BZ2}
+NFSROOTFS_DEV_URL=${BASE_URL}${PUB_DEST}/${ROOTFS_DEV_TAR_BZ2}
+RECOVERY_IMAGE_URL=${BASE_URL}${PUB_DEST}/juno-oe-uboot.zip
+LXC_ROOTFS_IMG=$(basename ${ROOTFS_IMG} .gz)
+DEVICE_TYPE=${MACHINE}
+EOF
diff --git a/schneider-openembedded/cve-summary.sh b/schneider-openembedded/cve-summary.sh
new file mode 100755
index 0000000000..1dc0d4cfb2
--- /dev/null
+++ b/schneider-openembedded/cve-summary.sh
@@ -0,0 +1,75 @@
+#!/bin/sh
+#
+# Combine CVE reports for rzn1 and soca9
+#
+
+set -e
+
+#
+# Did the build succeed? Check for logfiles:
+#   axis-MACHINE: rzn1d, soca9
+#   files: cve-rzn1d400-bestla.txt, cve-snarc-soca9.txt
+#
+if ! test \
+-e $JENKINS_HOME/jobs/$JOB_NAME/configurations/axis-DISTRO/dip/axis-MACHINE/rzn1d/axis-label/docker-buster-amd64/builds/$BUILD_NUMBER/archive/cve-rzn1d400-bestla.txt -o \
+-e $JENKINS_HOME/jobs/$JOB_NAME/configurations/axis-DISTRO/dip/axis-MACHINE/soca9/axis-label/docker-buster-amd64/builds/$BUILD_NUMBER/archive/cve-snarc-soca9.txt -o \
+-e $JENKINS_HOME/jobs/$JOB_NAME/configurations/axis-DISTRO/dip/axis-MACHINE/am64x/axis-label/docker-buster-amd64/builds/$BUILD_NUMBER/archive/cve-am64xx-evm.txt
+then
+	echo '<h1>Build failed, no CVE check done</h1>' > cve.html
+	echo 'Build failed, no CVE check done' > cve.sum
+	exit
+fi
+
+#
+# Combine the reports using sort/uniq.
+# Note the wildcard for MACHINE (rzn1/soca9).
+#
+ARCHIVE="$JENKINS_HOME/jobs/$JOB_NAME/configurations/axis-DISTRO/dip/axis-MACHINE/*/axis-label/docker-buster-amd64/builds/$BUILD_NUMBER/archive"
+sort -uV $ARCHIVE/cve-*.txt      > cve.txt
+sort -uV $ARCHIVE/base-cve-*.txt > base-cve.txt
+
+#
+# Detailed report in HTML format. Will be attached to email.
+# Perl helper converts tab-delimited text to nested <ul> elements.
+#
+htmlify() {
+	perl -F'\t' -lane '
+		my ($type, $cve, $pkg, $url, @rest) = @F;
+		sub list {
+			return @_ ? join("", "<ul>\n", map("<li>$_</li>\n", @_), "</ul>") : ""
+		};
+		push @{$line{$type}}, ("<a href=\"$url\">$cve</a> $pkg" . list(@rest));
+		END { foreach (reverse sort keys %line) {
+			print "<b>$_ CVEs</b>", list(@{$line{$_}}) if @{$line{$_}}
+		}}' $1
+}
+(
+	echo "<h1>CVE changes</h1>"
+	echo "<p>Submodule update strategy: <code>$SUBMODULES</code>.</p>"
+	echo "<h2>Since last build</h2>"
+	htmlify cve.txt
+	echo "<h2>Since baseline</h2>"
+	htmlify base-cve.txt
+) > cve.html
+
+#
+# Summary report in plain text, gets embedded in the email.
+# This just prints a count of each type of CVE.
+#
+summary() { #
+	local NEW=`grep -c ^NEW $1`
+	local CHANGED=`grep -c ^CHANGED $1`
+	local FIXED=`grep -c ^FIXED $1`
+	printf "%2d NEW, %2d CHANGED, %2d FIXED\n" $NEW $CHANGED $FIXED
+}
+(
+	echo -n "  - since last build: "
+	summary cve.txt
+	echo -n "  - since baseline:   "
+	summary base-cve.txt
+	echo "  - submodule update strategy was $SUBMODULES"
+	echo "  - see attached report for details"
+) > cve.sum
+
+# Clean up
+rm -f cve.txt base-cve.txt
diff --git a/schneider-openembedded/diff-cve b/schneider-openembedded/diff-cve
new file mode 100755
index 0000000000..d3891ee961
--- /dev/null
+++ b/schneider-openembedded/diff-cve
@@ -0,0 +1,102 @@
+#!/usr/bin/gawk -f
+#
+# Summarize differences between two CVE reports.
+
+# Collect header line
+/CVE database update/ {
+	DB_DATE = gensub(/.*: /, "", 1, $0)
+	next
+}
+
+# Multiline input, separated by blank lines
+BEGIN { RS="" ; FS="\n"; OFS="\t" }
+
+# For every line, from each input file
+{
+	# Ignore layer name (poky commit a50fe284b982e2269d3b29236ba9796f216f7414)
+	sub(/LAYER: \S+\n/, "", $0);
+
+	# Remove the prefix from each line
+	# Also collect prefix names for later
+	for (i = 1; i <= NF; i++) {
+		PFX[i] = gensub(/:.*/, "", 1, $i)
+		$i = gensub(/.*: /, "", 1, $i)
+	}
+
+	# Hack: exclude specific packages:
+	# bzip2-native and file-native are ASSUME_PROVIDED by Yocto.
+	# u-boot-rzn1-* are duplicates of u-boot-rzn1.
+	# linux-* because NVD doesn't track LTS branches sensibly.
+	if ($1 == "bzip2-native") next;
+	if ($1 == "file-native") next;
+	if ($1 ~ /^u-boot-rzn1-/) next;
+	if ($1 ~ /^linux-/) next;
+
+	# Ignore CVEs that are marked as "Patched" or "Whitelisted"
+	if ($4 == "Patched") next;
+	if ($4 == "Whitelisted") next;
+
+	# Indexing is done using PKGNAME-CVENUM for uniqueness.
+	# Tab as separator since dashes occur in components.
+	KEY = $1 "\t" $3
+
+	# Store data from 1st filename into OLD, and 2nd file into NEW
+	if (ARGIND == 1)
+		OLD[KEY] = $0;
+	else
+		NEW[KEY] = $0;
+}
+
+# Upon completion of reading input
+END	{
+	# Traverse arrays in predictable order
+	PROCINFO["sorted_in"] = "@ind_str_asc"
+
+	# Compare entries of OLD and NEW
+	for (f in NEW) {
+		if (f in OLD) {
+			if (NEW[f] != OLD[f]) {
+				CVE_CHANGED[f] = fmt_chg("CHANGED", OLD[f], NEW[f])
+			}
+			delete OLD[f]
+		} else {
+			CVE_NEW[f] = fmt_cve("NEW", NEW[f])
+		}
+	}
+	for (f in OLD) {
+		CVE_OLD[f] = fmt_cve("FIXED", OLD[f])
+	}
+
+	# Report changes
+	for (f in CVE_NEW) {
+		print CVE_NEW[f]
+	}
+	for (f in CVE_CHANGED) {
+		print CVE_CHANGED[f]
+	}
+	for (f in CVE_OLD) {
+		print CVE_OLD[f]
+	}
+}
+
+# Format new/fixed CVEs
+function fmt_cve(prefix, f,           a) {
+	split(f, a, "\t")
+	return sprintf("%s\t%s\tscore %s in %s-%s\t%s", prefix, a[3], a[7], a[1], a[2], a[9])
+}
+
+# Format changed CVEs
+function fmt_chg(prefix, old, new,	x, a, b, o, n, i) {
+	x = fmt_cve(prefix, new)
+	a = split(old, o, "\t")
+	b = split(new, n, "\t")
+	if (a != b) {
+		return x "\n\t field count mismatch! "  a " !=" b
+	}
+	# Compare fields and report ones that differ
+	for (i in o) {
+		if (o[i] == n[i]) continue;
+		x = x sprintf("\t%s: %s --> %s", PFX[i], o[i], n[i])
+	}
+	return x
+}
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/dev-image.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/dev-image.yaml
new file mode 100644
index 0000000000..9c622f80f5
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/dev-image.yaml
@@ -0,0 +1,466 @@
+device_type: rzn1d
+tags:
+- tpm
+
+job_name: SE ${MACHINE} dev-image (nfs,wic) ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 180
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+actions:
+
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    name: set_boot_to_nand
+
+- boot:
+    namespace: dfu-firmware
+    method: dfu
+    timeout:
+      minutes: 10
+
+- command:
+    namespace: test
+    name: set_boot_to_qspi
+
+##########################
+# Configure ethernet ports
+##########################
+- command:
+    namespace: test
+    name: j17_off
+- command:
+    namespace: test
+    name: j21_on
+- command:
+    namespace: test
+    name: j22_off
+- command:
+    namespace: test
+    name: j23_off
+- command:
+    namespace: test
+    name: j24_off
+
+###############
+# TFTP/NFS
+###############
+- deploy:
+    namespace: test-nfs
+    timeout:
+      minutes: 15
+    to: tftp
+    os: oe
+    kernel:
+      url: ${KERNEL_ZIMAGE_URL}
+      type: zimage
+    dtb:
+      url: ${DTB_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_DEV_URL}
+      compression: bz2
+
+- boot:
+    namespace: test-nfs
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - setenv autoload no
+      - dhcp
+      - dhcp
+      - env print
+      - setenv serverip {SERVER_IP}
+      - tftp {KERNEL_ADDR} {KERNEL}
+      - tftp {DTB_ADDR} {DTB}
+      - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp audit=0'"
+      - '{BOOTX}'
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+
+- test:
+    namespace: test-nfs
+    timeout:
+      minutes: 40
+    interactive:
+    - name: basic-cmds-tftp
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: which docker
+
+- test:
+    namespace: test-nfs
+    timeout:
+      minutes: 40
+    definitions:
+
+    - name: smoke-tests-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/smoke/smoke.yaml
+      parameters:
+        SKIP_INSTALL: True
+        TESTS: "pwd, uname -a, cat /etc/os-release, ip a, lscpu, vmstat, lsblk, ps aux --sort -rss, free -h, mount"
+
+    - name: ethernet-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ethernet/ethernet.yaml
+      parameters:
+        INTERFACE: eth1
+
+    - name: meminfo-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+    - name: badblocks-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/badblocks/badblocks.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+    - name: memtester-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/memtester/memtester.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 40
+    interactive:
+    - name: basic-cmds-wic
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+##################
+# Functional Tests
+##################
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 100
+    definitions:
+
+    - name: files-exist
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/files-exist/files-exist.yaml
+      parameters:
+        SKIP_INSTALL: true
+        EXTRA_FILES: '/etc/os-release'
+
+    - name: ethernet
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ethernet/ethernet.yaml
+      parameters:
+        INTERFACE: eth1
+
+    - name: meminfo
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+    - name: badblocks
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/badblocks/badblocks.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+    - name: memtester
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/memtester/memtester.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+    - name: yepkit-list
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        LIST: true
+
+    - name: yepkit-down-all
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_DOWN: a
+
+    - name: yepkit-get-1
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_GET: 1
+    - name: yepkit-get-2
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_GET: 2
+    - name: yepkit-get-3
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_GET: 3
+
+    - name: yepkit-up-port-2
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_UP: 2
+        PORT_DEVICE: /dev/sda
+
+    - name: block-device-sda
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/block-device/block-device.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        DEVICE: /dev/sda
+        FORMAT_DEVICE: 'true'
+
+    - name: zero-sda
+      from: inline
+      path: inline/zero-sda.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: zero-sda
+          description: write zeros to device sda
+        run:
+          steps:
+          - dd if=/dev/zero of=/dev/sda bs=1M count=1024
+
+    - name: device-read-perf
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/device-read-perf/device-read-perf.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        DEVICE: sda mmcblk0
+
+    - name: yepkit-down-port-2
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_DOWN: 2
+        PORT_DEVICE: /dev/sda
+
+    - name: spi-eeprom
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/eeprom/eeprom.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        EEPROM: '/sys/bus/spi/devices/spi0.1/eeprom'
+
+    - name: docker-hello-world
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/docker/docker.yaml
+      parameters:
+        IMAGE: "hello-world"
+        SKIP_INSTALL: True
+
+    - name: docker
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/docker/docker.yaml
+      parameters:
+        IMAGE: "arm32v7/ubuntu"
+        SKIP_INSTALL: True
+
+    - name: optee-xtest
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/optee/optee-xtest.yaml
+
+    - name: cryptotest
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/cryptotest/cryptotest.yaml
+
+    - name: tpm
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/tpm/tpm.yaml
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: milan.stevanovic@se.com
+    criteria:
+        status: incomplete
+    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j17.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j17.yaml
new file mode 100644
index 0000000000..0f8bdb95f6
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j17.yaml
@@ -0,0 +1,552 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} eth1/J17
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J17
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j17
+      parameters:
+        CMD: configure-interface
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j17
+      parameters:
+        CMD: daemon
+        ETH: eth1
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j17
+      parameters:
+        CMD: configure-interface
+        ETH: eth1
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j17
+      parameters:
+        CMD: request-server-address
+        ETH: eth1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j17
+      parameters:
+        CMD: scp-target-to-host
+        ETH: eth1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j17
+      parameters:
+        CMD: scp-host-to-target
+        ETH: eth1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j17
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: eth1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j17
+      parameters:
+        CMD: iperf3-server
+        ETH: eth1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j17
+      parameters:
+        CMD: iperf3-client
+        ETH: eth1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j17
+      parameters:
+        CMD: iperf3-client
+        ETH: eth1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J17 (eth1) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j17_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j17
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J17 (eth1) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j17_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j17
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j17
+      parameters:
+        ETH: eth1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j21.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j21.yaml
new file mode 100644
index 0000000000..ac0caa82fd
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j21.yaml
@@ -0,0 +1,529 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} eth1/J21
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j21
+      parameters:
+        CMD: configure-interface
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j21
+      parameters:
+        CMD: daemon
+        ETH: eth1
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j21
+      parameters:
+        CMD: configure-interface
+        ETH: eth1
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j21
+      parameters:
+        CMD: request-server-address
+        ETH: eth1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j21
+      parameters:
+        CMD: scp-target-to-host
+        ETH: eth1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j21
+      parameters:
+        CMD: scp-host-to-target
+        ETH: eth1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j21
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: eth1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j21
+      parameters:
+        CMD: iperf3-server
+        ETH: eth1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j21
+      parameters:
+        CMD: iperf3-client
+        ETH: eth1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j21
+      parameters:
+        CMD: iperf3-client
+        ETH: eth1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J21 (eth1) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j21_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j21
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J21 (eth1) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j21_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j21
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j21
+      parameters:
+        ETH: eth1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j22-mtu1508.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j22-mtu1508.yaml
new file mode 100644
index 0000000000..07e9a84a63
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j22-mtu1508.yaml
@@ -0,0 +1,685 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan0/J22 MTU 1508
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i lan0 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J22
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j22-mtu1508
+      parameters:
+        CMD: daemon
+        ETH: lan0
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j22-mtu1508
+      parameters:
+        CMD: request-server-address
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j22-mtu1508
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j22-mtu1508
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j22-mtu1508
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j22-mtu1508
+      parameters:
+        CMD: iperf3-server
+        ETH: lan0
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j22-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j22-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J22 (lan0) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j22_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J22 (lan0) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j22_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "auto"
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j22-mtu1508
+      parameters:
+        ETH: lan0
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j22.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j22.yaml
new file mode 100644
index 0000000000..3f08d561b7
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j22.yaml
@@ -0,0 +1,685 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan0/J22
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i lan0 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J22
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j22
+      parameters:
+        CMD: daemon
+        ETH: lan0
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j22
+      parameters:
+        CMD: request-server-address
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j22
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j22
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j22
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j22
+      parameters:
+        CMD: iperf3-server
+        ETH: lan0
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j22
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j22
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J22 (lan0) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j22_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J22 (lan0) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j22_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j22
+      parameters:
+        ETH: lan0
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j23-mtu1508.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j23-mtu1508.yaml
new file mode 100644
index 0000000000..e7070e1000
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j23-mtu1508.yaml
@@ -0,0 +1,686 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan1/J23 MTU 1508
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i lan1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J23
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j23-mtu1508
+      parameters:
+        CMD: daemon
+        ETH: lan1
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j23-mtu1508
+      parameters:
+        CMD: request-server-address
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j23-mtu1508
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j23-mtu1508
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j23-mtu1508
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j23-mtu1508
+      parameters:
+        CMD: iperf3-server
+        ETH: lan1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j23-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j23-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J23 (lan1) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j23_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J23 (lan1) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j23_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "auto"
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j23-mtu1508
+      parameters:
+        ETH: lan1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j23.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j23.yaml
new file mode 100644
index 0000000000..de1af32973
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j23.yaml
@@ -0,0 +1,685 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan1/J23
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i lan1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J23
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j23
+      parameters:
+        CMD: daemon
+        ETH: lan1
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j23
+      parameters:
+        CMD: request-server-address
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j23
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j23
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j23
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j23
+      parameters:
+        CMD: iperf3-server
+        ETH: lan1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j23
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j23
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J23 (lan1) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j23_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J23 (lan1) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j23_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j23
+      parameters:
+        ETH: lan1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j24-mtu1508.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j24-mtu1508.yaml
new file mode 100644
index 0000000000..c88bfbeff1
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j24-mtu1508.yaml
@@ -0,0 +1,685 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan2/J24 MTU 1508
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i lan2 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J24
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j24-mtu1508
+      parameters:
+        CMD: daemon
+        ETH: lan2
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j24-mtu1508
+      parameters:
+        CMD: request-server-address
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j24-mtu1508
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j24-mtu1508
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j24-mtu1508
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j24-mtu1508
+      parameters:
+        CMD: iperf3-server
+        ETH: lan2
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j24-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j24-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J24 (lan2) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j24_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J24 (lan2) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j24_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "auto"
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j24-mtu1508
+      parameters:
+        ETH: lan2
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j24.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j24.yaml
new file mode 100644
index 0000000000..fff4c2a19f
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/lava-multinode-rzn1d-j24.yaml
@@ -0,0 +1,685 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan2/J24
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: rzn1d
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_nand
+- boot:
+    namespace: dfu-firmware
+    role:
+    - daemon
+    - dut
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: set_boot_to_qspi
+
+##################
+# all ports off - except J21
+##################
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i lan2 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J24
+#################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j24
+      parameters:
+        CMD: daemon
+        ETH: lan2
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j24
+      parameters:
+        CMD: request-server-address
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j24
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j24
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j24
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j24
+      parameters:
+        CMD: iperf3-server
+        ETH: lan2
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j24
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j24
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J24 (lan2) off
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j24_off
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J24 (lan2) back on again
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - dut
+    name: j24_on
+
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    namespace: test-wic
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j24
+      parameters:
+        ETH: lan2
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    namespace: test-wic
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
new file mode 100644
index 0000000000..1d4f3bcf27
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/ltp-ptest.yaml
@@ -0,0 +1,367 @@
+device_type: rzn1d
+job_name: SE ${MACHINE} dev-image (LTP/PTEST) ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 700
+  action:
+    minutes: 70
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+actions:
+
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    name: set_boot_to_nand
+
+- boot:
+    namespace: dfu-firmware
+    method: dfu
+    timeout:
+      minutes: 10
+
+- command:
+    namespace: test
+    name: set_boot_to_qspi
+
+##########################
+# Configure ethernet ports
+##########################
+- command:
+    namespace: test
+    name: j17_off
+- command:
+    namespace: test
+    name: j21_on
+- command:
+    namespace: test
+    name: j22_off
+- command:
+    namespace: test
+    name: j23_off
+- command:
+    namespace: test
+    name: j24_off
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    namespace: test-wic
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+- boot:
+    namespace: test-wic
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - "setenv linux_sd 'mmc rescan; fatload mmc 0:1 $${fdt_addr_r} $${fdt_name}; fatload mmc 0:1 $${kernel_addr_r} $${kernel_name}; setenv bootargs console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootwait coherent_pool=2M audit=0; bootz $${kernel_addr_r} - $${fdt_addr_r}'"
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds-wic
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+##################
+# Functional Tests
+##################
+- test:
+    namespace: test-wic
+    timeout:
+      minutes: 600
+    definitions:
+
+    - name: meminfo
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+    - name: ltp-syscalls-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'syscalls'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-math-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'math'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-timers-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'timers'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-fcntl-locktests-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fcntl-locktests'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-ipc-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'ipc'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-fsx-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fsx'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-fs-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fs'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-hugetlb-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'hugetlb'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-io-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'io'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-nptl-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'nptl'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-pty-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'pty'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-fs_bind-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'fs_bind'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-filecaps-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'filecaps'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-admin_tools-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'admin_tools'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: ltp-connectors-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        TST_CMDFILES: 'connectors'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: linux-ptest
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ptest/ptest.yaml
+      params:
+        EXCLUDE: 'bluez5 bzip2 containerd e2fsprogs libxml2 parted python strace openssh openssl perl'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: ralph.siemsen@linaro.org
+    criteria:
+        status: incomplete
+    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/rzn1d/prod-image.yaml b/schneider-openembedded/lava-job-definitions/rzn1d/prod-image.yaml
new file mode 100644
index 0000000000..eec9afc2a7
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/rzn1d/prod-image.yaml
@@ -0,0 +1,408 @@
+device_type: rzn1d
+job_name: SE ${MACHINE} prod-image (u-boot,ubi) ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 100
+  action:
+    minutes: 70
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+actions:
+
+####################
+# Deploy QSPI images
+####################
+- deploy:
+    namespace: dfu-firmware
+    to: tmpfs
+    images:
+      sf_fsbl:
+        image_arg: --alt sf_fsbl --download {sf_fsbl}
+        url: ${FSBL_URL}
+      sf_trustedfw0:
+        image_arg: --alt sf_trustedfw0 --download {sf_trustedfw0}
+        url: ${OPTEE_ITB_URL}
+      sf_trustedfw1:
+        image_arg: --alt sf_trustedfw1 --download {sf_trustedfw1}
+        url: ${OPTEE_ITB_URL}
+      sf_uboot0:
+        image_arg: --alt sf_uboot0 --download {sf_uboot0}
+        url: ${UBOOT_ITB_URL}
+      sf_uboot1:
+        image_arg: --alt sf_uboot1 --download {sf_uboot1}
+        url: ${UBOOT_ITB_URL}
+
+- command:
+    namespace: dfu-firmware
+    name: set_boot_to_nand
+
+- boot:
+    namespace: dfu-firmware
+    method: dfu
+    timeout:
+      minutes: 10
+
+- command:
+    namespace: test
+    name: set_boot_to_qspi
+
+##########################
+# Configure ethernet ports
+##########################
+- command:
+    namespace: test
+    name: j17_off
+- command:
+    namespace: test
+    name: j21_on
+- command:
+    namespace: test
+    name: j22_off
+- command:
+    namespace: test
+    name: j23_off
+- command:
+    namespace: test
+    name: j24_off
+
+###############
+# u-boot
+###############
+- deploy:
+    namespace: test-uboot
+    timeout:
+      minutes: 15
+    to: tftp
+    kernel:
+      # This is a known kernel image used for CRC checks only
+      url: https://releases.linaro.org/members/schneider/openembedded/2019.09-warrior/soca9/zImage--4.19.72+git0+7549a49ae5-r0-snarc-soca9-20191003145415.bin
+      type: zimage
+
+- boot:
+    namespace: test-uboot
+    connection-namespace: dfu-firmware
+    timeout:
+      minutes: 20
+    method: bootloader
+    bootloader: u-boot
+    commands: []
+    prompts: ["=>"]
+
+# Run some U-Boot tests
+- test:
+    namespace: test-uboot
+    timeout:
+      minutes: 5
+    interactive:
+    - name: uboot-tests
+      prompts: ["=> ", "/ # "]
+      script:
+      - command: echo "u-boot echo test"
+        name: echo
+        successes:
+        - message: "u-boot echo test"
+      - command: version
+        name: version
+        successes:
+        - message: "U-Boot"
+      - command: help test
+        name: help
+        successes:
+        - message: "test - minimal test like /bin/sh"
+      # saveenv and printenv
+      - command: setenv test_var test123
+      - command: printenv
+        name: setenv-and-printenv
+        successes:
+        - message: "test_var=test123"
+    - name: memory-test
+      prompts: ["=> ", "/ # "]
+      script:
+      # memory test
+      # base - print or set address offset
+      - command: base
+        name: print-default-base-address-offset
+        successes:
+        - message: "Base Address: 0x"
+      - command: base 80000000
+        name: set-address-offset-0x80000000
+        successes:
+        - message: "Base Address: 0x80000000"
+      - command: base
+        name: check-address-offset-0x80000000
+        successes:
+        - message: "Base Address: 0x80000000"
+      # crc32 - checksum calculation
+      - command: mw.b 00000000 aa 400
+      - command: crc32 -v 80000000 400 3c6f327d
+      - command: echo return code $$?
+        name: compute-CRC32-checksum
+        successes:
+        - message: "return code 0"
+      # mw - memory write
+      # md - memory display
+      - command: mw 100000 aabbccdd 10
+      - command: md 100000 10
+        name: mw-md-100000
+        successes:
+        - message: "aabbccdd"
+      # md - memory display
+      # cp - memory copy
+      - command: cp 100000 200000 10
+      - command: md 200000 10
+        name: cp-md-200000
+        successes:
+        - message: "aabbccdd"
+      # cmp - memory compare
+      - command: cmp 100000 200000 10
+        name: cmp-100000-200000-10
+        successes:
+        - message: "Total of 16 word\\(s\\) were the same"
+    - name: dhcp-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # dhcp
+      - command: setenv autoload no ; dhcp ; dhcp
+        name: dhcp
+        successes:
+        - message: "DHCP client bound to address"
+    - name: ping-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # ping
+      - command: ping {SERVER_IP}
+        name: ping
+        successes:
+        - message: "is alive"
+    - name: tftp-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # TFTP
+      - command: setenv serverip {SERVER_IP} ; tftp {KERNEL_ADDR} {KERNEL}
+        name: tftp
+        successes:
+        - message: "Bytes transferred = 6752784"
+      - command: crc32 -v {KERNEL_ADDR} 670a10 ca050911
+      - command: echo return code $$?
+        successes:
+        - message: "return code 0"
+    - name: nand-commands
+      prompts: ["=> ", "/ # "]
+      script:
+      # nand
+      - command: nand info
+        name: nand-info
+        successes:
+        - message: nand0, sector size 128 KiB
+
+###############
+# prod-image.ubi
+###############
+- deploy:
+    namespace: test-ubi
+    to: tmpfs
+    images:
+      n_fs1:
+        image_arg: --alt n_fs1 --download {n_fs1}
+        url: ${UBI_IMAGE_URL}
+
+- command:
+    namespace: test-ubi
+    name: set_boot_to_nand
+- boot:
+    namespace: test-ubi
+    method: dfu
+    timeout:
+      minutes: 10
+- command:
+    namespace: test-ubi
+    name: set_boot_to_qspi
+
+- boot:
+    namespace: test-ubi
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - setenv bootargs $$bootargs audit=0
+      - run linux_bestla
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+      login_commands:
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+    prompts:
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@rzn1d400-bestla:"
+
+- test:
+    namespace: test-ubi
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 60
+    interactive:
+    - name: basic-cmds-ubi
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+      - command: systemctl --no-pager status docker
+      - command: sleep 100
+      - command: systemctl --no-pager status docker
+      - command: ifconfig -a
+      - command: docker run hello-world
+      - command: docker run -it ubuntu uname -a
+
+
+##################
+# Reboot/Poweroff Tests
+##################
+- test:
+    namespace: test-reboot
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: reboot-cmds-1
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla", "=> "]
+      script:
+      - command: reboot ; sleep 10
+
+# Trigger 2nd boot
+- boot:
+    namespace: test-reboot
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - setenv bootargs $$bootargs audit=0
+    - run linux_bestla
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: azertAZERT12345
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+
+- test:
+    namespace: test-reboot
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-1st-reboot
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla"]
+      script:
+      - command: echo "We came back from a reboot"
+
+
+# Reboot the board a 2nd time
+- test:
+    namespace: test-reboot-2
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: reboot-cmds-2
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla", "=> "]
+      script:
+      - command: reboot ; sleep 10
+
+# Trigger a new boot
+- boot:
+    namespace: test-reboot-2
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - setenv bootargs $$bootargs audit=0
+    - run linux_bestla
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: "azertAZERT12345"
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1d400-bestla:"
+
+- test:
+    namespace: test-reboot-2
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: check-2nd-reboot
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla", "=> "]
+      script:
+      - command: echo "We came back from the 2nd reboot"
+
+# Test poweroff
+- test:
+    namespace: test-poweroff
+    connection-namespace: test-ubi
+    timeout:
+      minutes: 5
+    interactive:
+    - name: poweroff-cmds
+      prompts: ["root@snarc-soca9", "root@rzn1d400-bestla", "=> ", "reboot: Power down"]
+      script:
+      - command: poweroff ; sleep 10
+
+# Check we are in u-boot after poweroff
+# - test:
+#     namespace: test-poweroff
+#     connection-namespace: test-ubi
+#     timeout:
+#       minutes: 5
+#     interactive:
+#     - name: check-poweroff
+#       prompts: ["=> "]
+#       script:
+#       - command: version
+#         successes:
+#         - message: "U-Boot"
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: ralph.siemsen@linaro.org
+    criteria:
+        status: incomplete
+    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/dev-image.yaml b/schneider-openembedded/lava-job-definitions/soca9/dev-image.yaml
new file mode 100644
index 0000000000..4eb79f1d60
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/dev-image.yaml
@@ -0,0 +1,436 @@
+device_type: soca9
+job_name: SE ${MACHINE} dev-image (nfs,wic) ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 180
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+actions:
+
+##################
+# Deploy WIC image
+##################
+- deploy:
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+##########################
+# Configure ethernet ports
+##########################
+- command:
+    name: j17_off
+- command:
+    name: j21_on
+- command:
+    name: j22_off
+- command:
+    name: j23_off
+- command:
+    name: j24_off
+
+###############
+# TFTP/NFS
+###############
+- deploy:
+    timeout:
+      minutes: 15
+    to: tftp
+    os: oe
+    kernel:
+      url: ${KERNEL_ZIMAGE_URL}
+      type: zimage
+    dtb:
+      url: ${DTB_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_DEV_URL}
+      compression: bz2
+
+- boot:
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - run FPGA_INIT
+      - setenv autoload no
+      - dhcp
+      - dhcp
+      - env print
+      - setenv serverip {SERVER_IP}
+      - tftp {KERNEL_ADDR} {KERNEL}
+      - tftp 0x1000 {DTB}
+      - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
+      - bootz 0x01000000 - 0x00001000
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    timeout:
+      minutes: 40
+    interactive:
+    - name: basic-cmds-tftp
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: which docker
+
+- test:
+    timeout:
+      minutes: 40
+    definitions:
+
+    - name: smoke-tests-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/smoke/smoke.yaml
+      parameters:
+        SKIP_INSTALL: True
+        TESTS: "pwd, uname -a, cat /etc/os-release, ip a, lscpu, vmstat, lsblk, ps aux --sort -rss, free -h, mount"
+
+    - name: ethernet-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ethernet/ethernet.yaml
+      parameters:
+        INTERFACE: eth1
+
+    - name: meminfo-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+    - name: badblocks-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/badblocks/badblocks.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+    - name: memtester-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/memtester/memtester.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+- test:
+    timeout:
+      minutes: 40
+    interactive:
+    - name: basic-cmds-wic
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+
+##################
+# Functional Tests
+##################
+- test:
+    timeout:
+      minutes: 100
+    definitions:
+
+    - name: files-exist
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/files-exist/files-exist.yaml
+      parameters:
+        SKIP_INSTALL: true
+        EXTRA_FILES: '/etc/os-release'
+
+    - name: ethernet
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ethernet/ethernet.yaml
+      parameters:
+        INTERFACE: eth1
+
+    - name: meminfo
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+    - name: badblocks
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/badblocks/badblocks.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+    - name: memtester
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/memtester/memtester.yaml
+      parameters:
+        SKIP_INSTALL: True
+
+    - name: yepkit-list
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        LIST: true
+
+    - name: yepkit-down-all
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_DOWN: a
+
+    - name: yepkit-get-1
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_GET: 1
+    - name: yepkit-get-2
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_GET: 2
+    - name: yepkit-get-3
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_GET: 3
+
+    - name: yepkit-up-port-1
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_UP: 1
+        PORT_DEVICE: /dev/ttyUSB0
+
+    - name: uart-loopback-forward
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/uart-loopback/uart-loopback.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        UART0: /dev/ttyUSB0
+        UART1: /dev/ttyS1
+    - name: uart-loopback-reverse
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/uart-loopback/uart-loopback.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        UART0: /dev/ttyS1
+        UART1: /dev/ttyUSB0
+
+    - name: yepkit-down-port-1
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_DOWN: 1
+        PORT_DEVICE: /dev/ttyUSB0
+
+    - name: yepkit-up-port-2
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_UP: 2
+        PORT_DEVICE: /dev/sda
+
+    - name: block-device-sda
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/block-device/block-device.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        DEVICE: /dev/sda
+        FORMAT_DEVICE: 'true'
+
+    - name: zero-sda
+      from: inline
+      path: inline/zero-sda.yaml
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: zero-sda
+          description: write zeros to device sda
+        run:
+          steps:
+          - dd if=/dev/zero of=/dev/sda bs=1M count=1024
+
+    - name: device-read-perf
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/device-read-perf/device-read-perf.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        DEVICE: sda mmcblk0
+
+    - name: yepkit-down-port-2
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/yepkit/yepkit.yaml
+      parameters:
+        PORT_DOWN: 2
+        PORT_DEVICE: /dev/sda
+
+    - name: spi-eeprom
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/eeprom/eeprom.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        EEPROM: '/sys/bus/spi/devices/spi0.0/eeprom'
+
+    - name: docker-hello-world
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/docker/docker.yaml
+      parameters:
+        IMAGE: "hello-world"
+        SKIP_INSTALL: True
+
+    - name: docker
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/docker/docker.yaml
+      parameters:
+        IMAGE: "arm32v7/ubuntu"
+        SKIP_INSTALL: True
+
+
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: ralph.siemsen@linaro.org
+    criteria:
+        status: incomplete
+    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j17.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j17.yaml
new file mode 100644
index 0000000000..0e9f7e7c70
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j17.yaml
@@ -0,0 +1,614 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} eth2/J17
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i eth2 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J17
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j17
+      parameters:
+        CMD: configure-interface
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j17
+      parameters:
+        CMD: daemon
+        ETH: eth2
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j17
+      parameters:
+        CMD: configure-interface
+        ETH: eth2
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j17
+      parameters:
+        CMD: request-server-address
+        ETH: eth2
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j17
+      parameters:
+        CMD: scp-target-to-host
+        ETH: eth2
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j17
+      parameters:
+        CMD: scp-host-to-target
+        ETH: eth2
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j17
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: eth2
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j17
+      parameters:
+        CMD: iperf3-server
+        ETH: eth2
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j17
+      parameters:
+        CMD: iperf3-client
+        ETH: eth2
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j17
+      parameters:
+        CMD: iperf3-client
+        ETH: eth2
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J17 (eth2) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j17_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j17
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J17 (eth2) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j17_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j17
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j17
+      parameters:
+        CMD: link-settings
+        ETH: eth2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j17
+      parameters:
+        CMD: link-settings
+        ETH: eth2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j17
+      parameters:
+        CMD: link-settings
+        ETH: eth2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j17
+      parameters:
+        CMD: link-settings
+        ETH: eth2
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j17
+      parameters:
+        CMD: ping-request
+        ETH: eth2
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j17
+      parameters:
+        ETH: eth2
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j21.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j21.yaml
new file mode 100644
index 0000000000..32636de051
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j21.yaml
@@ -0,0 +1,593 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} eth1/J21
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j21
+      parameters:
+        CMD: configure-interface
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j21
+      parameters:
+        CMD: daemon
+        ETH: eth1
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j21
+      parameters:
+        CMD: configure-interface
+        ETH: eth1
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j21
+      parameters:
+        CMD: request-server-address
+        ETH: eth1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j21
+      parameters:
+        CMD: scp-target-to-host
+        ETH: eth1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j21
+      parameters:
+        CMD: scp-host-to-target
+        ETH: eth1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j21
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: eth1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j21
+      parameters:
+        CMD: iperf3-server
+        ETH: eth1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j21
+      parameters:
+        CMD: iperf3-client
+        ETH: eth1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j21
+      parameters:
+        CMD: iperf3-client
+        ETH: eth1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J21 (eth1) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j21_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j21
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J21 (eth1) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j21_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j21
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j21
+      parameters:
+        CMD: link-settings
+        ETH: eth1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j21
+      parameters:
+        CMD: link-settings
+        ETH: eth1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j21
+      parameters:
+        CMD: link-settings
+        ETH: eth1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j21
+      parameters:
+        CMD: link-settings
+        ETH: eth1
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j21
+      parameters:
+        CMD: ping-request
+        ETH: eth1
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j21
+      parameters:
+        ETH: eth1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j22-mtu1508.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j22-mtu1508.yaml
new file mode 100644
index 0000000000..cd1610f63b
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j22-mtu1508.yaml
@@ -0,0 +1,617 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan0/J22 MTU 1508
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i lan0 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J22
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j22-mtu1508
+      parameters:
+        CMD: daemon
+        ETH: lan0
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j22-mtu1508
+      parameters:
+        CMD: request-server-address
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j22-mtu1508
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j22-mtu1508
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j22-mtu1508
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j22-mtu1508
+      parameters:
+        CMD: iperf3-server
+        ETH: lan0
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j22-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j22-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J22 (lan0) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j22_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J22 (lan0) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j22_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j22-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "auto"
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j22-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j22-mtu1508
+      parameters:
+        ETH: lan0
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j22.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j22.yaml
new file mode 100644
index 0000000000..75df15c04c
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j22.yaml
@@ -0,0 +1,617 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan0/J22
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i lan0 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J22
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j22
+      parameters:
+        CMD: daemon
+        ETH: lan0
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j22
+      parameters:
+        CMD: configure-interface
+        ETH: lan0
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j22
+      parameters:
+        CMD: request-server-address
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j22
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan0
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j22
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j22
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan0
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j22
+      parameters:
+        CMD: iperf3-server
+        ETH: lan0
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j22
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j22
+      parameters:
+        CMD: iperf3-client
+        ETH: lan0
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J22 (lan0) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j22_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J22 (lan0) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j22_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j22
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j22
+      parameters:
+        CMD: link-settings
+        ETH: lan0
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j22
+      parameters:
+        CMD: ping-request
+        ETH: lan0
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j22
+      parameters:
+        ETH: lan0
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j23-mtu1508.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j23-mtu1508.yaml
new file mode 100644
index 0000000000..dd786e533c
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j23-mtu1508.yaml
@@ -0,0 +1,617 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan1/J23 MTU 1508
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i lan1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J23
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j23-mtu1508
+      parameters:
+        CMD: daemon
+        ETH: lan1
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j23-mtu1508
+      parameters:
+        CMD: request-server-address
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j23-mtu1508
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j23-mtu1508
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j23-mtu1508
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j23-mtu1508
+      parameters:
+        CMD: iperf3-server
+        ETH: lan1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j23-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j23-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J23 (lan1) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j23_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J23 (lan1) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j23_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j23-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "auto"
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j23-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j23-mtu1508
+      parameters:
+        ETH: lan1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j23.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j23.yaml
new file mode 100644
index 0000000000..3a49ee897c
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j23.yaml
@@ -0,0 +1,617 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan1/J23
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i lan1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J23
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j23
+      parameters:
+        CMD: daemon
+        ETH: lan1
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j23
+      parameters:
+        CMD: configure-interface
+        ETH: lan1
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j23
+      parameters:
+        CMD: request-server-address
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j23
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan1
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j23
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j23
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan1
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j23
+      parameters:
+        CMD: iperf3-server
+        ETH: lan1
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j23
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j23
+      parameters:
+        CMD: iperf3-client
+        ETH: lan1
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J23 (lan1) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j23_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J23 (lan1) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j23_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j23
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j23
+      parameters:
+        CMD: link-settings
+        ETH: lan1
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j23
+      parameters:
+        CMD: ping-request
+        ETH: lan1
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j23
+      parameters:
+        ETH: lan1
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j24-mtu1508.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j24-mtu1508.yaml
new file mode 100644
index 0000000000..79d6239c59
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j24-mtu1508.yaml
@@ -0,0 +1,617 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan2/J24 MTU 1508
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i lan2 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J24
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j24-mtu1508
+      parameters:
+        CMD: daemon
+        ETH: lan2
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24-mtu1508
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1508
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j24-mtu1508
+      parameters:
+        CMD: request-server-address
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j24-mtu1508
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j24-mtu1508
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j24-mtu1508
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j24-mtu1508
+      parameters:
+        CMD: iperf3-server
+        ETH: lan2
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j24-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j24-mtu1508
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J24 (lan2) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j24_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J24 (lan2) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j24_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24-mtu1508
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1508
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j24-mtu1508
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "auto"
+        MTU: 1508
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j24-mtu1508
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j24-mtu1508
+      parameters:
+        ETH: lan2
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j24.yaml b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j24.yaml
new file mode 100644
index 0000000000..72b295589d
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/lava-multinode-soca9-j24.yaml
@@ -0,0 +1,617 @@
+job_name: SE ${MACHINE} network-test ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER} lan2/J24
+timeouts:
+  job:
+    minutes: 1800
+  action:
+    minutes: 120
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+
+protocols:
+  lava-multinode:
+    roles:
+      dut:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+      daemon:
+        device_type: soca9
+        count: 1
+        timeout:
+          minutes: 30
+
+
+
+actions:
+##################
+# Deploy WIC image
+##################
+- deploy:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##################
+# all ports off - except J21
+##################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
+
+
+###################
+# dev-image.wic
+###################
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i lan2 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+
+########################################################
+# Turn off all Yepkit USB devices and network interfaces
+########################################################
+- test:
+    role:
+    - daemon
+    - dut
+    timeout:
+      minutes: 60
+    definitions:
+    - from: inline
+      repository:
+        metadata:
+          format: Lava-Test Test Definition 1.0
+          name: yepkit-down-all
+          description: yepkit test
+        run:
+          steps:
+          - git clone https://github.com/Yepkit/ykush
+          - cd ykush
+          - make
+          - bin/ykushcmd -d a
+          - sleep 3
+          - ifconfig eth0 down || true
+          - ifconfig eth1 down || true
+          - ifconfig eth2 down || true
+          - ifconfig lan0 down || true
+          - ifconfig lan1 down || true
+          - ifconfig lan2 down || true
+      name: yepkit-down-all
+      path: inline/yepkit-test.yaml
+
+
+#############################
+# We're finished with J21 now
+#############################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_off
+
+
+#################################
+# All nodes use J24
+#################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_on
+
+
+
+
+
+#################################
+# Daemon
+#################################
+
+- test:
+    role:
+    - daemon
+    timeout:
+      minutes: 300
+    definitions:
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+
+    #################################
+    #  Start daemon
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: daemon-j24
+      parameters:
+        CMD: daemon
+        ETH: lan2
+        SWITCH_IF: eth0
+
+
+#################################
+# DUT
+#################################
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+
+
+
+    #################################
+    #  configure-interface
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: configure-interface-j24
+      parameters:
+        CMD: configure-interface
+        ETH: lan2
+        SWITCH_IF: eth0
+        EXPECTED_RESULT: pass
+        MTU: 1500
+
+
+
+
+    #################################
+    #  PING - before we mess with link-settings
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-default-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # Request server IP address
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: request-server-address-j24
+      parameters:
+        CMD: request-server-address
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Target to Host
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-target-to-host-j24
+      parameters:
+        CMD: scp-target-to-host
+        ETH: lan2
+
+
+
+
+    #################################
+    # SCP from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: scp-host-to-target-j24
+      parameters:
+        CMD: scp-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    # SSH from Host to Target
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: ssh-host-to-target-j24
+      parameters:
+        CMD: ssh-host-to-target
+        ETH: lan2
+
+
+
+
+    #################################
+    #  iperf
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-server-j24
+      parameters:
+        CMD: iperf3-server
+        ETH: lan2
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-j24
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: iperf-reverse-j24
+      parameters:
+        CMD: iperf3-client
+        ETH: lan2
+        TIME: 60
+        REVERSE: "-R"
+
+
+
+
+    #################################
+    # Switch port J24 (lan2) off
+    #################################
+- command:
+    role:
+    - dut
+    name: j24_off
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping fails
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-off-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: fail
+
+
+
+    #################################
+    # Switch port J24 (lan2) back on again
+    #################################
+- command:
+    role:
+    - dut
+    name: j24_on
+
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 10
+    interactive:
+    - name: sleep-j24
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: sleep 5
+
+
+    #################################
+    # Check that ping succeeds
+    #################################
+- test:
+    role:
+    - dut
+    timeout:
+      minutes: 300
+    definitions:
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-on-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/half/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: half
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-half-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings off/100/full/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "manual"
+        LINKSPEED: 100
+        DUPLEX: full
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-100-full-2-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+    #################################
+    # link-settings on/?/?/1500
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-j24
+      parameters:
+        CMD: link-settings
+        ETH: lan2
+        AUTONEG: "auto"
+        MTU: 1500
+
+
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: link-settings-autoneg-ping-j24
+      parameters:
+        CMD: ping-request
+        ETH: lan2
+        EXPECTED_RESULT: pass
+
+
+
+
+
+
+
+
+    #################################
+    #  Finished
+    #################################
+    - repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      from: git
+      history: false
+      path: automated/linux/network-test/network-test.yaml
+      name: finished-j24
+      parameters:
+        ETH: lan2
+        CMD: finished
+
+
+    #################################
+    # Reset the port status
+    #################################
+- command:
+    role:
+    - daemon
+    - dut
+    name: j17_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j21_on
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j22_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j23_off
+
+- command:
+    role:
+    - daemon
+    - dut
+    name: j24_off
diff --git a/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml b/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
new file mode 100644
index 0000000000..364953272b
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/ltp-ptest.yaml
@@ -0,0 +1,134 @@
+device_type: soca9
+job_name: SE ${MACHINE} dev-image (LTP/PTEST) ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 700
+  action:
+    minutes: 70
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+actions:
+
+###################
+# dev-image.wic
+###################
+- deploy:
+    timeout:
+      minutes: 100
+    to: flasher
+    images:
+      image:
+        url: ${WIC_DEV_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_DEV_BMAP_URL}
+
+
+##########################
+# Configure ethernet ports
+##########################
+- command:
+    name: j17_off
+- command:
+    name: j21_on
+- command:
+    name: j22_off
+- command:
+    name: j23_off
+- command:
+    name: j24_off
+
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+    prompts:
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+    transfer_overlay:
+      download_command: udhcpc -i eth1 -n; wget
+      unpack_command: tar --touch -C / -xzf
+
+- test:
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds-wic
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: memstat
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+##################
+# Functional Tests
+##################
+- test:
+    timeout:
+      minutes: 600
+    definitions:
+
+    - name: meminfo
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+    - name: ltp-default-tests
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ltp/ltp.yaml
+      parameters:
+        SKIP_INSTALL: 'true'
+        SKIPFILE: 'skipfile-lkft.yaml'
+        BOARD: ${MACHINE}
+        TIMEOUT_MULTIPLIER: 3
+
+    - name: linux-ptest
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ptest/ptest.yaml
+      params:
+        EXCLUDE: 'bluez5 bzip2 containerd e2fsprogs libxml2 parted python strace openssh openssl perl dbus-test'
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: ralph.siemsen@linaro.org
+    criteria:
+        status: incomplete
+    verbosity: verbose
diff --git a/schneider-openembedded/lava-job-definitions/soca9/prod-image.yaml b/schneider-openembedded/lava-job-definitions/soca9/prod-image.yaml
new file mode 100644
index 0000000000..576f088c0b
--- /dev/null
+++ b/schneider-openembedded/lava-job-definitions/soca9/prod-image.yaml
@@ -0,0 +1,353 @@
+device_type: soca9
+job_name: SE ${MACHINE} prod-image (u-boot,nfs,wic) ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL} ${BUILD_NUMBER}
+
+timeouts:
+  job:
+    minutes: 100
+  action:
+    minutes: 70
+  connection:
+    minutes: 20
+priority: medium
+visibility: public
+
+actions:
+
+##################
+# Deploy WIC image
+##################
+- deploy:
+    timeout:
+      minutes: 20
+    to: flasher
+    images:
+      image:
+        url: ${WIC_IMAGE_URL}
+        compression: bz2
+      layout:
+        url: ${WIC_BMAP_URL}
+
+
+##########################
+# Configure ethernet ports
+##########################
+- command:
+    name: j17_off
+- command:
+    name: j21_on
+- command:
+    name: j22_off
+- command:
+    name: j23_off
+- command:
+    name: j24_off
+
+###############
+# u-boot
+###############
+- deploy:
+    timeout:
+      minutes: 15
+    to: tftp
+    kernel:
+      # This is a known kernel image used for CRC checks only
+      url: https://releases.linaro.org/members/schneider/openembedded/2019.09-warrior/soca9/zImage--4.19.72+git0+7549a49ae5-r0-snarc-soca9-20191003145415.bin
+      type: zimage
+
+- boot:
+    timeout:
+      minutes: 20
+    method: bootloader
+    bootloader: u-boot
+    commands: []
+    prompts: ["=>"]
+
+# Run some U-Boot tests
+- test:
+    timeout:
+      minutes: 5
+    interactive:
+    - name: uboot-tests
+      prompts: ["=> ", "/ # "]
+      script:
+      - command: echo "u-boot echo test"
+        name: echo
+        successes:
+        - message: "u-boot echo test"
+      - command: version
+        name: version
+        successes:
+        - message: "U-Boot"
+      - command: help test
+        name: help
+        successes:
+        - message: "test - minimal test like /bin/sh"
+      # saveenv and printenv
+      - command: setenv test_var test123
+      - command: printenv
+        name: setenv-and-printenv
+        successes:
+        - message: "test_var=test123"
+    - name: memory-test
+      prompts: ["=> ", "/ # "]
+      script:
+      # memory test
+      # base - print or set address offset
+      - command: base
+        name: print-default-base-address-offset
+        successes:
+        - message: "Base Address: 0x"
+      - command: base 00000000
+        name: set-address-offset-0x00000000
+        successes:
+        - message: "Base Address: 0x00000000"
+      - command: base
+        name: check-address-offset-0x00000000
+        successes:
+        - message: "Base Address: 0x00000000"
+      # crc32 - checksum calculation
+      - command: mw.b 00000000 aa 400
+      - command: crc32 -v 0 400 3c6f327d
+      - command: echo return code $$?
+        name: compute-CRC32-checksum
+        successes:
+        - message: "return code 0"
+      # mw - memory write
+      # md - memory display
+      - command: mw 100000 aabbccdd 10
+      - command: md 100000 10
+        name: mw-md-100000
+        successes:
+        - message: "aabbccdd"
+      # md - memory display
+      # cp - memory copy
+      - command: cp 100000 200000 10
+      - command: md 200000 10
+        name: cp-md-200000
+        successes:
+        - message: "aabbccdd"
+      # cmp - memory compare
+      - command: cmp 100000 200000 10
+        name: cmp-100000-200000-10
+        successes:
+        - message: "Total of 16 word\\(s\\) were the same"
+    - name: fpga-check-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # FPGA checksum and dump start and end of image
+      - command: mw.b 0x01000000 0 0x700000
+      - command: run scan_dev_for_fpga
+      - command: crc32 0x01000000 006aebe4
+      - command: '#'
+      - command: md.b 0x01000000 100
+      - command: '#'
+      - command: md.b 016aea10 200
+      - command: '#'
+    - name: dhcp-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # dhcp
+      - command: run FPGA_INIT
+        successes:
+        - message: "FPGA updated to correct revision."
+        name: fpga_init
+      - command: setenv autoload no ; dhcp ; dhcp
+        name: dhcp
+        successes:
+        - message: "DHCP client bound to address"
+    - name: ping-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # ping
+      - command: ping {SERVER_IP}
+        name: ping
+        successes:
+        - message: "is alive"
+    - name: tftp-cmds
+      prompts: ["=> ", "/ # "]
+      script:
+      # TFTP
+      - command: setenv serverip {SERVER_IP} ; tftp {KERNEL_ADDR} {KERNEL}
+        name: tftp
+        successes:
+        - message: "Bytes transferred = 6752784"
+      - command: crc32 -v {KERNEL_ADDR} 670a10 ca050911
+      - command: echo return code $$?
+        successes:
+        - message: "return code 0"
+
+
+###############
+# TFTP/NFS
+###############
+- deploy:
+    timeout:
+      minutes: 15
+    to: tftp
+    os: oe
+    kernel:
+      url: ${KERNEL_ZIMAGE_URL}
+      type: zimage
+    dtb:
+      url: ${DTB_URL}
+    nfsrootfs:
+      url: ${NFSROOTFS_URL}
+      compression: bz2
+
+- boot:
+    timeout:
+      minutes: 20
+    method: u-boot
+    commands:
+      - run FPGA_INIT
+      - setenv autoload no
+      - dhcp
+      - dhcp
+      - env print
+      - setenv serverip {SERVER_IP}
+      - tftp {KERNEL_ADDR} {KERNEL}
+      - tftp 0x1000 {DTB}
+      - "setenv bootargs 'console=ttyS0,115200n8 root=/dev/nfs rw nfsroot={NFS_SERVER_IP}:{NFSROOTFS},tcp,hard,intr,vers=3 rootwait coherent_pool=2M ip=dhcp'"
+      - bootz 0x01000000 - 0x00001000
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+      login_commands:
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+    prompts:
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds-tftp
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+      - command: systemctl --no-pager status docker
+      - command: sleep 100
+      - command: systemctl --no-pager status docker
+      - command: ifconfig -a
+      - command: docker run hello-world
+      - command: docker run -it ubuntu uname -a
+
+- test:
+    timeout:
+      minutes: 20
+    definitions:
+
+    - name: smoke-tests-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/smoke/smoke.yaml
+      parameters:
+        SKIP_INSTALL: True
+        TESTS: "pwd, uname -a, cat /etc/os-release, ip a, lscpu, vmstat, lsblk, ps aux --sort -rss, free -h, mount"
+
+    - name: ethernet-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/ethernet/ethernet.yaml
+      parameters:
+        INTERFACE: eth1
+
+    - name: meminfo-tftp
+      from: git
+      history: false
+      repository: https://git.linaro.org/landing-teams/working/schneider/test-definitions.git
+      branch: master
+      path: automated/linux/meminfo/meminfo.yaml
+
+
+###############
+# prod-image.wic
+###############
+# We already flashed the SDcard WIC image in the deploy step at the begging of this test run
+- boot:
+    timeout:
+      minutes: 10
+    method: u-boot
+    commands:
+    - run linux_sd
+    auto_login:
+      login_prompt: "login:"
+      username: root
+      password_prompt: "Password:"
+      password: "P@ssword-1"
+      login_commands:
+      - "P@ssword-1"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+      - "azertAZERT12345"
+    prompts:
+    - "Current password: "
+    - "New password: "
+    - "Retype new password: "
+    - "root@snarc-soca9:"
+    - "root@rzn1-snarc:"
+
+- test:
+    timeout:
+      minutes: 10
+    interactive:
+    - name: basic-cmds-wic
+      prompts: ["root@snarc-soca9", "root@rzn1-snarc"]
+      script:
+      - command: uname -a
+      - command: cat /proc/device-tree/model ; echo ""
+      - command: mount
+      - command: ps aux --sort -rss
+      - command: cat /proc/meminfo
+      - command: cat /proc/cpuinfo
+      - command: free -h
+      - command: sysctl -a | grep vm.min_free_kbytes
+      - command: mount
+      - command: systemctl --no-pager status systemd-resolved
+      - command: systemctl --no-pager restart systemd-resolved
+      - command: systemctl --no-pager status systemd-resolved
+      - command: ifconfig -a
+      - command: ping -c 3 github.com
+      - command: which docker
+
+metadata:
+  machine: ${MACHINE}
+  manifest branch: ${MANIFEST_BRANCH}-${KERNEL_VERSION_PATCHLEVEL}
+  manifest commit: ${MANIFEST_COMMIT}
+  build url: ${BUILD_URL}
+  build location: ${PUBLISH_SERVER}${PUB_DEST}
+
+notify:
+    recipients:
+    - to:
+        method: email
+        email: ralph.siemsen@linaro.org
+    criteria:
+        status: incomplete
+    verbosity: verbose
diff --git a/schneider-openembedded/postbuild.groovy b/schneider-openembedded/postbuild.groovy
new file mode 100644
index 0000000000..3b084fa290
--- /dev/null
+++ b/schneider-openembedded/postbuild.groovy
@@ -0,0 +1,28 @@
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+  pattern = ~/^(\S+)\t(CVE-\S+)\t([^\t]+)\t([^\t]+)/
+  def cve = [
+	NEW:     [],
+	CHANGED: [],
+	FIXED:   [],
+  ]
+  manager.build.logFile.eachLine { line ->
+    matcher = pattern.matcher(line)
+    if(matcher.matches()) {
+      def type = matcher.group(1)
+      def num = matcher.group(2)
+      def pkg = matcher.group(3)
+      def url = matcher.group(4)
+      cve[type].add("<a href=\"${url}\">${num}</a> ${pkg}")
+    }
+  }
+  def summary = manager.createSummary("warning.gif")
+  cve.each {
+    if(it.value.size() > 0) {
+      summary.appendText("$it.key CVEs:<ul>", false)
+      it.value.each {
+          summary.appendText("<li>$it</li>", false)
+      }
+      summary.appendText("</ul>", false)
+    }
+  }
+}
diff --git a/schneider-openembedded/submit_for_testing.sh b/schneider-openembedded/submit_for_testing.sh
new file mode 100755
index 0000000000..36e986a690
--- /dev/null
+++ b/schneider-openembedded/submit_for_testing.sh
@@ -0,0 +1,108 @@
+#!/bin/bash
+
+rm -rf configs
+git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+pushd configs
+git log -1
+popd
+
+# Used by DB410C's template:
+export RESIZE_ROOTFS=${RESIZE_ROOTFS:-}
+
+templates_common_minimal=( prod-image.yaml     )
+templates_common_normal=(  ${templates_common_minimal[@]} )
+if [[ "${IMAGES}" == *dev-image* ]]; then
+templates_common_normal=(  ${templates_common_normal[@]} dev-image.yaml )
+fi
+templates_common_network=( ${templates_common_normal[@]}  )
+templates_common_full=(    ${templates_common_network[@]}  ltp-ptest.yaml )
+
+templates_soca9_minimal=
+templates_soca9_normal=( \
+	${templates_soca9_minimal[@]}
+	lava-multinode-soca9-j21.yaml
+	lava-multinode-soca9-j24-mtu1508.yaml
+)
+templates_soca9_network=( \
+	${templates_soca9_normal[@]}
+	lava-multinode-soca9-j17.yaml
+	lava-multinode-soca9-j22.yaml
+	lava-multinode-soca9-j23.yaml
+	lava-multinode-soca9-j24.yaml
+	lava-multinode-soca9-j22-mtu1508.yaml
+	lava-multinode-soca9-j23-mtu1508.yaml
+)
+templates_soca9_full=(   ${templates_soca9_network[@]} )
+
+templates_rzn1d_minimal=
+templates_rzn1d_normal=( \
+	${templates_rzn1d_minimal[@]}
+	lava-multinode-rzn1d-j21.yaml
+	lava-multinode-rzn1d-j24-mtu1508.yaml
+)
+
+templates_rzn1d_network=( \
+	${templates_rzn1d_normal[@]}
+	lava-multinode-rzn1d-j17.yaml
+	lava-multinode-rzn1d-j22.yaml
+	lava-multinode-rzn1d-j23.yaml
+	lava-multinode-rzn1d-j24.yaml
+	lava-multinode-rzn1d-j22-mtu1508.yaml
+	lava-multinode-rzn1d-j23-mtu1508.yaml
+)
+templates_rzn1d_full=(   ${templates_rzn1d_network[@]} )
+
+case "${DEVICE_TYPE}" in
+  rzn1d)
+	templates_minimal=( ${templates_common_minimal[@]} ${templates_rzn1d_minimal[@]} )
+	templates_normal=(  ${templates_common_normal[@]}  ${templates_rzn1d_normal[@]} )
+	templates_network=( ${templates_common_network[@]} ${templates_rzn1d_network[@]} )
+	templates_full=(    ${templates_common_full[@]}    ${templates_rzn1d_full[@]} )
+	;;
+  soca9)
+	templates_minimal=( ${templates_common_minimal[@]} ${templates_soca9_minimal[@]} )
+	templates_normal=(  ${templates_common_normal[@]}  ${templates_soca9_normal[@]} )
+	templates_network=( ${templates_common_network[@]} ${templates_soca9_network[@]} )
+	templates_full=(    ${templates_common_full[@]}    ${templates_soca9_full[@]} )
+	;;
+  am64x)
+	echo "No LAVA tests for am64x"
+	exit 0
+	;;
+  *)
+	echo "unknown DEVICE_TYPE in submit_for_testing.sh"
+	exit 1
+	;;
+esac
+
+case $TEST_LEVEL in
+	"none" | "0")
+		templates=()
+		;;
+	"minimal" | "minimum" | "min" | "1")
+		templates=( ${templates_minimal[@]} )
+		;;
+	"normal" | "2")
+		templates=( ${templates_normal[@]} )
+		;;
+	"network" | "3")
+		templates=( ${templates_network[@]} )
+		;;
+	*)
+		templates=( ${templates_full[@]} )
+		;;
+esac
+
+for template in ${templates[@]};
+do
+	python configs/openembedded-lkft/submit_for_testing.py \
+	  --device-type ${DEVICE_TYPE} \
+	  --build-number ${BUILD_NUMBER} \
+	  --lava-server ${LAVA_SERVER} \
+	  --qa-server ${QA_SERVER} \
+	  --qa-server-team ${QA_SERVER_TEAM} \
+	  --qa-server-project ${QA_SERVER_PROJECT} \
+	  --git-commit ${MANIFEST_COMMIT} \
+	  --template-path configs/schneider-openembedded/lava-job-definitions/ \
+	  --template-names ${template}
+done
diff --git a/sid-arm64-rootfs.yaml b/sid-arm64-rootfs.yaml
deleted file mode 100644
index f0ca195d4e..0000000000
--- a/sid-arm64-rootfs.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-- job:
-    name: sid-arm64-rootfs
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: codename
-            default: 'sid'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian arm64 rootfs (Sid)'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-arm64
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=8G tmpfs builddir
-            cp -a ${codename}-arm64-${rootfs} builddir/
-            cd builddir/${codename}-arm64-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/${codename}-arm64-${rootfs}/linaro-${codename}-* out
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Build description ( $JOB_NAME )
-
-            * Job URL: "$JOB_URL":$JOB_URL
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Commit: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${codename}/${rootfs}-arm64/${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.number
-                def codename = manager.build.buildVariables.get('codename')
-                def rootfs = manager.build.buildVariables.get('rootfs')
-                def url = "http://snapshots.linaro.org/debian/images/${codename}/${rootfs}-arm64/${build_number}/"
-                def desc = "&nbsp;<a href='${url}'>Build location<t/a>"
-
-                if (manager.build.result == hudson.model.Result.SUCCESS) {
-                  manager.build.setDescription(desc)
-                }
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/sid-armhf-rootfs.yaml b/sid-armhf-rootfs.yaml
deleted file mode 100644
index 2884cc340d..0000000000
--- a/sid-armhf-rootfs.yaml
+++ /dev/null
@@ -1,116 +0,0 @@
-- job:
-    name: sid-armhf-rootfs
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: codename
-            default: 'sid'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian armhf rootfs (Sid)'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-armhf
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=8G tmpfs builddir
-            cp -a ${codename}-armhf-${rootfs} builddir/
-            cd builddir/${codename}-armhf-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/${codename}-armhf-${rootfs}/linaro-${codename}-* out
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Build description ( $JOB_NAME )
-
-            * Job URL: "$JOB_URL":$JOB_URL
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Commit: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${codename}/${rootfs}-armhf/${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.number
-                def codename = manager.build.buildVariables.get('codename')
-                def rootfs = manager.build.buildVariables.get('rootfs')
-                def url = "http://snapshots.linaro.org/debian/images/${codename}/${rootfs}-armhf/${build_number}/"
-                def desc = "&nbsp;<a href='${url}'>Build location<t/a>"
-
-                if (manager.build.result == hudson.model.Result.SUCCESS) {
-                  manager.build.setDescription(desc)
-                }
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/spark.yaml b/spark.yaml
deleted file mode 100644
index e6ea687769..0000000000
--- a/spark.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-- job:
-    name: spark
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: JDK_URL
-            default: 'http://openjdk.linaro.org/releases/jdk8u-server-release-1609.tar.xz'
-        - string:
-            name: MAVEN_URL
-            default: 'http://www.us.apache.org/dist/maven/maven-3/3.3.9/binaries/apache-maven-3.3.9-bin.tar.gz'
-    disabled: false
-    node: docker-jessie-arm64
-    display-name: 'Spark'
-    scm:
-        - git:
-            url: https://github.com/apache/spark.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            basedir: spark
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            wget --progress=dot -e dotbytes=2M ${JDK_URL} ${MAVEN_URL}
-            tar -Jxf jdk*.tar.xz
-            tar -zxf apache-maven-*.tar.gz
-
-            cd jdk*/jre/lib/security/
-            rm -f cacerts
-            ln -s /etc/ssl/certs/java/cacerts
-
-            cat << EOF > ../aarch64/jvm.cfg
-            -server KNOWN
-            -client IGNORE
-            -minimal KNOWN
-            EOF
-
-            cd ${WORKSPACE}/jdk*
-            export JAVA_HOME=${PWD}
-
-            cd ${WORKSPACE}/apache-maven-*
-            export M3_HOME=${PWD}
-
-            export PATH=${JAVA_HOME}/bin:${M3_HOME}/bin:${PATH}
-            java -version
-            mvn -version
-
-            cd ${WORKSPACE}/spark
-            mvn -B --errors -DskipTests clean package
-
-            rm -f ${WORKSPACE}/spark-*.jar
-            find . -type f -name "spark-*-SNAPSHOT*.jar" -exec mv -v -n -t ${WORKSPACE} {} +
-    publishers:
-        - archive:
-            artifacts: 'spark-*-SNAPSHOT*.jar'
-        - groovy-postbuild:
-            script: |
-                pattern = ~/(^\[INFO]) (Spark Project) (.*). (.*) (\[.*])/
-                manager.build.logFile.eachLine { line ->
-                  matcher = pattern.matcher(line)
-                  if (matcher.matches()) {
-                    result = matcher.group(4)
-                    if (result != "SUCCESS") {
-                      manager.buildUnstable()
-                    }
-                  }
-                }
-        - email-ext:
-            recipients: 'naresh.bhat@linaro.org, ganesh.raju@linaro.org, fathi.boudra@linaro.org'
-            body: |
-                Project: ${PROJECT_NAME}
-                Build number: ${BUILD_NUMBER}
-                Build status: ${BUILD_STATUS}
-                Build URL: ${BUILD_URL}
-                Build summary:
-
-                ${BUILD_LOG_MULTILINE_REGEX,regex="(?ms)(Reactor Summary.*?------------------------------------------------------------------------)"}
-            unstable: true
-
diff --git a/stretch-arm64-rootfs.yaml b/stretch-arm64-rootfs.yaml
deleted file mode 100644
index 08f30b535d..0000000000
--- a/stretch-arm64-rootfs.yaml
+++ /dev/null
@@ -1,122 +0,0 @@
-- job:
-    name: stretch-arm64-rootfs
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: codename
-            default: 'stretch'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian arm64 rootfs (Stretch)'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-arm64
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=8G tmpfs builddir
-            cp -a ${codename}-arm64-${rootfs} builddir/
-            cd builddir/${codename}-arm64-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/${codename}-arm64-${rootfs}/linaro-${codename}-* out
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Build description ( $JOB_NAME )
-
-            * Job URL: "$JOB_URL":$JOB_URL
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Commit: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${codename}/${rootfs}-arm64/${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.number
-                def codename = manager.build.buildVariables.get('codename')
-                def rootfs = manager.build.buildVariables.get('rootfs')
-                def url = "http://snapshots.linaro.org/debian/images/${codename}/${rootfs}-arm64/${build_number}/"
-                def desc = "&nbsp;<a href='${url}'>Build location<t/a>"
-
-                if (manager.build.result == hudson.model.Result.SUCCESS) {
-                  manager.build.setDescription(desc)
-                }
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-debian-images-dragonboard410c'
-                - 'lt-qcom-debian-images-dragonboard820c'
-              condition: SUCCESS
-              trigger-with-no-params: true
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/stretch-armhf-rootfs.yaml b/stretch-armhf-rootfs.yaml
deleted file mode 100644
index 12f6e92c47..0000000000
--- a/stretch-armhf-rootfs.yaml
+++ /dev/null
@@ -1,121 +0,0 @@
-- job:
-    name: stretch-armhf-rootfs
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: codename
-            default: 'stretch'
-    disabled: false
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Debian armhf rootfs (Stretch)'
-    scm:
-        - git:
-            url: https://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-armhf
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - installer
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=8G tmpfs builddir
-            cp -a ${codename}-armhf-${rootfs} builddir/
-            cd builddir/${codename}-armhf-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/${codename}-armhf-${rootfs}/linaro-${codename}-* out
-
-            # Build information
-            cat > out/HEADER.textile << EOF
-
-            h4. Build description ( $JOB_NAME )
-
-            * Job URL: "$JOB_URL":$JOB_URL
-            * Build URL: "$BUILD_URL":$BUILD_URL
-            * Commit: "$GIT_COMMIT":$GIT_URL/commit/?id=$GIT_COMMIT
-            EOF
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out debian/images/${codename}/${rootfs}-armhf/${BUILD_NUMBER}
-    publishers:
-        - groovy-postbuild:
-            script: |
-                def build_number = manager.build.number
-                def codename = manager.build.buildVariables.get('codename')
-                def rootfs = manager.build.buildVariables.get('rootfs')
-                def url = "http://snapshots.linaro.org/debian/images/${codename}/${rootfs}-armhf/${build_number}/"
-                def desc = "&nbsp;<a href='${url}'>Build location<t/a>"
-
-                if (manager.build.result == hudson.model.Result.SUCCESS) {
-                  manager.build.setDescription(desc)
-                }
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-debian-images-dragonboard600c'
-              condition: SUCCESS
-              trigger-with-no-params: true
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/sumits-oe.yaml b/sumits-oe.yaml
deleted file mode 100644
index cc5cd5b740..0000000000
--- a/sumits-oe.yaml
+++ /dev/null
@@ -1,158 +0,0 @@
-- job:
-    name: sumits-oe
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 1
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'hikey-new-rebase-trial'
-            description: '<font color="red"><b>[mandatory]</b></font> git branch to use'
-        - string:
-            name: KERNEL_VERSION
-            default: '4.4'
-            description: '<font color="red"><b>[mandatory]</b></font> kernel version to use, matching the kernel used'
-        - string:
-            name: KERNEL_RECIPE
-            default: 'linux-generic-lts'
-            description: '<font color="red"><b>[mandatory]</b></font> kernel recipe to use, matching the kernel version'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://git.linaro.org/people/sumit.semwal/linux-3.x.git'
-            description: '<font color="red"><b>[mandatory]</b></font> git repository to use'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-            description: '<font color="red"><b>[mandatory]</b></font> git commit to use'
-        - string:
-            name: MAKE_KERNELVERSION
-        - string:
-            name: IMAGES
-            default: 'rpb-console-image'
-        - string:
-            name: MANIFEST_BRANCH
-            default: 'morty'
-        - string:
-            name: PUB_DEST
-            default: 'people/sumits/oe/${MANIFEST_BRANCH}/${MACHINE}/${DISTRO}/${KERNEL_VERSION}/${BUILD_NUMBER}'
-            description: '<font color="red"><b>[mandatory]</b></font> publishing destination path'
-        - string:
-            name: LAVA_SERVER
-            default: 'https://lkft.validation.linaro.org/RPC2/'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'linaro-hikey-stable-4.4-oe'
-        - string:
-            name: SKIP_LAVA
-            default: '1'
-        - string:
-            name: LAVA_JOB_PRIORITY
-            default: 'low'
-    disabled: false
-    node: master
-    display-name: 'Sumit Semwal (OpenEmbedded/morty)'
-    axes:
-        - axis:
-            type: user-defined
-            name: MACHINE
-            values:
-                - 'hikey'
-        - axis:
-            type: user-defined
-            name: DISTRO
-            values:
-                - rpb
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-stretch-amd64
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'OE_COMMIT_BOT_KEY'
-        - credentials-binding:
-            - text:
-                credential-id: QA_REPORTS_TOKEN
-                variable: QA_REPORTS_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            # Mapping for MACHINE -> DEVICE_TYPE
-            case "${MACHINE}" in
-              hikey)
-                DEVICE_TYPE=hi6220-hikey
-                ;;
-            esac
-
-            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
-
-            if [ -z "${SRCREV_kernel}" ]; then
-              SRCREV_kernel=$(git ls-remote --heads ${KERNEL_REPO} ${KERNEL_BRANCH} | cut -f1)
-            fi
-
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-        - inject:
-            properties-file: device_type_parameters
-        - shell:
-            !include-raw: openembedded-lkft/builders-sumits.sh
-        - inject:
-            properties-file: post_build_lava_parameters
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --server ${PUBLISH_SERVER} \
-              --link-latest \
-              ${DEPLOY_DIR_IMAGE}/ ${PUB_DEST}
-        - shell:
-            !include-raw: openembedded-lkft/submit_for_testing.sh
-    publishers:
-        - groovy-postbuild:
-            script:
-                !include-raw: openembedded-lkft/postbuild.groovy
-        - email-ext:
-            recipients: 'sumit.semwal@linaro.org'
-            matrix-trigger: only-configurations
-            subject: '[CI] ${MACHINE}: ${KERNEL_BRANCH} {{SRCREV_kernel}} ${BUILD_STATUS}'
-            body: |
-                Build URL: ${PROJECT_URL}${BUILD_NUMBER}/
-                Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText
-                Parsed warnings/errors: ${PROJECT_URL}${BUILD_NUMBER}/parsed_console
-                Git branch: ${KERNEL_BRANCH}
-                Git URL: ${KERNEL_REPO}
-                Git commit: ${SRCREV_kernel}
-
-                Errors:
-                ${BUILD_LOG_REGEX, regex="^ERROR:.* ", linesBefore=0, linesAfter=0, showTruncatedLines=false}
-            presend-script:
-                !include-raw: openembedded-lkft/presend-script.groovy
diff --git a/swarm-demo-factory.yaml b/swarm-demo-factory.yaml
new file mode 100644
index 0000000000..d414c7ec5e
--- /dev/null
+++ b/swarm-demo-factory.yaml
@@ -0,0 +1,41 @@
+- job:
+    name: swarm-demo-factory
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+        - build-discarder:
+            days-to-keep: 10
+            num-to-keep: 10
+    disabled: false
+    display-name: 'Test swarm'
+    parameters:
+        - string:
+            name: jobs
+            description: 'number of jobs to submit'
+            default: "10"
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+            #
+            rm -f swarm_*_build.txt
+            for number in $(seq 1 ${jobs})
+            do
+                echo "number=${number}" > swarm_${number}_build.txt
+            done
+        - trigger-builds:
+            - project: swarm-demo
+              parameter-factories:
+                - factory: filebuild
+                  file-pattern: swarm_*_build.txt
+    publishers:
+        - email:
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/swarm-demo.yaml b/swarm-demo.yaml
new file mode 100644
index 0000000000..554508a196
--- /dev/null
+++ b/swarm-demo.yaml
@@ -0,0 +1,36 @@
+- job:
+    name: swarm-demo
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 10
+            num-to-keep: 10
+    disabled: false
+    display-name: 'Dummy job to run in swarm'
+    node: docker-bionic-arm64
+    concurrent: true
+    parameters:
+        - string:
+            name: number
+            description: 'just something to make each job unique'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+            #
+            echo "swarm build $number"
+            sleep 120
+            echo "slept two minutes"
+    publishers:
+        - email:
+            recipients: linaro-infrastructure-errors@lists.linaro.org
diff --git a/systems-diagnostics-amd64.yaml b/systems-diagnostics-amd64.yaml
new file mode 100644
index 0000000000..08fb60b302
--- /dev/null
+++ b/systems-diagnostics-amd64.yaml
@@ -0,0 +1,49 @@
+- job:
+    name: systems-diagnostics-amd64
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 5
+            num-to-keep: 10
+    disabled: false
+    node: docker-bionic-amd64
+    display-name: 'Systems Diagnostics - AMD64'
+
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/systems/diag-protected.git
+            branches:
+                - origin/master
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            skip-tag: true
+            shallow-clone: true
+            git-tool: jgit
+
+    triggers:
+        - pollscm: 'H/5 * * * *'
+
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+
+
+    builders:
+        - shell: |
+            bash -ex diag.sh
+
+    publishers:
+        - email:
+            recipients: 'kelley.spoon@linaro.org'
diff --git a/systems-diagnostics-controller.yaml b/systems-diagnostics-controller.yaml
new file mode 100644
index 0000000000..cb87627bb6
--- /dev/null
+++ b/systems-diagnostics-controller.yaml
@@ -0,0 +1,59 @@
+- job:
+    name: systems-diagnostics-controller
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 5
+            num-to-keep: 10
+    disabled: false
+    node: master
+    display-name: 'Systems Diagnostics - Controller'
+
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: JJB_USER
+                variable: JJB_USER
+        - credentials-binding:
+            - text:
+                credential-id: JJB_PASSWORD
+                variable: JJB_PASSWORD
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: DEV_PRIVATE_KEY
+                variable: DEV_PRIVATE_KEY
+        - credentials-binding:
+            - text:
+                credential-id: AUTH_TOKEN
+                variable: AUTH_TOKEN
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            curl -o ./diag.sh https://people.linaro.org/~kelley.spoon/diag.sh
+            /bin/bash ./diag.sh
+            rm -f ./diag.sh
+    publishers:
+        - email:
+            recipients: 'kelley.spoon@linaro.org'
diff --git a/systems-diagnostics-linarocp.yaml b/systems-diagnostics-linarocp.yaml
new file mode 100644
index 0000000000..491812a777
--- /dev/null
+++ b/systems-diagnostics-linarocp.yaml
@@ -0,0 +1,49 @@
+- job:
+    name: systems-diagnostics-linarocp
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-workspace
+        - build-discarder:
+            days-to-keep: 5
+            num-to-keep: 10
+    disabled: false
+    node: docker-focal-amd64
+    display-name: 'Systems Diagnostics - linaro-cp'
+
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 500
+        # needed to publish to snapshots
+        - credentials-binding:
+            - text:
+                credential-id: snapshots-api-key
+                variable: PUBLISH_KEY
+
+    builders:
+        - shell: |
+
+            NOW=$(date +%Y-%m-%d)
+            mkdir -p ./systems-test/$NOW
+            echo "hello" > systems-test/$NOW/hello.txt
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            # --server defaults to https://snapshots.linaro.org
+            # Should pull in credential from $PUBLISH_KEY set in bindings above
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --api_version 3 \
+              systems-test/$NOW test/$NOW
+ 
+    publishers:
+        - email:
+            recipients: 'kelley.spoon@linaro.org'
diff --git a/tcwg-abe-extended.yaml b/tcwg-abe-extended.yaml
index 55f00a0356..2b7f313a45 100644
--- a/tcwg-abe-extended.yaml
+++ b/tcwg-abe-extended.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -23,25 +23,34 @@
             default: refs/remotes/origin/master
             description: 'scripts branch to use'
         - string:
+            name: distro
+            default: 'default'
+            description: 'Distro image to use'
+        - string:
             name: test_list
-            default: 'canadian_cross_build_gcc5 cross_linux_build_check_gcc4_9 cross_linux_build_check_gcc6 cross_bare_build_check_gcc6 cross_qemu_build_check_gcc6 native_build_check_gcc6 abe-testsuite abe-tests-arm-linux-gnueabihf abe-tests-arm-none-eabi abe-tests-aarch64-linux-gnu abe-tests-aarch64_be-elf abe-tests-checkout'
+            default: 'cross_linux_build_check_gcc cross_bare_build_check_gcc cross_qemu_build_check_gcc native_build_check_gcc abe-testsuite abe-tests-arm-linux-gnueabihf abe-tests-arm-none-eabi abe-tests-aarch64-linux-gnu abe-tests-aarch64_be-elf abe-tests-checkout'
             description: 'List of tests to perform'
+        - bool:
+            name: dryrun
+            default: false
+            description: 'Dry-run, do nothing, just print steps'
     disabled: false
     node: tcwg-coordinator
     retry-count: 3
     concurrent: true
     display-name: 'TCWG BBB ABE extended tests'
+    workspace: workspace/tcwg-abe-extended_$EXECUTOR_NUMBER
+    child-workspace: .
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
+            url: https://git.linaro.org/toolchain/abe.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             branches:
                 - ${abe_branch}
             skip-tag: true
-            shallow-clone: true
             wipe-workspace: true
         - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             branches:
                 - ${scripts_branch}
@@ -75,9 +84,7 @@
     builders:
         - shell:
             !include-raw: tcwg-abe-extended/builders.sh
-        - trigger-builds:
-          - project: tcwg-regression-detection
-            predefined-parameters: ref_abe_rev=tested
     publishers:
-        - email:
+        - email-ext:
             recipients: 'tcwg-validation@linaro.org'
+            aborted: true
diff --git a/tcwg-abe-extended/builders.sh b/tcwg-abe-extended/builders.sh
index 84d6558670..50091c014a 100755
--- a/tcwg-abe-extended/builders.sh
+++ b/tcwg-abe-extended/builders.sh
@@ -4,19 +4,29 @@ set -ex
 
 . ./jenkins-scripts/jenkins-helpers.sh
 
-./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh
+./jenkins-scripts/start-container-docker.sh --distro $distro --label $label --node $NODE_NAME --task build --prefix build_ --dryrun $dryrun > build-container.sh
 . ./build-container.sh
 trap "build_container_cleanup" EXIT HUP INT QUIT TRAP PIPE TERM
 BUILD_SHELL="build_container_exec bash"
 
-gcc4_9ver=gcc=gcc.git~linaro-4.9-2016.02
-gcc5ver=gcc=gcc.git~linaro-5.3-2016.05
+gcc4_9ver=gcc=gcc.git~linaro/gcc-4_9-branch
+gcc5ver=gcc=gcc.git~linaro/gcc-5-branch
 gcc6ver=gcc=gcc.git~linaro-6.1-2016.08
 
 gccnum=$(echo ${testname} | sed 's/.*_gcc//') # eg 6
 gccversionname=gcc${gccnum}ver                # eg gccversionname=gcc6ver
 gccversion=$(eval echo \$$gccversionname)     # eg gccversion=gcc=gcc.git~linaro-6.1-2016.08
 
+# IF we provide no version number shortcut, use latest-rel
+if [ "$gccnum" = "" ]; then
+    gccconfig=""
+    gccversion=""
+else
+    gccconfig="--extraconfigdir ../config/gcc${gccnum}"
+fi
+
+ret=0
+
 case "$testname" in
   canadian_cross_build_gcc*)
     # Configure git user info to make git stash happy. It
@@ -27,20 +37,17 @@ case "$testname" in
     mkdir _build
     cd _build
     target=arm-linux-gnueabihf
-    ${BUILD_SHELL} ../configure --with-git-reference-dir=~tcwg-buildslave/snapshots-ref
-    ret=$?
+    ${BUILD_SHELL} ../configure --with-git-reference-dir=~tcwg-buildslave/snapshots-ref || ret=$?
     if test ${ret} -ne 0; then
       echo "Configure error: ${ret}"
       exit $ret
     fi
-    ${BUILD_SHELL} ${WORKSPACE}/abe.sh --target ${target} --extraconfigdir ../config/gcc${gccnum} --build all $gccversion
-    ret=$?
+    ${BUILD_SHELL} ${WORKSPACE}/abe.sh --target ${target} $gccconfig --build all $gccversion || ret=$?
     if test ${ret} -ne 0; then
       echo "First build error: ${ret}"
       exit $ret
     fi
-    ${BUILD_SHELL} ${WORKSPACE}/abe.sh --target ${target} --extraconfigdir ../config/gcc${gccnum} --build all $gccversion --host i686-w64-mingw32
-    ret=$?
+    ${BUILD_SHELL} ${WORKSPACE}/abe.sh --target ${target} $gccconfig --build all $gccversion --host i686-w64-mingw32 || ret=$?
     if test ${ret} -ne 0; then
       echo "Second build error: ${ret}"
       exit $ret
@@ -55,7 +62,7 @@ case "$testname" in
       cross_linux_*)
         target=arm-linux-gnueabihf
 	tester_label=$(print_tester_label_for_target $target)
-	./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh
+	bash -x ./jenkins-scripts/start-container-docker.sh --distro $distro --label $tester_label --task test --prefix test_  > test-container.sh
 	. ./test-container.sh
 	trap "build_container_cleanup; test_container_cleanup" EXIT HUP INT QUIT TRAP PIPE TERM
 	testcontainer_opt="--testcontainer ${test_container_host}:${test_container_port}"
@@ -73,23 +80,19 @@ case "$testname" in
     esac
 
     # Build and check a linux target
-    ${BUILD_SHELL} -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir `pwd` --target ${target} ${bootstrap} ${testcontainer_opt} --runtests --excludecheck gdb --override "--extraconfigdir ../config/gcc${gccnum} $gccversion"
-    ret=$?
+    ${BUILD_SHELL} -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir `pwd` --target ${target} ${bootstrap} ${testcontainer_opt} --runtests --excludecheck gdb --override "$gccconfig $gccversion" || ret=$?
     #FIXME: check validation results (against a known baseline)
     #FIXME: validate the manifest
     ;;
   abe-testsuite)
-    ${BUILD_SHELL} -c "set -ex; ./configure; make check"
-    ret=$?
+    ${BUILD_SHELL} -c "set -ex; ./configure; make check" || ret=$?
     ;;
   abe-tests-checkout)
-    ${BUILD_SHELL} -c "set -ex; git clone https://git.linaro.org/toolchain/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref"
-    ret=$?
+    ${BUILD_SHELL} -c "set -ex; git clone https://git.linaro.org/toolchain/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref" || ret=$?
     ;;
   abe-tests-*)
     target=$(echo ${testname} | sed 's/abe-tests-//')
-    ${BUILD_SHELL} -c "set -ex; git clone https://git.linaro.org/toolchain/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-report --target ${target}"
-    ret=$?
+    ${BUILD_SHELL} -c "set -ex; git clone https://git.linaro.org/toolchain/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-report --target ${target}" || ret=$?
     ;;
 esac
 
diff --git a/tcwg-abe-manifest-test.yaml b/tcwg-abe-manifest-test.yaml
deleted file mode 100644
index 983b27df42..0000000000
--- a/tcwg-abe-manifest-test.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-- job:
-    name: tcwg-abe-manifest-test
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 10
-            num-to-keep: 10
-    parameters:
-        - string:
-            name: abe_branch
-            default: refs/heads/master
-            description: 'ABE revision to test'
-    disabled: false
-    node: tcwg-x86_64-build
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG ZZZ ABE Manifest Test'
-    scm:
-        - git:
-            url: http://git.linaro.org/toolchain/abe-tests.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - ${abe_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            bash -x ${WORKSPACE}/test-manifest2.sh --ref-snapshots /home/tcwg-buildslave/snapshots-ref --abe-branch ${abe_branch} --quiet --display-report
diff --git a/tcwg-abe-test.yaml b/tcwg-abe-test.yaml
index 807b5326d0..099fff8848 100644
--- a/tcwg-abe-test.yaml
+++ b/tcwg-abe-test.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -26,14 +26,19 @@
             name: scripts_branch
             default: master
             description: 'Scripts branch to use'
+        - bool:
+            name: dryrun
+            default: false
+            description: 'Dry-run, do nothing, just print steps'
     disabled: false
     node: tcwg-coordinator
     retry-count: 3
     concurrent: true
     display-name: 'TCWG BBB ABE Test'
+    child-workspace: ../tcwg-abe-test__$EXECUTOR_NUMBER
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
+            url: https://git.linaro.org/toolchain/abe.git
             refspec: +refs/changes/*:refs/remotes/changes/*
             branches:
                 - ${GERRIT_PATCHSET_REVISION}
@@ -99,10 +104,10 @@
             # strategy doesn't pick up the right one when manually triggered.
             git checkout -f ${GERRIT_PATCHSET_REVISION}
 
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
+            git clone -b $scripts_branch --depth 1 https://git.linaro.org/toolchain/jenkins-scripts
             . ./jenkins-scripts/jenkins-helpers.sh
 
-            ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh
+            ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ --dryrun $dryrun > build-container.sh
             . ./build-container.sh
             BUILD_SHELL="build_container_exec bash"
             $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a"
@@ -110,20 +115,25 @@
             # Remove container on exit
             trap "build_container_cleanup" EXIT HUP INT QUIT TRAP KILL PIPE TERM
 
+            if $dryrun; then
+                DRYRUNCMD="echo DRYRUN:"
+            else
+                DRYRUNCMD=
+            fi
 
             status=0
             case "$test" in
               cross_build)
                 tester_label=$(print_tester_label_for_target arm-linux-gnueabihf)
-                ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh
+                ./jenkins-scripts/start-container-docker.sh --label $tester_label --task test --prefix test_ > test-container.sh
                 . ./test-container.sh
                 trap "build_container_cleanup; test_container_cleanup" EXIT HUP INT QUIT TRAP KILL PIPE TERM
 
-                ${BUILD_SHELL} -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --target arm-linux-gnueabihf --testcontainer ${test_container_host}:${test_container_port} --runtests --excludecheck gdb --override '--extraconfigdir ../config/gcc7'
+                ${BUILD_SHELL} -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --target arm-linux-gnueabihf --testcontainer ${test_container_host}:${test_container_port} --runtests --excludecheck gdb
                 status=$?
                 ;;
               native_build)
-                ${BUILD_SHELL} -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --target native --runtests --bootstrap --excludecheck gdb --override '--extraconfigdir ../config/gcc6'
+                ${BUILD_SHELL} -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --target native --runtests --bootstrap --excludecheck gdb
                 status=$?
                 ;;
               testsuite)
@@ -132,19 +142,19 @@
                 ;;
               abe-tests)
                 ${BUILD_SHELL} -c "set -ex; git clone https://git.linaro.org/toolchain/abe-tests.git; cd abe-tests; ./test-manifest2.sh --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref --quiet --display-summary" || status=$?
-                cp abe-tests/full-manifest-test/*.txt ${ARTIFACTS}
-                rm ${ARTIFACTS}/empty.txt
+                $DRYRUNCMD cp abe-tests/full-manifest-test/*.txt ${ARTIFACTS}
+                $DRYRUNCMD rm ${ARTIFACTS}/empty.txt
                 # full build logs are large, and not very useful, so we
                 # don't waste the disk space on them
-                rm -f ${ARTIFACTS}/test-mani-build[12].txt
+                $DRYRUNCMD rm -f ${ARTIFACTS}/test-mani-build[12].txt
                 ;;
               abe-tests-checkout)
                 ${BUILD_SHELL} -c "set -ex; git clone https://git.linaro.org/toolchain/abe-tests.git; cd abe-tests; ./test-checkout.sh --clean-snapshots --abe-path `pwd` --ref-snapshots /home/tcwg-buildslave/snapshots-ref" || status=$?
-                cp abe-tests/checkout-test/workspace*/test_*.log ${ARTIFACTS}
-                rm artifacts/empty.txt
+                $DRYRUNCMD cp abe-tests/checkout-test/workspace*/test_*.log ${ARTIFACTS}
+                $DRYRUNCMD rm artifacts/empty.txt
                 # the reports from here aren't usually needed, so are
                 # worth compressing
-                xz ${ARTIFACTS}/*
+                $DRYRUNCMD xz ${ARTIFACTS}/*
                 ;;
             esac
 
diff --git a/tcwg-abe-tested.yaml b/tcwg-abe-tested.yaml
index f5a34d9a10..11526d09a7 100644
--- a/tcwg-abe-tested.yaml
+++ b/tcwg-abe-tested.yaml
@@ -2,30 +2,45 @@
     name: abe
     scm:
         - git:
-            url: ssh://tcwg-buildslave@review.linaro.org:29418/toolchain/abe.git
-            # tcwg-buildslave user id
-            credentials-id: 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-            name: abe
+            url: https://git.linaro.org/toolchain/abe.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
             branches:
-                - refs/remotes/gerrit/master
+                - master
             basedir: abe
             skip-tag: true
-            shallow-clone: false
             wipe-workspace: false
+            clean:
+                before: true
+            prune: true
 - scm:
     name: jenkins-scripts
     scm:
         - git:
-            url: ssh://tcwg-buildslave@review.linaro.org:29418/toolchain/jenkins-scripts.git
-            # tcwg-buildslave user id
-            credentials-id: 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-            name: jenkins-scripts
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
             branches:
-                - refs/remotes/gerrit/master
+                - master
             basedir: jenkins-scripts
             skip-tag: true
-            shallow-clone: false
+            reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+            wipe-workspace: false
+            clean:
+                before: true
+            prune: true
+- scm:
+    name: dockerfiles
+    scm:
+        - git:
+            url: https://git.linaro.org/ci/dockerfiles.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
+            branches:
+                - master
+            basedir: dockerfiles
+            skip-tag: true
             wipe-workspace: false
+            clean:
+                before: true
+            prune: true
 - job:
     name: tcwg-abe-tested
     project-type: multijob
@@ -35,28 +50,41 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 30
+        - build-blocker:
+            use-build-blocker: true
+            blocking-jobs:
+              - "ci-dockerfiles-deployment"
+            queue-scanning: 'ALL'
+        - throttle:
+            max-total: 1
+            option: project
     parameters:
         - bool:
             name: no_tests_just_update_tested
             default: 'false'
             description: 'Do not run tests, and just update abe:tested'
+        - string:
+            name: distro
+            default: 'lts_1'
+            description: 'Distro image to use'
     disabled: false
     node: tcwg-coordinator
     concurrent: true
-    display-name: 'TCWG BBB Trigger ABE extended validation'
+    display-name: 'TCWG BBB Update tested branches (ABE, jenkins-scripts, dockerfiles) after extended validation'
     scm:
         - abe
         - jenkins-scripts
+        - dockerfiles
     triggers:
-        # Every day at 1:01am
+        # Daily
         - pollscm:
-            cron: '1 1 * * *'
+            cron: 'H H * * *'
     wrappers:
         - timeout:
             timeout: 600
@@ -83,12 +111,13 @@
                       predefined-parameters: |
                         abe_branch=$GIT_COMMIT
                         scripts_branch=$GIT_COMMIT_1
+                        distro=lts_1
         - shell: |
             #!/bin/bash
-            
-            set -ex
 
-            git config --global user.name "TCWG Buildslave"
-            git config --global user.email tcwg-buildslave@linaro.org
-            git -C abe push gerrit $GIT_COMMIT:refs/heads/tested
-            git -C jenkins-scripts push gerrit $GIT_COMMIT_1:refs/heads/tested
+            set -ex
+            ./jenkins-scripts/docker-run.sh --distro $distro -- ./jenkins-scripts/tcwg-update-tested.sh --GIT_COMMIT $GIT_COMMIT --GIT_COMMIT_1 $GIT_COMMIT_1 --GIT_COMMIT_2 $GIT_COMMIT_2 --verbose true
+    publishers:
+        - email-ext:
+            recipients: 'tcwg-validation@linaro.org'
+            aborted: true
diff --git a/tcwg-backport.yaml b/tcwg-backport.yaml
index 56dd2b402d..467b26dd52 100644
--- a/tcwg-backport.yaml
+++ b/tcwg-backport.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -32,33 +32,43 @@
             description: 'Log_Server'
         - string:
             name: target_list
-            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
-            description: 'List of targets -- aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build -- the tcwg-* targets should be a subset of slave axis'
+            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf arm-eabi aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build'
+            description: 'List of targets -- aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf arm-eabi aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build -- the tcwg-* targets should be a subset of slave axis'
         - string:
             name: abe_branch
-            default: refs/remotes/origin/tested
+            default: tested
             description: 'ABE revision to use'
+        - string:
+            name: scripts_branch
+            default: tested
+            description: 'jenkins-scripts revision to use'
         - bool:
             name: rebuild
             default: false
             description: 'Rebuild the toolchain even if results are already on logserver'
+        - bool:
+            name: dryrun
+            default: false
+            description: 'Dry-run, do nothing, just print steps'
     disabled: false
-    node: tcwg-x86_64-dev-01
+    node: tcwg-coordinator
     concurrent: true
     display-name: 'TCWG AAA Backport'
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
+            url: https://git.linaro.org/toolchain/gcc.git
             refspec: +refs/changes/*:refs/remotes/changes/*
             basedir: gcc
             branches:
                 - ${GERRIT_PATCHSET_REVISION}
             skip-tag: true
             wipe-workspace: false
+            clean:
+                before: true
             reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
             choosing-strategy: gerrit
         - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
+            url: https://git.linaro.org/toolchain/abe.git
             refspec: +refs/changes/*:refs/remotes/changes/*
             basedir: abe
             branches:
@@ -66,6 +76,15 @@
             skip-tag: true
             shallow-clone: true
             wipe-workspace: true
+        - git:
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
+            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+            branches:
+                - $scripts_branch
+            basedir: jenkins-scripts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
     triggers:
         - gerrit:
             server-name: 'review.linaro.org'
@@ -101,12 +120,25 @@
             set -e
             set -x
 
-            abe_rev=$(git -C abe rev-parse --short $abe_branch)
-            gcc_patch_rev=$(git -C gcc rev-parse $GERRIT_PATCHSET_REVISION)
+            # Make sure we start from a clean state
+            rm -f gcc_orig_parameters gcc_patch_prev compare_results_parameters
+
+            # For git_rev_parse
+            . ./jenkins-scripts/jenkins-helpers.sh
+
+            # Split in two commands to help debug traces if needed
+            commit_msg=$(git -C gcc log --pretty=%b -n1 $GERRIT_PATCHSET_REVISION)
+            commit_msg=$(echo $commit_msg | grep DO_NOT_RUN_VALIDATION) || true
+            if [ "x$commit_msg" != "x" ]; then
+              exit 0
+            fi
+
+            abe_rev=$(git_rev_parse abe $abe_branch)
+            gcc_patch_rev=$(git_rev_parse gcc $GERRIT_PATCHSET_REVISION)
             if [ x"$gcc_orig" = x"gcc_patch_prev" ]; then
               gcc_orig="$gcc_patch_rev^"
             fi
-            gcc_orig_rev=$(git -C gcc rev-parse $gcc_orig)
+            gcc_orig_rev=$(git_rev_parse gcc $gcc_orig)
 
             case ${GERRIT_BRANCH} in
               *gcc-4_9*)
@@ -122,44 +154,58 @@
                 toolchainconf='--extraconfigdir ../config/gcc7'
                 ;;
               *)
-                toolchainconf='--extraconfigdir ../config/gcc7 binutils=binutils-gdb.git/master glibc=glibc.git~master newlib=newlib.git~master'
+                toolchainconf='--extraconfigdir ../config/latest-rel'
                 ;;
             esac
 
             cat <<EOF > gcc_orig_parameters
             override=$toolchainconf gcc=gcc.git@$gcc_orig_rev
-            log_name=tcwg-backport-$gcc_orig_rev/$abe_rev/\$builder_type.\$target
+            log_name=tcwg-backport-$gcc_orig_rev/$abe_rev/@@host@@.\$target
             rebuild=${rebuild}
             dont_fail=true
             log_server=$log_server
             target_list=$target_list
             abe_branch=$abe_rev
+            scripts_branch=$scripts_branch
             displaytag=backport-ref-${GERRIT_CHANGE_NUMBER}
+            dryrun=$dryrun
             EOF
 
             cat <<EOF > gcc_patch_parameters
             override=$toolchainconf gcc=gcc.git@$gcc_patch_rev
-            log_name=tcwg-backport-$gcc_patch_rev/$abe_rev/\$builder_type.\$target
+            log_name=tcwg-backport-$gcc_patch_rev/$abe_rev/@@host@@.\$target
             rebuild=${rebuild}
             dont_fail=true
             log_server=$log_server
             target_list=$target_list
             abe_branch=$abe_rev
+            scripts_branch=$scripts_branch
             displaytag=backport-patch-${GERRIT_CHANGE_NUMBER}
+            dryrun=$dryrun
             EOF
 
             cat <<EOF > compare_results_parameters
             ref_logs=tcwg-backport-$gcc_orig_rev/$abe_rev
             new_logs=tcwg-backport-$gcc_patch_rev/$abe_rev
+            target_list=$target_list
             log_server=$log_server
+            dryrun=$dryrun
             EOF
-        - trigger-builds:
-            - project: tcwg-buildfarm
-              parameter-factories:
-                - factory: filebuild
-                  file-pattern: gcc_*_parameters
-              block: true
-        - trigger-builds:
-            - project: tcwg-compare-results
-              property-file: compare_results_parameters
-              block: true
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: gcc_orig_parameters
+            steps:
+              - trigger-builds:
+                  - project: tcwg-buildfarm
+                    parameter-factories:
+                      - factory: filebuild
+                        file-pattern: gcc_*_parameters
+                    block: true
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: gcc_orig_parameters
+            steps:
+              - trigger-builds:
+                  - project: tcwg-compare-results
+                    property-file: compare_results_parameters
+                    block: true
diff --git a/tcwg-backup-files.yaml b/tcwg-backup-files.yaml
deleted file mode 100644
index 294787bfcc..0000000000
--- a/tcwg-backup-files.yaml
+++ /dev/null
@@ -1,73 +0,0 @@
-- job:
-    name: tcwg-backup-files
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-        - throttle:
-            max-per-node: 1
-            option: project
-    parameters:
-        - string:
-            name: paths
-            default: '/home/tcwg-buildslave/logs* /home/tcwg-buildslave/public_html /home/tcwg-buildslave/releases'
-            description: 'Paths to backup'
-        - string:
-            name: backup_machine
-            default: 'bkp-01.tcwglab:/home/tcwg-buildslave/$label/'
-            description: 'Backup destination'
-        - string:
-            name: rsync_opts
-            default: '-avz'
-            description: 'Options to give to rsync'
-        - bool:
-            name: dry_run
-            default: 'false'
-            description: 'Whether to do a dry-run'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: false
-    display-name: 'TCWG CCC Backup files'
-    triggers:
-        - timed: '@daily'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-dev-01
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            if ! $dry_run; then
-              rsync $rsync_opts $paths $backup_machine
-            else
-              echo "rsync $rsync_opts $paths $backup_machine"
-            fi
-    publishers:
-        - email:
-            recipients: tcwg@linaro.org
diff --git a/tcwg-benchmark-and-results.yaml b/tcwg-benchmark-and-results.yaml
deleted file mode 100644
index 2b84074965..0000000000
--- a/tcwg-benchmark-and-results.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-- job:
-    name: tcwg-benchmark-and-results
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - text:
-            name: benchmark_params
-            default: |
-              toolchain_url=http://releases.linaro.org/components/toolchain/binaries/latest/arm-linux-gnueabihf/gcc-linaro-*-x86_64_arm-linux-gnueabihf.tar.xz
-              sysroot=tarball
-              bench_list=all
-              cflags=
-              testmode=benchmark
-              iterations=1
-              forceinstall=false
-              run_profile=parallel3x1
-              scripts_branch=master
-              bmk_branch=master
-            description: 'Benchmark parameters, see tcwg-benchmark job'
-    disabled: false
-    node: tcwg-bmk-coordinator
-    concurrent: true
-    display-name: 'TCWG ZZZ Benchmark and Results'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          set -ex
-
-          echo "results_id=hw_type/tcwg-benchmark-and-results-$BUILD_NUM" > benchmark_params
-          echo "$benchmark_params" >> benchmark_params
-          . benchmark_params
-          cat > results_params <<EOF
-          results_id=$results_id
-          EOF
-      - trigger-builds:
-          - project: 'tcwg-benchmark'
-            property-file: benchmark_params
-            block: true
-      - trigger-builds:
-          - project: 'tcwg-benchmark-results'
-            property-file: results_params
-            block: true
diff --git a/tcwg-benchmark-christophe.yaml b/tcwg-benchmark-christophe.yaml
deleted file mode 100644
index 7fe6486ecc..0000000000
--- a/tcwg-benchmark-christophe.yaml
+++ /dev/null
@@ -1,166 +0,0 @@
-- job:
-    name: tcwg-benchmark-christophe
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: toolchain_url
-            default: ''
-            description: 'Toolchain URL. Either http[s]://xxx.tar.xz, rsync://machine:/path/bin/target-triplet-, or ssh://machine/path/compiler'
-        - string:
-            name: sysroot
-            default: 'tarball'
-            description: 'Rsync-friendly path to the sysroot to run against; use libs from toolchain_url tarball/rsync if "tarball"; use system libs if empty'
-        - string:
-           name: bench_list
-           default: 'bzip2'
-           description: 'List of benchmarks to run (from spec2k6). Use "all" to run all of them.'
-        - string:
-            name: cflags
-            default: ''
-            description: 'CFLAGS to use'
-        - choice:
-            name: extension
-            choices:
-              - default
-              - O2
-              - O3
-              - O2g
-              - O3g
-              - Ofast
-              - Os
-            default: 'O2g'
-            description: 'Compilation profile'
-        - choice:
-            name: testmode
-            choices:
-              - build
-              - verify
-              - benchmark
-            default: 'verify'
-            description: 'Whether to just build or run full benchmarks'
-        - string:
-            name: iterations
-            default: '1'
-            description: 'Number of benchmark iterations'
-        - string:
-            name: results_id
-            default: <hw_type>/tcwg-benchmark-christophe-<build_num>
-            description: 'ID for benchmarking results; results will appear in dev-01.tcwglab:/home/tcwg-benchmark/results-$results_id/'
-        - bool:
-            name: forceinstall
-            default: 'false'
-            description: 'Force clean re-install of benchmark sources'
-        - choice:
-            name: run_profile
-            choices:
-              - parallel3x3
-              - parallel3x1
-              - serial1
-            default: 'parallel3x1'
-            description: 'Benchmark profile to use: parallel3x3 runs on 3 boards and 3 CPUs in parallel; parallel3x1 runs on 3 boards on 1 CPU in parallel; serial1 runs on a single board on 1 CPU.'
-        - string:
-            name: target_list
-            default: 'tx1'
-            description: 'List of targets -- tk1 tx1'
-        - bool:
-            name: reboot
-            default: 'false'
-            description: 'Reboot the board before building and running the benchmarks.'
-        - string:
-            name: displaytag
-            default: ''
-            description: 'Tag to display in the Jenkins console, so that the build name is more meaningful'
-        - bool:
-            name: ignore_errors
-            default: 'false'
-            description: 'Ignore build errors as much as possible'
-        - string:
-            name: builder
-            default: 'tcwg-x86_64-build'
-            description: 'Builder -- jenkins label or node'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - string:
-            name: bmk_branch
-            default: master
-            description: 'Bmk-scripts branch to use'
-    disabled: false
-    node: tcwg-bmk-coordinator
-    child-workspace: $label
-    concurrent: true
-    display-name: 'TCWG ZZZ Benchmark Christophe'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/bmk-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${bmk_branch}
-            basedir: bmk-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-bmk-tk1-06
-                - tcwg-bmk-tk1-07
-                - tcwg-bmk-tk1-08
-                - tcwg-bmk-tx1-06
-                - tcwg-bmk-tx1-07
-                - tcwg-bmk-tx1-08
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        combination-filter: |
-            (target=="tk1" && label==~/tcwg-bmk-tk1-.*/) || (target=="tx1" && label==~/tcwg-bmk-tx1-.*/)
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 900
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${displaytag}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-            exec ./tcwg-benchmark.sh
-    publishers:
-        - email-ext:
-            always: true
-            send-to:
-                - requester
diff --git a/tcwg-benchmark-compare-christophe.yaml b/tcwg-benchmark-compare-christophe.yaml
deleted file mode 100644
index 7352348775..0000000000
--- a/tcwg-benchmark-compare-christophe.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-- job:
-    name: tcwg-benchmark-compare-christophe
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: resultsref
-            default: <hw_type>/tcwg-benchmark-christophe-<build_num>
-            description: 'Rsync-friendly for reference results. Use the results_id value of the reference build.'
-        - string:
-            name: resultseval
-            default: <hw_type>/tcwg-benchmark-christophe-<build_num>
-            description: 'Rsync-friendly for results to compare to reference.  Use the results_id value of the build.'
-        - bool:
-            name: peak
-            default: false
-            description: 'Use peak performance instead of median'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - string:
-            name: bmk_branch
-            default: master
-            description: 'Bmk-scripts branch to use'
-    disabled: false
-    node: tcwg-bmk-dev-01
-    concurrent: true
-    display-name: 'TCWG ZZZ Benchmark Compare Christophe'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/bmk-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${bmk_branch}
-            basedir: bmk-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -e -u -o pipefail
-          refboard=$(dirname ${resultsref})
-          evalboard=$(dirname ${resultseval})
-          refnumber=$(basename ${resultsref} | sed 's/tcwg-benchmark-christophe-//')
-          evalnumber=$(basename ${resultseval} | sed 's/tcwg-benchmark-christophe-//')
-          peakstr=""
-          $peak && peakstr=-peak
-          echo "#${BUILD_NUMBER}-${refboard}-${refnumber}-${evalboard}-${evalnumber}${peakstr}" > ${WORKSPACE}/version.txt
-      - build-name-setter:
-          name: 'version.txt'
-          file: true
-      - shell: |
-          #!/bin/bash
-
-          set -ex
-          exec ./tcwg-benchmark-results-compare.sh
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            latest-only: false
diff --git a/tcwg-benchmark-compare.yaml b/tcwg-benchmark-compare.yaml
deleted file mode 100644
index 07f9143b93..0000000000
--- a/tcwg-benchmark-compare.yaml
+++ /dev/null
@@ -1,91 +0,0 @@
-- job:
-    name: tcwg-benchmark-compare
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: resultsref
-            default: <hw_type>/tcwg-benchmark-<build_num>
-            description: 'Rsync-friendly for reference results. Use the results_id value of the reference build.'
-        - string:
-            name: resultseval
-            default: <hw_type>/tcwg-benchmark-<build_num>
-            description: 'Rsync-friendly for results to compare to reference.  Use the results_id value of the build.'
-        - bool:
-            name: peak
-            default: false
-            description: 'Use peak performance instead of median'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - string:
-            name: bmk_branch
-            default: master
-            description: 'Bmk-scripts branch to use'
-    disabled: false
-    node: tcwg-bmk-dev-01
-    concurrent: true
-    display-name: 'TCWG BBB Benchmark Compare'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/bmk-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${bmk_branch}
-            basedir: bmk-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -e -u -o pipefail
-          refboard=$(dirname ${resultsref})
-          evalboard=$(dirname ${resultseval})
-          refnumber=$(basename ${resultsref} | sed 's/tcwg-benchmark-//')
-          evalnumber=$(basename ${resultseval} | sed 's/tcwg-benchmark-//')
-          peakstr=""
-          $peak && peakstr=-peak
-          echo "#${BUILD_NUMBER}-${refboard}-${refnumber}-${evalboard}-${evalnumber}${peakstr}" > ${WORKSPACE}/version.txt
-      - build-name-setter:
-          name: 'version.txt'
-          file: true
-      - shell: |
-          #!/bin/bash
-
-          set -ex
-          exec ./tcwg-benchmark-results-compare.sh
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            latest-only: false
diff --git a/tcwg-benchmark-release.yaml b/tcwg-benchmark-release.yaml
deleted file mode 100644
index ffa2f70f76..0000000000
--- a/tcwg-benchmark-release.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-- job:
-    name: tcwg-benchmark-release
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: release_url
-            default: 'http://releases.linaro.org/components/toolchain/binaries/latest'
-            description: 'Release URL'
-        - string:
-            name: target_list
-            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf'
-            description: 'List of targets'
-        - string:
-            name: extension_list
-            default: 'O2g'
-            description: 'List of build profiles: O2, O3, O2g, O3g, Ofast, Os'
-        - text:
-            name: benchmark_params
-            default: |
-              bench_list=bzip2
-              cflags=
-              testmode=verify
-              iterations=1
-              sysroot=tarball
-              fileserver=dev-01.tcwglab
-              forceinstall=false
-              run_profile=parallel3x3
-              scripts_branch=master
-              bmk_branch=master
-            description: 'Benchmark parameters, see tcwg-benchmark job'
-    disabled: false
-    node: tcwg-bmk-coordinator
-    concurrent: true
-    display-name: 'TCWG ZZZ Benchmark Release'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-coordinator
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-        - axis:
-            type: dynamic
-            name: extension
-            values:
-                - extension_list
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          set -ex
-
-          # Note that armv8l-linux-gnueabihf will not match "arm-"*, and will run on tx1.
-          case "$target" in
-            "arm-"*) board="tk1" ;;
-            *) board="tx1" ;;
-          esac
-
-          cat > params <<EOF
-          toolchain_url=$release_url/$target/gcc-*-x86_64_$target.tar.xz
-          target_list=$board
-          extension=$extension
-          EOF
-          echo "$benchmark_params" >> params
-      - trigger-builds:
-          - project: 'tcwg-benchmark'
-            property-file: params
-            block: true
diff --git a/tcwg-benchmark-results.yaml b/tcwg-benchmark-results.yaml
deleted file mode 100644
index c4999b67da..0000000000
--- a/tcwg-benchmark-results.yaml
+++ /dev/null
@@ -1,74 +0,0 @@
-- job:
-    name: tcwg-benchmark-results
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: results_id
-            default: <hw_type>/tcwg-benchmark-<build_num>
-            description: 'ID for benchmarking results; results should be in dev-01.tcwglab:/home/tcwg-benchmark/results-$results_id/'
-        - string:
-            name: results_ref
-            default: <hw_type>/tcwg-benchmark-<build_num>
-            description: 'ID for benchmarking reference results; should be in dev-01.tcwglab:/home/tcwg-benchmark/results-$results_ref/'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - string:
-            name: bmk_branch
-            default: master
-            description: 'Bmk-scripts branch to use'
-    disabled: false
-    node: tcwg-bmk-coordinator
-    concurrent: true
-    display-name: 'TCWG ZZZ Benchmark Results'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/bmk-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${bmk_branch}
-            basedir: bmk-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          set -ex
-          exec ./tcwg-benchmark-results.sh
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            latest-only: false
diff --git a/tcwg-benchmark-sfo17.yaml b/tcwg-benchmark-sfo17.yaml
deleted file mode 100644
index f129e49408..0000000000
--- a/tcwg-benchmark-sfo17.yaml
+++ /dev/null
@@ -1,123 +0,0 @@
-- job:
-    name: tcwg-benchmark-sfo17
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: toolchain_list
-            default: 'gnu-aarch64 gnu-armv7 gnu-armv8 llvm-aarch64 llvm-armv7'
-            description: 'List of toolchains: gnu-aarch64 gnu-armv7 gnu-armv8 llvm-aarch64 llvm-armv7'
-        - string:
-            name: extension_list
-            default: 'O2g O3g'
-            description: 'List of extensions: O2g O3g O2 O3'
-        - string:
-            name: cflags
-            default: ''
-            description: 'Compiler flags'
-        - string:
-            name: benchmarks
-            default: 'fast'
-            description: 'List of benchmarks: fast nofortran all'
-        - text:
-            name: benchmark_params
-            default: |
-              testmode=benchmark
-              run_profile=parallel3x1
-              target_list=tx1
-              reboot=true
-              scripts_branch=refs/changes/63/21463/8
-              bmk_branch=master
-            description: 'Benchmark parameters, see tcwg-benchmark job'
-    disabled: false
-    node: tcwg-bmk-coordinator
-    concurrent: true
-    display-name: 'TCWG SFO17 Benchmark'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-coordinator
-        - axis:
-            type: dynamic
-            name: toolchain
-            values:
-                - toolchain_list
-        - axis:
-            type: dynamic
-            name: extension
-            values:
-                - extension_list
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          set -ex
-
-          base_url="https://dev-01.tcwglab/~maxim.kuvyrkov/sfo17"
-
-          case "$toolchain" in
-            "gnu-aarch64") tarball=gcc-linaro-7.1.1-2017.08-x86_64_aarch64-linux-gnu.tar.xz ;;
-            "gnu-armv7") tarball=gcc-linaro-7.1.1-2017.08-x86_64_arm-linux-gnueabihf.tar.xz ;;
-            "gnu-armv8") tarball=gcc-linaro-7.1.1-2017.08-x86_64_armv8l-linux-gnueabihf.tar.xz ;;
-            "llvm-aarch64") tarball=clang+llvm-5.0.0-aarch64-linux-gnu.tar.xz ;;
-            "llvm-armv7") tarball=clang+llvm-5.0.0-armv7a-linux-gnueabihf.tar.xz ;;
-            *) exit 1 ;;
-          esac
-
-          case "$toolchain" in
-            "gnu"*)
-              sysroot="tarball"
-              builder="tcwg-x86_64-build"
-              ;;
-            "llvm-aarch64")
-              sysroot="$base_url/sysroot-glibc-linaro-2.25-2017.08-aarch64-linux-gnu.tar.xz"
-              builder="tcwg-apm_64-build"
-              ;;
-            "llvm-armv7")
-              sysroot="$base_url/sysroot-glibc-linaro-2.25-2017.08-arm-linux-gnueabihf.tar.xz"
-              builder="tcwg-apm_32-build"
-              ;;
-            *) exit 1 ;;
-          esac
-
-          case "$toolchain:$benchmarks" in
-            *:"nofortran"|"llvm"*:"all") bench_list="400.perlbench 401.bzip2 403.gcc 429.mcf 445.gobmk 456.hmmer 458.sjeng 462.libquantum 464.h264ref 471.omnetpp 473.astar 483.xalancbmk 433.milc 444.namd 447.dealII 450.soplex 453.povray 470.lbm 482.sphinx3" ;;
-            *:"fast") bench_list="456.hmmer 483.xalancbmk 453.povray" ;;
-            *) bench_list="$benchmarks"
-          esac
-
-          cat > params <<EOF
-          toolchain_url=$base_url/$tarball
-          bench_list=$bench_list
-          sysroot=$sysroot
-          builder=$builder
-          extension=$extension
-          cflags=$cflags
-          displaytag=sfo17-$benchmarks-$toolchain-$extension$cflags
-          EOF
-          echo "$benchmark_params" >> params
-      - trigger-builds:
-          - project: 'tcwg-benchmark'
-            property-file: params
-            block: true
diff --git a/tcwg-benchmark.yaml b/tcwg-benchmark.yaml
index 3e02830669..24deb8edb7 100644
--- a/tcwg-benchmark.yaml
+++ b/tcwg-benchmark.yaml
@@ -1,34 +1,106 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-benchmark.yaml.in and tcwg-benchmark/tcwg-benchmark.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+          # Allow users in tcwg-benchmark group (e.g., tcwg-buildslave)
+          # start and stop builds.  We use this in tcwg_bmk* CI loops.
+          tcwg-benchmark:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
 - job:
     name: tcwg-benchmark
-    project-type: matrix
+    project-type: freestyle
     defaults: global
     properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
+      - default-properties
     parameters:
+        - choice:
+            name: bmk_hw
+            choices:
+              - apm
+              - sq
+              - stm32
+              - tk1
+              - tx1
+              - fx
+              - qc
+            description: 'Hardware to use for benchmarking'
         - string:
             name: toolchain_url
             default: ''
-            description: 'Toolchain URL. Either http[s]://xxx.tar.xz, rsync://machine:/path/bin/target-triplet-, or ssh://machine/path/compiler'
+            description: |
+              Toolchain URL. Either http[s]://xxx.tar.xz,
+              rsync://machine:/path/bin/target-triplet-, or
+              ssh://machine/path/compiler.  You need to specify 'builder'
+              setting below when using non-ssh:// toolchain_urls.
+        - choice:
+            name: toolchain_type
+            choices:
+              - auto
+              - gnu
+              - llvm
         - string:
             name: sysroot
             default: 'tarball'
             description: 'Rsync-friendly path to the sysroot to run against; use libs from toolchain_url tarball/rsync if "tarball"; use system libs if empty'
         - string:
            name: bench_list
-           default: 'bzip2'
-           description: 'List of benchmarks to run (from spec2k6). Use "all" to run all of them.'
+           default: 'all'
+           description: 'List of benchmarks to run. Can be for ex : all (i.e. spec2006), spec2017_speed, or coremark'
         - string:
             name: cflags
             default: ''
             description: 'CFLAGS to use'
+        - string:
+            name: ldflags
+            default: 'default'
+            description: 'LDFLAGS to use'
         - choice:
             name: extension
             choices:
@@ -39,24 +111,22 @@
               - O3g
               - Ofast
               - Os
-            default: 'O2g'
             description: 'Compilation profile'
         - choice:
             name: testmode
             choices:
-              - build
               - verify
+              - build
               - benchmark
-            default: 'verify'
             description: 'Whether to just build or run full benchmarks'
         - string:
             name: iterations
             default: '1'
             description: 'Number of benchmark iterations'
         - string:
-            name: results_id
-            default: <hw_type>/tcwg-benchmark-<build_num>
-            description: 'ID for benchmarking results; results will appear in dev-01.tcwglab:/home/tcwg-benchmark/results-$results_id/'
+            name: results_dest
+            default: 'bkp-01.tcwglab:/home/tcwg-benchmark/results-@hw_tag@/tcwg-benchmark/@build_num@'
+            description: 'Destination where to push results..'
         - bool:
             name: forceinstall
             default: 'false'
@@ -64,31 +134,54 @@
         - choice:
             name: run_profile
             choices:
-              - parallel3x3
-              - parallel3x1
-              - serial1
-            default: 'parallel3x1'
-            description: 'Benchmark profile to use: parallel3x3 runs on 3 boards and 3 CPUs in parallel; parallel3x1 runs on 3 boards on 1 CPU in parallel; serial1 runs on a single board on 1 CPU.'
-        - string:
-            name: target_list
-            default: 'tx1'
-            description: 'List of targets -- tk1 tx1'
+              - parallel_0x4
+              - parallel
+              - serial
+            description: |
+              parallel_0x4 - Build benchmark in parallel (all CPU cores), Run benchmark in parallel (max 4)
+              parallel - Run benchmarks in parallel on all CPU cores.
+              serial - Run benchmarks serially on a single CPU core.
+        - choice:
+            name: board_selection
+            choices:
+              - balance
+              - one_board
+              - all_boards
+            description: |
+              balance - Distribute benchmarks across all available boards.
+              1board - Run all benchmarks on a single board.
+              allboards - Run all benchmarks on all boards (e.g., to check that all boards give the same performance result).
+        - choice:
+            name: image_arch
+            choices:
+              - arm64
+              - armhf
+              - amd64
+            description: 'Docker image architecture'
         - bool:
             name: reboot
             default: 'false'
             description: 'Reboot the board before building and running the benchmarks.'
         - string:
             name: displaytag
-            default: ''
+            default: '$bmk_hw'
             description: 'Tag to display in the Jenkins console, so that the build name is more meaningful'
         - bool:
             name: ignore_errors
             default: 'false'
             description: 'Ignore build errors as much as possible'
         - string:
+            name: clean_older_than
+            default: '60'
+            description: 'Delete previous results older than X days (on board)'
+        - string:
             name: builder
-            default: 'tcwg-x86_64-build'
-            description: 'Builder -- jenkins label or node'
+            default: 'bmk_board'
+            description: |
+              Jenkins label or node to procure a builder from and the docker
+              image distro tag to use for the build environment.
+              This is needed only for non-ssh:// toolchain_urls.
+              Special value of bmk_board uses benchmarking board as the builder
         - string:
             name: scripts_branch
             default: master
@@ -97,70 +190,132 @@
             name: bmk_branch
             default: master
             description: 'Bmk-scripts branch to use'
+        - node:
+            name: bmk_node
+            default-slaves:
+              - tcwg-bmk-bkp-01
+            allowed-slaves:
+              - tcwg-bmk-bkp-01
+              - tcwg-bmk-apm
+              - tcwg-bmk-sq
+              - tcwg-bmk-stm32
+              - tcwg-bmk-tk1
+              - tcwg-bmk-tx1
+              - tcwg-bmk-fx
+              - tcwg-bmk-qc
+            description: 'Bmk node; used internally, do not touch'
     disabled: false
-    node: tcwg-bmk-coordinator
-    child-workspace: $label
     concurrent: true
-    display-name: 'TCWG BBB Benchmark'
+    display-name: 'TCWG Benchmark'
+    workspace: workspace/tcwg-benchmark-${NODE_NAME}_$EXECUTOR_NUMBER
     scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/bmk-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - ${bmk_branch}
-            basedir: bmk-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            clean:
-                before: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-bmk-tk1-06
-                - tcwg-bmk-tk1-07
-                - tcwg-bmk-tk1-08
-                - tcwg-bmk-tx1-06
-                - tcwg-bmk-tx1-07
-                - tcwg-bmk-tx1-08
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        combination-filter: |
-            (target=="tk1" && label==~/tcwg-bmk-tk1-.*/) || (target=="tx1" && label==~/tcwg-bmk-tx1-.*/)
-        sequential: false
+      - jenkins-scripts
+      - bmk-scripts
     wrappers:
         - timeout:
-            timeout: 900
+            timeout: 1200
         - timestamps
         - ssh-agent-credentials:
             users:
                 - 'tcwg-benchmark'
         - build-name:
-            name: '#${BUILD_NUMBER}-${displaytag}'
+            name: '#$BUILD_NUMBER-$displaytag ($bmk_hw:$image_arch)'
     builders:
-        - shell: |
+      - shell:
+          command: |
             #!/bin/bash
 
-            set -ex
-            exec ./tcwg-benchmark.sh
+            set -euf -o pipefail
+            set -x
+
+            rm -rf artifacts
+            mkdir -p artifacts/jenkins
+
+            has_perf_logs=yes
+            case "$bmk_hw:$image_arch" in
+              apm:arm64) hw_tag=apm_64 ;;
+              apm:armhf) hw_tag=apm_32 ;;
+              sq:arm64) hw_tag=sq_64 ;;
+              sq:armhf) hw_tag=sq_32 ;;
+              stm32:amd64) hw_tag=stm32; has_perf_logs=no ;;
+              tk1:armhf) hw_tag=tk1_32 ;;
+              tx1:arm64) hw_tag=tx1_64 ;;
+              tx1:armhf) hw_tag=tx1_32 ;;
+              fx:arm64) hw_tag=fx_64 ;;
+              fx:armhf) hw_tag=fx_32 ;;
+              qc:arm64) hw_tag=qc_64 ;;
+              qc:armhf) hw_tag=qc_32 ;;
+              *)
+                echo "ERROR: Unsupported bmk_hw:image_arch: $bmk_hw:$image_arch"
+                exit 1
+                ;;
+            esac
+
+            results_dest=$(echo "$results_dest" | sed \
+                           -e "s/@build_num@/$BUILD_NUMBER/g" \
+                           -e "s/@hw_tag@/$hw_tag/g")
+
+            idle_boards="0"
+            total_boards="0"
+            for lock in $(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock); do
+                (
+                  flock -en -E 124 9
+                ) 9<$lock &
+                res=0 && wait $! || res=$?
+                total_boards=$(($total_boards + 1))
+                if [ $res = 124 ]; then
+                  continue
+                fi
+                idle_boards=$(($idle_boards + 1))
+            done
+
+            n_boards=$((($idle_boards + $total_boards) / 2))
+            # Distribute benchmarks among idle boards.
+            if [ $n_boards -lt 1 ]; then
+              n_boards="1"
+            fi
+
+            count=1
+            while read -a bmks; do
+              cat > artifacts/bmk-$count-parameters <<EOF
+            bench_list=${bmks[@]}
+            displaytag=$BUILD_NUMBER+$count-$displaytag
+            bmk_node=tcwg-bmk-$bmk_hw
+            results_dest=$results_dest
+            EOF
+              count=$(($count+1))
+            done < <(./bmk-scripts/break-up-bmks.sh \
+                       --bench_list "$bench_list" \
+                       --bmk_hw "$bmk_hw" \
+                       --n_boards "$n_boards" \
+                       --run_profile "$run_profile" \
+                       --board_selection "$board_selection")
+            cat > artifacts/bmk-info <<EOF
+            results_dest=$results_dest
+            hw_tag=$hw_tag
+            has_perf_logs=$has_perf_logs
+            EOF
+      - trigger-builds:
+          - project: tcwg-benchmark_backend
+            block: true
+            current-parameters: true
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/bmk-*-parameters
     publishers:
-        - email-ext:
-            always: true
-            send-to:
-                - requester
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+          allow-empty: true
+      - email-ext:
+          recipients: |
+            ${FILE,path="artifacts/jenkins/mail-recipients.txt"}
+          content-type: text
+          body: |
+            ${FILE,path="artifacts/jenkins/mail-body.txt"}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+# checksum: be30f23cd79ae8719751bd1bb3565b7a
diff --git a/tcwg-benchmark.yaml.in b/tcwg-benchmark.yaml.in
new file mode 100644
index 0000000000..deddf78fd0
--- /dev/null
+++ b/tcwg-benchmark.yaml.in
@@ -0,0 +1,381 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-benchmark#{BACKEND}
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - choice:
+            name: bmk_hw
+            choices:
+              - apm
+              - sq
+              - stm32
+              - tk1
+              - tx1
+              - fx
+              - qc
+            description: 'Hardware to use for benchmarking'
+        - string:
+            name: toolchain_url
+            default: ''
+            description: |
+              Toolchain URL. Either http[s]://xxx.tar.xz,
+              rsync://machine:/path/bin/target-triplet-, or
+              ssh://machine/path/compiler.  You need to specify 'builder'
+              setting below when using non-ssh:// toolchain_urls.
+        - choice:
+            name: toolchain_type
+            choices:
+              - auto
+              - gnu
+              - llvm
+        - string:
+            name: sysroot
+            default: 'tarball'
+            description: 'Rsync-friendly path to the sysroot to run against; use libs from toolchain_url tarball/rsync if "tarball"; use system libs if empty'
+        - string:
+           name: bench_list
+           default: 'all'
+           description: 'List of benchmarks to run. Can be for ex : all (i.e. spec2006), spec2017_speed, or coremark'
+        - string:
+            name: cflags
+            default: ''
+            description: 'CFLAGS to use'
+        - string:
+            name: ldflags
+            default: 'default'
+            description: 'LDFLAGS to use'
+        - choice:
+            name: extension
+            choices:
+              - default
+              - O2
+              - O3
+              - O2g
+              - O3g
+              - Ofast
+              - Os
+            description: 'Compilation profile'
+        - choice:
+            name: testmode
+            choices:
+              - verify
+              - build
+              - benchmark
+            description: 'Whether to just build or run full benchmarks'
+        - string:
+            name: iterations
+            default: '1'
+            description: 'Number of benchmark iterations'
+        - string:
+            name: results_dest
+            default: 'bkp-01.tcwglab:/home/tcwg-benchmark/results-@hw_tag@/tcwg-benchmark/@build_num@'
+            description: 'Destination where to push results..'
+        - bool:
+            name: forceinstall
+            default: 'false'
+            description: 'Force clean re-install of benchmark sources'
+        - choice:
+            name: run_profile
+            choices:
+              - parallel_0x4
+              - parallel
+              - serial
+            description: |
+              parallel_0x4 - Build benchmark in parallel (all CPU cores), Run benchmark in parallel (max 4)
+              parallel - Run benchmarks in parallel on all CPU cores.
+              serial - Run benchmarks serially on a single CPU core.
+        - choice:
+            name: board_selection
+            choices:
+              - balance
+              - one_board
+              - all_boards
+            description: |
+              balance - Distribute benchmarks across all available boards.
+              1board - Run all benchmarks on a single board.
+              allboards - Run all benchmarks on all boards (e.g., to check that all boards give the same performance result).
+        - choice:
+            name: image_arch
+            choices:
+              - arm64
+              - armhf
+              - amd64
+            description: 'Docker image architecture'
+        - bool:
+            name: reboot
+            default: 'false'
+            description: 'Reboot the board before building and running the benchmarks.'
+        - string:
+            name: displaytag
+            default: '$bmk_hw'
+            description: 'Tag to display in the Jenkins console, so that the build name is more meaningful'
+        - bool:
+            name: ignore_errors
+            default: 'false'
+            description: 'Ignore build errors as much as possible'
+        - string:
+            name: clean_older_than
+            default: '60'
+            description: 'Delete previous results older than X days (on board)'
+        - string:
+            name: builder
+            default: 'bmk_board'
+            description: |
+              Jenkins label or node to procure a builder from and the docker
+              image distro tag to use for the build environment.
+              This is needed only for non-ssh:// toolchain_urls.
+              Special value of bmk_board uses benchmarking board as the builder
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Jenkins-scripts branch to use'
+        - string:
+            name: bmk_branch
+            default: master
+            description: 'Bmk-scripts branch to use'
+        - node:
+            name: bmk_node
+            default-slaves:
+              - tcwg-bmk-bkp-01
+            allowed-slaves:
+              - tcwg-bmk-bkp-01
+              - tcwg-bmk-apm
+              - tcwg-bmk-sq
+              - tcwg-bmk-stm32
+              - tcwg-bmk-tk1
+              - tcwg-bmk-tx1
+              - tcwg-bmk-fx
+              - tcwg-bmk-qc
+            description: 'Bmk node; used internally, do not touch'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG Benchmark#{BACKEND}'
+    workspace: workspace/tcwg-benchmark-${NODE_NAME}_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+        - timeout:
+            timeout: 1200
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'tcwg-benchmark'
+        - build-name:
+            name: '#$BUILD_NUMBER-$displaytag ($bmk_hw:$image_arch)'
+    builders:
+#if !BACKEND__backend
+      - shell:
+          command: |
+            #!/bin/bash
+
+            set -euf -o pipefail
+            set -x
+
+            rm -rf artifacts
+            mkdir -p artifacts/jenkins
+
+            has_perf_logs=yes
+            case "$bmk_hw:$image_arch" in
+              apm:arm64) hw_tag=apm_64 ;;
+              apm:armhf) hw_tag=apm_32 ;;
+              sq:arm64) hw_tag=sq_64 ;;
+              sq:armhf) hw_tag=sq_32 ;;
+              stm32:amd64) hw_tag=stm32; has_perf_logs=no ;;
+              tk1:armhf) hw_tag=tk1_32 ;;
+              tx1:arm64) hw_tag=tx1_64 ;;
+              tx1:armhf) hw_tag=tx1_32 ;;
+              fx:arm64) hw_tag=fx_64 ;;
+              fx:armhf) hw_tag=fx_32 ;;
+              qc:arm64) hw_tag=qc_64 ;;
+              qc:armhf) hw_tag=qc_32 ;;
+              *)
+                echo "ERROR: Unsupported bmk_hw:image_arch: $bmk_hw:$image_arch"
+                exit 1
+                ;;
+            esac
+
+            results_dest=$(echo "$results_dest" | sed \
+                           -e "s/@build_num@/$BUILD_NUMBER/g" \
+                           -e "s/@hw_tag@/$hw_tag/g")
+
+            idle_boards="0"
+            total_boards="0"
+            for lock in $(set +f; ls -tr $HOME/boards/tcwg-bmk-$bmk_hw-*.lock); do
+                (
+                  flock -en -E 124 9
+                ) 9<$lock &
+                res=0 && wait $! || res=$?
+                total_boards=$(($total_boards + 1))
+                if [ $res = 124 ]; then
+                  continue
+                fi
+                idle_boards=$(($idle_boards + 1))
+            done
+
+            n_boards=$((($idle_boards + $total_boards) / 2))
+            # Distribute benchmarks among idle boards.
+            if [ $n_boards -lt 1 ]; then
+              n_boards="1"
+            fi
+
+            count=1
+            while read -a bmks; do
+              cat > artifacts/bmk-$count-parameters <<EOF
+            bench_list=${bmks[@]}
+            displaytag=$BUILD_NUMBER+$count-$displaytag
+            bmk_node=tcwg-bmk-$bmk_hw
+            results_dest=$results_dest
+            EOF
+              count=$(($count+1))
+            done < <(./bmk-scripts/break-up-bmks.sh \
+                       --bench_list "$bench_list" \
+                       --bmk_hw "$bmk_hw" \
+                       --n_boards "$n_boards" \
+                       --run_profile "$run_profile" \
+                       --board_selection "$board_selection")
+            cat > artifacts/bmk-info <<EOF
+            results_dest=$results_dest
+            hw_tag=$hw_tag
+            has_perf_logs=$has_perf_logs
+            EOF
+      - trigger-builds:
+          - project: tcwg-benchmark_backend
+            block: true
+            current-parameters: true
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/bmk-*-parameters
+#else
+      - shell:
+          command: |
+            #!/bin/bash
+
+            set -ef -o pipefail
+            set -x
+
+            rm -rf artifacts
+            mkdir -p artifacts/jenkins
+
+            case "$bmk_hw:$image_arch" in
+              apm:arm64) hw_tag=apm_64 ;;
+              apm:armhf) hw_tag=apm_32 ;;
+              sq:arm64) hw_tag=sq_64 ;;
+              sq:armhf) hw_tag=sq_32 ;;
+              stm32:amd64) hw_tag=stm32;;
+              tk1:armhf) hw_tag=tk1_32 ;;
+              tx1:arm64) hw_tag=tx1_64 ;;
+              tx1:armhf) hw_tag=tx1_32 ;;
+              fx:arm64) hw_tag=fx_64 ;;
+              fx:armhf) hw_tag=fx_32 ;;
+              qc:arm64) hw_tag=qc_64 ;;
+              qc:armhf) hw_tag=qc_32 ;;
+              *)
+                echo "ERROR: Unsupported bmk_hw:image_arch: $bmk_hw:$image_arch"
+                exit 1
+                ;;
+            esac
+
+            # Retry benchmarking once, just in case we selected a board that
+            # recently went offline.
+            bmk_retry=true
+
+            declare -gA bad_boards
+
+            while true; do
+              good_boards=()
+              for lock in $(set +f; ls -tr $HOME/boards/$NODE_NAME-*.lock); do
+                if [ x"${bad_boards[$lock]-unset}" = x"unset" ]; then
+                  good_boards+=("$lock")
+                fi
+              done
+
+              if [ ${#good_boards[@]} = 0 ]; then
+                echo "Ran out of boards to try -- giving up." >> artifacts/jenkins/mail-body.txt
+                exit 125
+              fi
+
+              for lock in "${good_boards[@]}"; do
+                bmk_start=$(date +%s)
+                (
+                  flock -en -E 124 9
+                  touch $lock
+                  boardname=$(cat <&9)
+                  export boardname
+                  echo "#$BUILD_NUMBER-$displaytag-$boardname" > artifacts/jenkins/build-name
+                  exec ./jenkins-scripts/tcwg-benchmark.sh \
+                    --boardname "$boardname" \
+                    --toolchain_url "$toolchain_url" \
+                    --toolchain_type "$toolchain_type" \
+                    --sysroot "$sysroot" \
+                    --bench_list "$bench_list" \
+                    --cflags "$cflags" \
+                    --ldflags "$ldflags" \
+                    --extension "$extension" \
+                    --testmode "$testmode" \
+                    --iterations "$iterations" \
+                    --results_dest "$results_dest" \
+                    --forceinstall "$forceinstall" \
+                    --run_profile "$run_profile" \
+                    --image_arch "$image_arch" \
+                    --hw_tag "$hw_tag" \
+                    --reboot "$reboot" \
+                    --ignore_errors "$ignore_errors" \
+                    --clean_older_than "$clean_older_than" \
+                    --builder "$builder" \
+                    --WORKSPACE "$WORKSPACE"
+                ) 9<$lock &
+                res=0 && wait $! || res=$?
+                if [ $res != 0 ]; then
+                  if [ $res = 124 ]; then
+                    # Try to lock next board.
+                    continue
+                  elif $bmk_retry; then
+                    bad_boards[$lock]="1"
+                    bmk_retry=false
+                    if [ $res = 125 ]; then
+                      echo "Failed to prepare board $lock for benchmarking, retry with a different board." >> artifacts/jenkins/mail-body.txt
+                      continue
+                    elif [ $(($(date +%s) - $bmk_start)) -le 300 ]; then
+                      echo "Benchmarking on board $lock failed due to /something/ within 5 minutes -- give it another chance." >> artifacts/jenkins/mail-body.txt
+                      continue
+                    fi
+                  fi
+                  echo "Benchmarking on board $lock failed -- giving up." >> artifacts/jenkins/mail-body.txt
+                fi
+                if [ -f artifacts/jenkins/mail-body.txt ]; then
+                  if [ $res = 0 ]; then
+                    echo "Benchmarking succeeded" >> artifacts/jenkins/mail-body.txt
+                  fi
+                  echo "$BUILD_URL" >> artifacts/jenkins/mail-body.txt
+                  echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" > artifacts/jenkins/mail-recipients.txt
+                fi
+                exit $res
+              done
+              sleep 30
+            done
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+#endif
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+          allow-empty: true
+      - email-ext:
+          recipients: |
+            ${FILE,path="artifacts/jenkins/mail-recipients.txt"}
+          content-type: text
+          body: |
+            ${FILE,path="artifacts/jenkins/mail-body.txt"}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
diff --git a/tcwg-benchmark/tcwg-benchmark.def b/tcwg-benchmark/tcwg-benchmark.def
new file mode 100644
index 0000000000..5121088906
--- /dev/null
+++ b/tcwg-benchmark/tcwg-benchmark.def
@@ -0,0 +1,3 @@
+-v BACKEND=
+-v TCWG=benchmark
+-v SCM=bmk_scripts
diff --git a/tcwg-benchmark/tcwg-benchmark_backend.def b/tcwg-benchmark/tcwg-benchmark_backend.def
new file mode 100644
index 0000000000..aed3543578
--- /dev/null
+++ b/tcwg-benchmark/tcwg-benchmark_backend.def
@@ -0,0 +1,3 @@
+-v BACKEND=_backend
+-v TCWG=benchmark
+-v SCM=bmk_scripts
diff --git a/tcwg-benchmark_backend.yaml b/tcwg-benchmark_backend.yaml
new file mode 100644
index 0000000000..884b79eb34
--- /dev/null
+++ b/tcwg-benchmark_backend.yaml
@@ -0,0 +1,351 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-benchmark.yaml.in and tcwg-benchmark/tcwg-benchmark_backend.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+          # Allow users in tcwg-benchmark group (e.g., tcwg-buildslave)
+          # start and stop builds.  We use this in tcwg_bmk* CI loops.
+          tcwg-benchmark:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-benchmark_backend
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - choice:
+            name: bmk_hw
+            choices:
+              - apm
+              - sq
+              - stm32
+              - tk1
+              - tx1
+              - fx
+              - qc
+            description: 'Hardware to use for benchmarking'
+        - string:
+            name: toolchain_url
+            default: ''
+            description: |
+              Toolchain URL. Either http[s]://xxx.tar.xz,
+              rsync://machine:/path/bin/target-triplet-, or
+              ssh://machine/path/compiler.  You need to specify 'builder'
+              setting below when using non-ssh:// toolchain_urls.
+        - choice:
+            name: toolchain_type
+            choices:
+              - auto
+              - gnu
+              - llvm
+        - string:
+            name: sysroot
+            default: 'tarball'
+            description: 'Rsync-friendly path to the sysroot to run against; use libs from toolchain_url tarball/rsync if "tarball"; use system libs if empty'
+        - string:
+           name: bench_list
+           default: 'all'
+           description: 'List of benchmarks to run. Can be for ex : all (i.e. spec2006), spec2017_speed, or coremark'
+        - string:
+            name: cflags
+            default: ''
+            description: 'CFLAGS to use'
+        - string:
+            name: ldflags
+            default: 'default'
+            description: 'LDFLAGS to use'
+        - choice:
+            name: extension
+            choices:
+              - default
+              - O2
+              - O3
+              - O2g
+              - O3g
+              - Ofast
+              - Os
+            description: 'Compilation profile'
+        - choice:
+            name: testmode
+            choices:
+              - verify
+              - build
+              - benchmark
+            description: 'Whether to just build or run full benchmarks'
+        - string:
+            name: iterations
+            default: '1'
+            description: 'Number of benchmark iterations'
+        - string:
+            name: results_dest
+            default: 'bkp-01.tcwglab:/home/tcwg-benchmark/results-@hw_tag@/tcwg-benchmark/@build_num@'
+            description: 'Destination where to push results..'
+        - bool:
+            name: forceinstall
+            default: 'false'
+            description: 'Force clean re-install of benchmark sources'
+        - choice:
+            name: run_profile
+            choices:
+              - parallel_0x4
+              - parallel
+              - serial
+            description: |
+              parallel_0x4 - Build benchmark in parallel (all CPU cores), Run benchmark in parallel (max 4)
+              parallel - Run benchmarks in parallel on all CPU cores.
+              serial - Run benchmarks serially on a single CPU core.
+        - choice:
+            name: board_selection
+            choices:
+              - balance
+              - one_board
+              - all_boards
+            description: |
+              balance - Distribute benchmarks across all available boards.
+              1board - Run all benchmarks on a single board.
+              allboards - Run all benchmarks on all boards (e.g., to check that all boards give the same performance result).
+        - choice:
+            name: image_arch
+            choices:
+              - arm64
+              - armhf
+              - amd64
+            description: 'Docker image architecture'
+        - bool:
+            name: reboot
+            default: 'false'
+            description: 'Reboot the board before building and running the benchmarks.'
+        - string:
+            name: displaytag
+            default: '$bmk_hw'
+            description: 'Tag to display in the Jenkins console, so that the build name is more meaningful'
+        - bool:
+            name: ignore_errors
+            default: 'false'
+            description: 'Ignore build errors as much as possible'
+        - string:
+            name: clean_older_than
+            default: '60'
+            description: 'Delete previous results older than X days (on board)'
+        - string:
+            name: builder
+            default: 'bmk_board'
+            description: |
+              Jenkins label or node to procure a builder from and the docker
+              image distro tag to use for the build environment.
+              This is needed only for non-ssh:// toolchain_urls.
+              Special value of bmk_board uses benchmarking board as the builder
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Jenkins-scripts branch to use'
+        - string:
+            name: bmk_branch
+            default: master
+            description: 'Bmk-scripts branch to use'
+        - node:
+            name: bmk_node
+            default-slaves:
+              - tcwg-bmk-bkp-01
+            allowed-slaves:
+              - tcwg-bmk-bkp-01
+              - tcwg-bmk-apm
+              - tcwg-bmk-sq
+              - tcwg-bmk-stm32
+              - tcwg-bmk-tk1
+              - tcwg-bmk-tx1
+              - tcwg-bmk-fx
+              - tcwg-bmk-qc
+            description: 'Bmk node; used internally, do not touch'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG Benchmark_backend'
+    workspace: workspace/tcwg-benchmark-${NODE_NAME}_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+        - timeout:
+            timeout: 1200
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'tcwg-benchmark'
+        - build-name:
+            name: '#$BUILD_NUMBER-$displaytag ($bmk_hw:$image_arch)'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+
+            set -ef -o pipefail
+            set -x
+
+            rm -rf artifacts
+            mkdir -p artifacts/jenkins
+
+            case "$bmk_hw:$image_arch" in
+              apm:arm64) hw_tag=apm_64 ;;
+              apm:armhf) hw_tag=apm_32 ;;
+              sq:arm64) hw_tag=sq_64 ;;
+              sq:armhf) hw_tag=sq_32 ;;
+              stm32:amd64) hw_tag=stm32;;
+              tk1:armhf) hw_tag=tk1_32 ;;
+              tx1:arm64) hw_tag=tx1_64 ;;
+              tx1:armhf) hw_tag=tx1_32 ;;
+              fx:arm64) hw_tag=fx_64 ;;
+              fx:armhf) hw_tag=fx_32 ;;
+              qc:arm64) hw_tag=qc_64 ;;
+              qc:armhf) hw_tag=qc_32 ;;
+              *)
+                echo "ERROR: Unsupported bmk_hw:image_arch: $bmk_hw:$image_arch"
+                exit 1
+                ;;
+            esac
+
+            # Retry benchmarking once, just in case we selected a board that
+            # recently went offline.
+            bmk_retry=true
+
+            declare -gA bad_boards
+
+            while true; do
+              good_boards=()
+              for lock in $(set +f; ls -tr $HOME/boards/$NODE_NAME-*.lock); do
+                if [ x"${bad_boards[$lock]-unset}" = x"unset" ]; then
+                  good_boards+=("$lock")
+                fi
+              done
+
+              if [ ${#good_boards[@]} = 0 ]; then
+                echo "Ran out of boards to try -- giving up." >> artifacts/jenkins/mail-body.txt
+                exit 125
+              fi
+
+              for lock in "${good_boards[@]}"; do
+                bmk_start=$(date +%s)
+                (
+                  flock -en -E 124 9
+                  touch $lock
+                  boardname=$(cat <&9)
+                  export boardname
+                  echo "#$BUILD_NUMBER-$displaytag-$boardname" > artifacts/jenkins/build-name
+                  exec ./jenkins-scripts/tcwg-benchmark.sh \
+                    --boardname "$boardname" \
+                    --toolchain_url "$toolchain_url" \
+                    --toolchain_type "$toolchain_type" \
+                    --sysroot "$sysroot" \
+                    --bench_list "$bench_list" \
+                    --cflags "$cflags" \
+                    --ldflags "$ldflags" \
+                    --extension "$extension" \
+                    --testmode "$testmode" \
+                    --iterations "$iterations" \
+                    --results_dest "$results_dest" \
+                    --forceinstall "$forceinstall" \
+                    --run_profile "$run_profile" \
+                    --image_arch "$image_arch" \
+                    --hw_tag "$hw_tag" \
+                    --reboot "$reboot" \
+                    --ignore_errors "$ignore_errors" \
+                    --clean_older_than "$clean_older_than" \
+                    --builder "$builder" \
+                    --WORKSPACE "$WORKSPACE"
+                ) 9<$lock &
+                res=0 && wait $! || res=$?
+                if [ $res != 0 ]; then
+                  if [ $res = 124 ]; then
+                    # Try to lock next board.
+                    continue
+                  elif $bmk_retry; then
+                    bad_boards[$lock]="1"
+                    bmk_retry=false
+                    if [ $res = 125 ]; then
+                      echo "Failed to prepare board $lock for benchmarking, retry with a different board." >> artifacts/jenkins/mail-body.txt
+                      continue
+                    elif [ $(($(date +%s) - $bmk_start)) -le 300 ]; then
+                      echo "Benchmarking on board $lock failed due to /something/ within 5 minutes -- give it another chance." >> artifacts/jenkins/mail-body.txt
+                      continue
+                    fi
+                  fi
+                  echo "Benchmarking on board $lock failed -- giving up." >> artifacts/jenkins/mail-body.txt
+                fi
+                if [ -f artifacts/jenkins/mail-body.txt ]; then
+                  if [ $res = 0 ]; then
+                    echo "Benchmarking succeeded" >> artifacts/jenkins/mail-body.txt
+                  fi
+                  echo "$BUILD_URL" >> artifacts/jenkins/mail-body.txt
+                  echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" > artifacts/jenkins/mail-recipients.txt
+                fi
+                exit $res
+              done
+              sleep 30
+            done
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+          allow-empty: true
+      - email-ext:
+          recipients: |
+            ${FILE,path="artifacts/jenkins/mail-recipients.txt"}
+          content-type: text
+          body: |
+            ${FILE,path="artifacts/jenkins/mail-body.txt"}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+# checksum: 75ab6b1ceb50b4dff1b334729f05f47e
diff --git a/tcwg-binutils.yaml b/tcwg-binutils.yaml
deleted file mode 100644
index aa0ee9baa8..0000000000
--- a/tcwg-binutils.yaml
+++ /dev/null
@@ -1,198 +0,0 @@
-- job:
-    name: tcwg-binutils
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: binutils_rev
-            default: 'refs/remotes/origin/master'
-            description: 'binutils revision to build'
-        - string:
-            name: target_list
-            default: 'aarch64-linux-gnu aarch64_be-linux-gnu aarch64-none-elf aarch64_be-none-elf arm-linux-gnueabi arm-linux-gnueabihf armv8l-linux-gnueabihf arm-netbsdelf arm-none-eabi arm-none-nacl arm-none-symbianelf arm-pe arm-vxworks arm-wince-pe armeb-linux-gnueabihf tcwg-x86_64-cam tcwg-x86_32-build tcwg-apm_64-build tcwg-apm_32-build tcwg-tk1_32-build'
-            description: 'List of targets to test'
-        - string:
-            name: bfd_list
-            default: '--enable-64-bit-bfd=no --enable-64-bit-bfd=yes'
-            description: 'Type of BFD to enable: --enable-64-bit-bfd=yes --enable-64-bit-bfd=no'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - bool:
-            name: dont_fail
-            default: false
-            description: 'Do not fail the build'
-        - string:
-            name: log_name
-            default: '${JOB_NAME}-${BUILD_NUMBER}/${builder_type}.$target.$bfd'
-            description: 'Logname directory on logserver'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:/home/tcwg-buildslave/logs
-            description: 'Log_Server'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG BBB Binutils'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/binutils-gdb.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            branches:
-                - ${binutils_rev}
-            skip-tag: true
-            shallow-clone: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/binutils-gdb.git
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-cam
-                - tcwg-x86_32-build
-                - tcwg-apm_64-build
-                - tcwg-apm_32-build
-                - tcwg-tk1_32-build
-        - axis:
-            type: dynamic
-            name: bfd
-            values:
-                - bfd_list
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        combination-filter: |
-            ((label==~/tcwg-x86_.*/) && ! (target==~/tcwg-.*/)) || (target==label)
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="binutils_rev"}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            rm -rf jenkins-scripts
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
-
-            ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh
-            . ./build-container.sh
-            BUILD_SHELL="build_container_exec bash"
-            $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a"
-
-            builder_type=$(print_type_for_label $label)
-
-            # Remove container on exit
-            trap "build_container_cleanup" EXIT HUP INT QUIT TRAP KILL PIPE TERM
-
-            case $target in
-                arm-wince-pe|arm-pe|arm-epoc-pe|arm-aout|arm-coff)
-                    lto=
-                    ;;
-                *)
-                    lto=--enable-lto
-                    ;;
-            esac
-
-            case $target in
-                tcwg-*) target_opt="" ;;
-                *) target_opt="--target $target" ;;
-            esac
-
-            rm -rf build-$target || true
-            mkdir -p build-$target
-            cd build-$target
-            result=0
-            jobs=$(nproc --all)
-            echo BUILD STARTED $(date)
-            echo WORKSPACE: ${WORKSPACE}
-
-            # Build our own version of dejagnu, using abe to try to
-            # avoid problems with the system's version
-            ${BUILD_SHELL} -c "git clone https://git.linaro.org/toolchain/abe.git"
-            ${BUILD_SHELL} -c "cd abe && ./configure --with-git-reference-dir=/home/tcwg-buildslave/snapshots-ref"
-            ${BUILD_SHELL} -c "cd abe && ./abe.sh --build dejagnu"
-            djpath=$(${BUILD_SHELL} -c "ls -d $PWD/abe/./builds/hosttools/*/bin")
-            [ -x $djpath/runtest ] || (echo "DejaGnu not built in the expected location: $djpath/runtest" && exit 1)
-
-            # If configure or build fails, the execution will stop
-            # because of 'set -e'. But for 'make check' we want to
-            # execute all the tests, and report if there were some
-            # errors.
-            ${BUILD_SHELL} -c "../configure $lto --enable-plugins --disable-gprof --disable-gdb --disable-sim --disable-libdecnumber --disable-readline --prefix=`pwd`/install $target_opt ${bfd}"
-            ${BUILD_SHELL} -c "make all -j$jobs"
-            ${BUILD_SHELL} -c "PATH=$djpath:$PATH make check -j$jobs -k" || result=1
-
-            sums=`find . -name "*.sum"`
-            set +x
-            echo '############################################'
-            echo 'See unexpected results below:'
-            echo '############################################'
-            [ x"$sums" != x ] && egrep '^FAIL:|^XPASS:' $sums || true
-            echo '############################################'
-            echo 'See ends of sumfiles below:'
-            echo '############################################'
-            [ x"$sums" != x ] && tail $sums
-
-            set -x
-            # Split $logserver into "server:path".
-            basedir="${log_server#*:}"
-            log_server="${log_server%:*}"
-            eval dir=${log_name}
-            ssh ${log_server} mkdir -p ${basedir}/${dir}
-            # gcc-compare-results handles only .xz files, so compress
-            # them before upload. Since the file are created inside a
-            # container, the uid/gid may differ from the host's and
-            # cause permission errors during compression. Copy them,
-            # so that xz can operate.
-            rm -rf artifacts
-            mkdir -p artifacts
-            cp ${sums} artifacts/
-            for sum in ${sums}
-            do
-                log=$(echo $sum | sed 's/.sum/.log/')
-                cp $log artifacts/
-            done
-            xz artifacts/*.sum artifacts/*.log
-            scp artifacts/*.sum.xz artifacts/*.log.xz ${log_server}:${basedir}/${dir}/
-
-            echo BUILD FINISHED $(date)
-
-            # Cleanup to save disk space
-            cd ..
-            du -sh build-$target
-            rm -rf build-$target || true
-
-            if $dont_fail; then
-                result="0"
-            fi
-            exit $result
-    publishers:
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org,yao.qi@linaro.org'
-            matrix-trigger: only-parent
diff --git a/tcwg-buildapp-christophe.yaml b/tcwg-buildapp-christophe.yaml
deleted file mode 100644
index 2d3f7c7443..0000000000
--- a/tcwg-buildapp-christophe.yaml
+++ /dev/null
@@ -1,144 +0,0 @@
-- job:
-    name: tcwg-buildapp-christophe
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: toolchain_url
-            default: ''
-            description: 'Toolchain URL'
-        - string:
-           name: app_list
-           default: 'linux+multi_v7'
-           description: 'List of apps to build (eg gcc, linux, linux+myconfig, linux+all ["linux" means allmodconfig, "linux+all" means build all defconfigs in sequence], spec2k spec2k6)'
-        - string:
-           name: linux_repo
-           default: 'torvalds/linux'
-           description: 'Linux kernel repo name, concatenated to git://git.kernel.org/pub/scm/linux/kernel/git (eg arnd/playground)'
-        - string:
-           name: linux_branch
-           default: 'master'
-           description: 'Linux kernel branch to build (eg to-build)'
-        - bool:
-            name: boot
-            default: 'false'
-            description: 'Attempt to boot supported Linux configurations via Lava'
-        - string:
-           name: target_list
-           default: 'arm-linux-gnueabihf aarch64-linux-gnu'
-           description: 'List of targets to use'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - string:
-            name: build_container_tag
-            default: 'trusty'
-            description: 'Distro to use on the builder with non-default container type: trusty, xenial.'
-        - string:
-            name: LAVA_SERVER
-            default: validation.linaro.org
-            description: 'Lava server to use'
-        - string:
-            name: ARTIFACTORIAL_URI
-            default: https://archive.validation.linaro.org
-            description: 'Artifactorial server to use'
-        - string:
-            name: ARTIFACTORIAL_DIR
-            default: /team/toolchain
-            description: 'Artifactorial dir to use'
-    disabled: false
-    node: tcwg-coordinator
-    child-workspace: $target/$app
-    concurrent: true
-    display-name: 'TCWG ZZZ BuildApp Christophe'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/tcwg-buildapp.git
-            wipe-workspace: true
-            skip-tag: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-build
-        - axis:
-            type: dynamic
-            name: app
-            values:
-                - app_list
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'tcwg-benchmark'
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TCWG_ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
-
-            . jenkins-scripts/jenkins-helpers.sh
-            host_arch=$(print_arch_for_label "${label}")
-
-            host=$(print_host_for_node $NODE_NAME)
-            bash -x ./jenkins-scripts/start-container-docker.sh --arch ${host_arch} --distro ${build_container_tag} --session-host ${host} > container.sh
-
-            # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port
-            . ./container.sh
-
-            trap "${CONTAINER_CLEANUP}" EXIT
-
-            env | egrep 'LAVA|ARTIFACTORIAL' > .env
-            echo 'LAVA_URI=https://${LAVA_USER}:${LAVA_TOKEN}@${LAVA_SERVER}/RPC2' >> .env
-
-            ${CONTAINER} "cd ${WORKSPACE} && ${WORKSPACE}/tcwg-buildapp.sh ${toolchain_url} ${app} ${target} ${boot} ${linux_repo} ${linux_branch}"
-
-    publishers:
-        - email:
-            recipients: 'christophe.lyon@linaro.org'
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org'
-            send-to:
-              requester
-              recipients
-            always: true
-            matrix-trigger: only-parent
diff --git a/tcwg-buildapp.yaml b/tcwg-buildapp.yaml
deleted file mode 100644
index c21e92cd1b..0000000000
--- a/tcwg-buildapp.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-- job:
-    name: tcwg-buildapp
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: toolchain_url
-            default: ''
-            description: 'Toolchain URL'
-        - string:
-           name: app_list
-           default: 'gcc linux linux+all spec2k spec2k6'
-           description: 'List of apps to build (eg gcc, linux, linux+myconfig, linux+all ["linux" means allmodconfig, "linux+" means defconfig, "linux+all" means build all defconfigs in sequence; multi_v7 can be used to boot on arm], spec2k spec2k6)'
-        - string:
-           name: linux_repo
-           default: 'torvalds/linux'
-           description: 'Linux kernel repo name, concatenated to git://git.kernel.org/pub/scm/linux/kernel/git (eg arnd/playground)'
-        - string:
-           name: linux_branch
-           default: 'master'
-           description: 'Linux kernel branch to build (eg to-build)'
-        - bool:
-            name: boot
-            default: 'false'
-            description: 'Attempt to boot supported Linux configurations via Lava'
-        - string:
-           name: target_list
-           default: 'arm-linux-gnueabihf aarch64-linux-gnu'
-           description: 'List of targets to use'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - string:
-            name: build_container_tag
-            default: 'trusty'
-            description: 'Distro to use on the builder with non-default container type: trusty, xenial.'
-        - string:
-            name: LAVA_SERVER
-            default: validation.linaro.org
-            description: 'Lava server to use'
-        - string:
-            name: ARTIFACTORIAL_URI
-            default: https://archive.validation.linaro.org
-            description: 'Artifactorial server to use'
-        - string:
-            name: ARTIFACTORIAL_DIR
-            default: /team/toolchain
-            description: 'Artifactorial dir to use'
-    disabled: false
-    node: tcwg-coordinator
-    child-workspace: $target/$app
-    concurrent: true
-    display-name: 'TCWG ZZZ BuildApp'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/tcwg-buildapp.git
-            wipe-workspace: true
-            skip-tag: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-build
-        - axis:
-            type: dynamic
-            name: app
-            values:
-                - app_list
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'tcwg-benchmark'
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_USER
-                variable: LAVA_USER
-        - credentials-binding:
-            - text:
-                credential-id: LAVA_TOKEN
-                variable: LAVA_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: TCWG_ARTIFACTORIAL_TOKEN
-                variable: ARTIFACTORIAL_TOKEN
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
-
-            . jenkins-scripts/jenkins-helpers.sh
-            host_arch=$(print_arch_for_label "${label}")
-
-            host=$(print_host_for_node $NODE_NAME)
-            bash -x ./jenkins-scripts/start-container-docker.sh --arch ${host_arch} --distro ${build_container_tag} --session-host ${host} > container.sh
-
-            # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port
-            . ./container.sh
-
-            trap "${CONTAINER_CLEANUP}" EXIT
-
-            env | egrep 'LAVA|ARTIFACTORIAL' > .env
-            echo 'LAVA_URI=https://${LAVA_USER}:${LAVA_TOKEN}@${LAVA_SERVER}/RPC2' >> .env
-
-            ${CONTAINER} "cd ${WORKSPACE} && ${WORKSPACE}/tcwg-buildapp.sh ${toolchain_url} ${app} ${target} ${boot} ${linux_repo} ${linux_branch}"
-    publishers:
-        - email:
-            recipients: 'christophe.lyon@linaro.org'
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org'
-            send-to:
-              requester
-              recipients
-            always: true
-            matrix-trigger: only-parent
diff --git a/tcwg-buildfarm-christophe.yaml b/tcwg-buildfarm-christophe.yaml
deleted file mode 100644
index 768599e712..0000000000
--- a/tcwg-buildfarm-christophe.yaml
+++ /dev/null
@@ -1,318 +0,0 @@
-- job:
-    name: tcwg-buildfarm-christophe
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/linaro_binutils-2_25-branch gcc=gcc.git~linaro/gcc-5-branch glibc=glibc.git~release/2.21/master'
-        - string:
-            name: host_x86_64_languages
-            default: 'default'
-            description: 'Languages to build for x86_64-hosted toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: host_aarchXX_languages
-            default: 'c,c++'
-            description: 'Languages to build for AArchXX-hosted toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: runtests
-            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
-            description: 'Run toolchain tests for these targets -- must be a subset of target_list'
-        - string:
-            name: send_results_to
-            default: ''
-            description: 'Email address to send test results to'
-        - bool:
-            name: try_bootstrap
-            default: 'true'
-            description: 'Attempt to bootstrap GCC for compatible host and target combinations'
-        - string:
-            name: host_x86_64_excludecheck
-            default: 'gdb'
-            description: 'Do not run "make check" on these components on x86_64'
-        - string:
-            name: host_aarchXX_excludecheck
-            default: 'gcc'
-            description: 'Do not run "make check" on these components on AArchXX'
-        - string:
-            name: extraconfig
-            default: ''
-            description: 'Extra configuration files, syntax tool=path'
-        - bool:
-            name: rebuild
-            default: true
-            description: 'Rebuild the toolchain even if results are already on logserver'
-        - string:
-            name: log_name
-            default: '${JOB_NAME}-${BUILD_NUMBER}/${builder_type}.$target'
-            description: 'Logname directory on logserver'
-        - bool:
-            name: dont_fail
-            default: false
-            description: 'Do not fail the build'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:/home/tcwg-buildslave/logs
-            description: 'Log_Server'
-        - string:
-            name: target_list
-            default: 'aarch64-linux-gnu aarch64-linux-gnu_ilp32 armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
-            description: 'List of targets -- aarch64-linux-gnu aarch64-linux-gnu_ilp32 armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build -- the tcwg-* targets should be a subset of slave axis'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/tested
-            description: 'ABE revision to test'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Scripts branch to use'
-        - string:
-            name: build_container_tag
-            default: 'trusty'
-            description: 'Distro to use on the builder with non-default container type: trusty, xenial.'
-        - string:
-            name: displaytag
-            default: 'manual'
-            description: 'Tag to display in the Jenkins console, so that the build name is more helpful'
-    disabled: false
-    node: tcwg-coordinator
-    child-workspace: $target
-    concurrent: true
-    display-name: 'TCWG ZZZ BuildFarm Christophe'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - $abe_branch
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            branches:
-                - $scripts_branch
-            basedir: jenkins-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-build
-                - tcwg-x86_32-build
-                - tcwg-tk1_32-build
-                - tcwg-apm_64-build
-                - tcwg-apm_32-build
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        combination-filter: |
-            (label=="tcwg-x86_64-build" && ! (target==~/tcwg-.*/)) || (target==label)
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - credentials-binding:
-            - text:
-                credential-id: TCWG_SES_USER
-                variable: TCWG_SES_USER
-        - credentials-binding:
-            - text:
-                credential-id: TCWG_SES_PASSWORD
-                variable: TCWG_SES_PASSWORD
-        - build-name:
-            name: '#${BUILD_NUMBER}-${displaytag}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            mkdir -p artifacts/
-
-            . ./jenkins-scripts/jenkins-helpers.sh
-
-            builder_type=$(print_type_for_label $label)
-
-            if [ x"$target" = x"$label" ]; then
-              target_opt="--target native"
-            elif [ x"$target" = x"aarch64-linux-gnu_ilp32" ]; then
-              target_opt="--target $target --override \"--extraconfigdir ../config/ilp32-dev\""
-            else
-              target_opt="--target $target"
-            fi
-
-            # Start build container
-            bash -x ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro ${build_container_tag} --prefix build_ > build-container.sh
-
-            # Define build_CONTAINER_RSH and build_container_cleanup
-            . ./build-container.sh
-
-            # Make sure to cleanup build container if something goes
-            # wrong when preparing the test environment
-            trap "cleanup_all_containers" EXIT
-
-            runtests_opt=""
-            if echo $runtests | grep -q $target; then
-              runtests_opt="--runtests"
-
-              tester_label=$(print_tester_label_for_target $target)
-              if [ x"$tester_label" != x"" ]; then
-                if [ x"$target" != x"aarch64-linux-gnu_ilp32" ]; then
-                  bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh
-                else
-                  # Set weight to "2" to give VM decent amount of RAM.
-                  bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro xenial --task test --prefix test_ --kernel_url https://dev-01.tcwglab/~tcwg-buildslave/images/ilp32/norov-Image --initrd_url https://cloud-images.ubuntu.com/releases/16.04/release/unpacked/ubuntu-16.04-server-cloudimg-arm64-initrd-generic > test-container.sh
-                fi
-                . ./test-container.sh
-                runtests_opt="$runtests_opt --testcontainer ${test_container_host}:${test_container_port}"
-              fi
-            fi
-
-            if [ "x${send_results_to}" != x ]; then
-                send_results_to="--send-results-to ${send_results_to}"
-            fi
-
-            ${build_CONTAINER_RSH} 'echo "Build session is up; ulimit config:"; ulimit -a'
-
-            case $label in
-                tcwg-x86_*-build) languages="$host_x86_64_languages" ;;
-                *) languages="$host_aarchXX_languages" ;;
-            esac
-
-            if $try_bootstrap; then
-                bootstrap="--bootstrap"
-            else
-                bootstrap=""
-            fi
-
-            if [ x"$log_name" != x"" ]; then
-                eval "logname_opt=\"--logname $log_name\""
-            fi
-
-            if $rebuild; then
-                norebuild=""
-            else
-                norebuild="--norebuild"
-            fi
-
-            case $label in
-                tcwg-x86_*-build) excludecheck="$host_x86_64_excludecheck" ;;
-                *) excludecheck="$host_aarchXX_excludecheck" ;;
-            esac
-
-            excludecheck_opt=""
-            for testsuite in $excludecheck; do
-                excludecheck_opt="$excludecheck_opt --excludecheck $testsuite"
-            done
-
-            # If there were extraconfig options, extract the
-            # corresponding repo
-            if test -n "$extraconfig" ; then
-                git clone http://git.linaro.org/toolchain/abe-extraconfigs.git
-            fi
-
-            extraconfig_opt=""
-            for config in $extraconfig; do
-                case ${extraconfig} in
-                    *=*)
-                        tool=${extraconfig%=*}
-                        value=${extraconfig#*=}
-                        ;;
-                    *)
-                        echo ERROR: wrong extraconfig: $extraconfig
-                        exit 1
-                        ;;
-                esac
-                extraconfig_opt="${extraconfig_opt} --extraconfig $tool=$PWD/abe-extraconfigs/$value"
-            done
-
-            result="0"
-
-            ${build_CONTAINER_RSH} "sudo sed -e s/@@MYHOSTNAME@@/${NODE_NAME}/g -e s/@@MAILHOST@@/email-smtp.us-east-1.amazonaws.com/ -e s/@@MAILPORT@@/587/ -i /etc/postfix/main.cf"
-            ${build_CONTAINER_RSH} "sudo sed -e s+sasl_passwd+sasl_password+ -i /etc/postfix/main.cf"
-            ${build_CONTAINER_RSH} "sudo sed -e s/@@MAILHOST@@/email-smtp.us-east-1.amazonaws.com/ -e s/@@MAILPORT@@/587/ -e s/@@MAILUSER@@/${TCWG_SES_USER}/ -e s/@@MAILPASSWORD@@/${TCWG_SES_PASSWORD}/ -i /etc/postfix/sasl_password"
-            ${build_CONTAINER_RSH} "echo linaro.org | sudo tee /etc/mailname"
-            ${build_CONTAINER_RSH} "sudo postmap hash:/etc/postfix/sasl_password"
-            ${build_CONTAINER_RSH} "sudo /etc/init.d/postfix start"
-            cat > tmpmail <<EOF
-            From: Christophe Lyon <christophe.lyon@linaro.org>
-            Subject: Amazon SES Test from buildfarm
-            This message was sent using Amazon SES from a buildfarm job.
-            EOF
-
-            cat tmpmail | ${build_CONTAINER_RSH} "sendmail -f sender@linaro.org christophe.lyon@linaro.org"
-            rm tmpmail
-
-            ${build_CONTAINER_RSH} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --override \"$override\" $target_opt --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} ${send_results_to} --logserver $log_server $logname_opt $norebuild" || result=$?
-
-            # If the build failed, stop the containers, which will
-            # leave them as-is for ~10 days.
-            if [ $result -ne 0 ]; then
-                trap "stop_all_containers" EXIT
-            fi
-
-            # If we actually built a toolchain, save its manifest.
-            # If the build was a no-op (results already present on log_server),
-            # copy the existing ones.
-            if [ -d _build/builds ]; then
-                manifest="`grep "^manifest=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-`"
-            else
-                manifest=""
-            fi
-            if [ x"${manifest}" != x ]; then
-                cp ${manifest} artifacts/
-            else
-                # We need to do the same name expansion as jenkins.sh
-                eval dir="$log_name"
-                scp "$log_server/$dir/*manifest.txt" artifacts/
-            fi
-
-            # Save logs and their directory structure
-            rsync -a --exclude="/logs/" --include="*/" --include="*.log" --include="*.err" --include="*.out" --include="*.txt" --exclude="*" --prune-empty-dirs ./ ./logs/
-            if ! tar -I pxz -cf ./artifacts/logs.tar.xz ./logs/ >/dev/null 2>&1; then
-                # PXZ can [rarely] fail due to high RAM usage, so fallback to normal XZ.
-                rm -f ./artifacts/logs.tar.xz
-                tar -cJf ./artifacts/logs.tar.xz ./logs/
-            fi
-
-            echo "Result of jenkins.sh: $result"
-            if $dont_fail; then
-                result="0"
-            fi
-            exit $result
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            latest-only: false
-        - workspace-cleanup:
-            clean-if:
-                - success: true
-                - unstable: false
-                - failure: false
-                - aborted: false
-                - not-built: false
diff --git a/tcwg-buildfarm-cmp.yaml b/tcwg-buildfarm-cmp.yaml
deleted file mode 100644
index 03dacee6a0..0000000000
--- a/tcwg-buildfarm-cmp.yaml
+++ /dev/null
@@ -1,157 +0,0 @@
-- job:
-    name: tcwg-buildfarm-cmp
-    project-type: multijob
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: ref_override
-            default: ''
-            description: 'Components version for reference builds; e.g. gcc=gcc.git~linaro/gcc-6-branch glibc=... and/or --extraconfigdir ../config/gcc6'
-        - string:
-            name: ref_log_name
-            default: '${JOB_NAME}-${BUILD_NUMBER}-REF'
-            description: 'Prefix logname for reference directory on logserver'
-        - string:
-            name: ref_abe_branch
-            default: refs/remotes/origin/master
-            description: 'ABE revision to test for reference builds'
-        - bool:
-            name: ref_rebuild
-            default: true
-            description: 'Rebuild reference toolchain even if results are already on logserver'
-        - string:
-            name: eval_override
-            default: ''
-            description: 'Components version for evaluation builds; e.g. gcc=gcc.git~linaro/gcc-6-branch glibc=... and/or --extraconfigdir ../config/gcc6'
-        - string:
-            name: eval_log_name
-            default: '${JOB_NAME}-${BUILD_NUMBER}-EVAL'
-            description: 'Prefix logname for evalution directory on logserver'
-        - string:
-            name: eval_abe_branch
-            default: refs/remotes/origin/master
-            description: 'ABE revision to test for evaluation builds'
-        - bool:
-            name: eval_rebuild
-            default: true
-            description: 'Rebuild evaluation toolchain even if results are already on logserver'
-        - string:
-            name: host_x86_64_languages
-            default: 'default'
-            description: 'Languages to build for x86_64 native toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: host_aarchXX_languages
-            default: 'c,c++'
-            description: 'Languages to build for AArchXX native toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: runtests
-            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
-            description: 'Run toolchain tests for these targets -- must be a subset of target_list'
-        - string:
-            name: host_x86_64_excludecheck
-            default: 'gdb'
-            description: 'Do not run "make check" on these components on x86_64'
-        - string:
-            name: host_aarchXX_excludecheck
-            default: 'gcc'
-            description: 'Do not run "make check" on these components on AArchXX'
-        - string:
-            name: extraconfig
-            default: ''
-            description: 'Extra configuration files, syntax tool=path'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:/home/tcwg-buildslave/logs
-            description: 'Log_Server'
-        - string:
-            name: target_list
-            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
-            description: 'List of targets -- aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build -- the tcwg-* targets should be a subset of slave axis'
-        - string:
-            name: displaytag
-            default: 'manual'
-            description: 'Tag to display in the Jenkins console, so that the build name is more helpful'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: true
-    display-name: 'TCWG ZZZ Buildfarm Compare '
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${displaytag}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -e
-
-            cat << EOF > buildfarm_parameters
-            host_x86_64_languages=$host_x86_64_languages
-            host_aarchXX_languages=$host_aarchXX_languages
-            runtests=$runtests
-            host_x86_64_excludecheck=$host_x86_64_excludecheck
-            host_aarchXX_excludecheck=$host_aarchXX_excludecheck
-            extraconfig=$extraconfig
-            log_server=$log_server
-            target_list=$target_list
-            EOF
-
-            echo "NOTE: Buildfarm job parameters:"
-            cat buildfarm_parameters
-
-            cat << EOF > compare_results_parameters
-            ref_logs=$ref_log_name
-            new_logs=$eval_log_name
-            log_server=$log_server
-            EOF
-
-            echo "NOTE: Compare Results job parameters:"
-            cat compare_results_parameters
-
-        - multijob:
-            name: 'Builds'
-            condition: ALWAYS
-            projects:
-              - name: tcwg-buildfarm
-                predefined-parameters: |
-                  override=$ref_override
-                  log_name=$ref_log_name/\$builder_type.\$target
-                  abe_branch=$ref_abe_branch
-                  rebuild=$ref_rebuild
-                  displaytag=buildfarm-cmp-ref-${BUILD_NUMBER}
-                property-file: buildfarm_parameters
-              - name: tcwg-buildfarm
-                predefined-parameters: |
-                  override=$eval_override
-                  log_name=$eval_log_name/\$builder_type.\$target
-                  abe_branch=$eval_abe_branch
-                  rebuild=$eval_rebuild
-                  displaytag=buildfarm-cmp-eval-${BUILD_NUMBER}
-                property-file: buildfarm_parameters
-        - multijob:
-            name: 'Compare Results'
-            condition: COMPLETED
-            projects:
-              - name: tcwg-compare-results
-                property-file: compare_results_parameters
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org'
-            send-to:
-              requester
-              recipients
-            always: true
diff --git a/tcwg-buildfarm.yaml b/tcwg-buildfarm.yaml
index 74023bc6b3..1cd89adfc3 100644
--- a/tcwg-buildfarm.yaml
+++ b/tcwg-buildfarm.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -28,8 +28,12 @@
             description: 'Languages to build for AArchXX-hosted toolchains, e.g., "c,c++" or "all" or "default"'
         - string:
             name: runtests
-            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
+            default: 'aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf arm-eabi aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build'
             description: 'Run toolchain tests for these targets -- must be a subset of target_list'
+        - string:
+            name: send_results_to
+            default: ''
+            description: 'Email address to send test results to'
         - bool:
             name: try_bootstrap
             default: 'true'
@@ -52,7 +56,7 @@
             description: 'Rebuild the toolchain even if results are already on logserver'
         - string:
             name: log_name
-            default: '${JOB_NAME}-${BUILD_NUMBER}/${builder_type}.$target'
+            default: '${JOB_NAME}-${BUILD_NUMBER}/@@host@@.$target'
             description: 'Logname directory on logserver'
         - bool:
             name: dont_fail
@@ -64,20 +68,24 @@
             description: 'Log_Server'
         - string:
             name: target_list
-            default: 'aarch64-linux-gnu aarch64-linux-gnu_ilp32 armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build'
-            description: 'List of targets -- aarch64-linux-gnu aarch64-linux-gnu_ilp32 armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build -- the tcwg-* targets should be a subset of slave axis'
+            default: 'aarch64-linux-gnu aarch64-linux-gnu_ilp32 armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf arm-eabi aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build'
+            description: 'List of targets -- aarch64-linux-gnu aarch64-linux-gnu_ilp32 armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf arm-eabi aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-armv8_64 tcwg-armv8_32-build tcwg-sq_32-build tcwg-sq_64-build -- the tcwg-* targets should be a subset of slave axis'
         - string:
             name: abe_branch
-            default: refs/remotes/origin/tested
+            default: tested
             description: 'ABE revision to test'
         - string:
             name: scripts_branch
-            default: master
+            default: tested
             description: 'Scripts branch to use'
         - string:
             name: build_container_tag
-            default: 'trusty'
-            description: 'Distro to use on the builder with non-default container type: trusty, xenial.'
+            default: 'lts_1'
+            description: 'Distro to use on the builder with non-default container type: lts_1, lts, ...'
+        - string:
+            name: test_container_tag
+            default: 'lts_1'
+            description: 'Distro to use in the test container: lts_1, lts, ...'
         - string:
             name: displaytag
             default: 'manual'
@@ -86,22 +94,26 @@
             name: binaries
             default: false
             description: 'Create binary tarballs'
+        - bool:
+            name: dryrun
+            default: false
+            description: 'Dry-run, do nothing, just print steps'
     disabled: false
     node: tcwg-coordinator
-    child-workspace: $target
     concurrent: true
     display-name: 'TCWG AAA BuildFarm'
+    child-workspace: ../tcwg-buildfarm__$EXECUTOR_NUMBER
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
+            url: https://git.linaro.org/toolchain/abe.git
+            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             branches:
                 - $abe_branch
             skip-tag: true
             shallow-clone: true
             wipe-workspace: true
         - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             branches:
                 - $scripts_branch
@@ -115,10 +127,11 @@
             name: label
             values:
                 - tcwg-x86_64-build
-                - tcwg-x86_32-build
                 - tcwg-tk1_32-build
-                - tcwg-apm_64-build
-                - tcwg-apm_32-build
+                - tcwg-armv8_64
+                - tcwg-armv8_32
+                - tcwg-sq_32-build
+                - tcwg-sq_64-build
         - axis:
             type: dynamic
             name: target
@@ -130,7 +143,7 @@
         sequential: false
     wrappers:
         - timeout:
-            timeout: 600
+            timeout: 1200
         - timestamps
         - ssh-agent-credentials:
             # tcwg-buildslave user id
@@ -141,160 +154,49 @@
     builders:
         - shell: |
             #!/bin/bash
-
             set -ex
+            ./jenkins-scripts/docker-run.sh \
+              --label $label \
+              --node $NODE_NAME \
+              --distro $build_container_tag \
+              $(case "$target" in qemu-*) echo "--qemu $target" ;; esac) \
+              --dryrun "$dryrun" \
+              -- ./jenkins-scripts/tcwg-buildfarm.sh \
+              --label "$label" \
+              --target "$target" \
+              --BUILD_NUMBER "$BUILD_NUMBER" \
+              --JOB_NAME "$JOB_NAME" \
+              --NODE_NAME "$NODE_NAME" \
+              --WORKSPACE "$WORKSPACE" \
+              --override "$override" \
+              --host_x86_64_languages "$host_x86_64_languages" \
+              --host_aarchXX_languages "$host_aarchXX_languages" \
+              --runtests "$runtests" \
+              --send_results_to "$send_results_to" \
+              --try_bootstrap "$try_bootstrap" \
+              --host_x86_64_excludecheck "$host_x86_64_excludecheck" \
+              --host_aarchXX_excludecheck "$host_aarchXX_excludecheck" \
+              --extraconfig "$extraconfig" \
+              --rebuild "$rebuild" \
+              --log_name "$log_name" \
+              --dont_fail "$dont_fail" \
+              --log_server "$log_server" \
+              --abe_branch "$abe_branch" \
+              --test_container_tag "$test_container_tag" \
+              --binaries "$binaries" \
+              --dryrun "$dryrun"
+      
+              # There seems to be a bug in glibc tests, leading a huge
+              #  cert.out file in crypt/. Remove it to avoid disk full
+              #  issues.
+              ./jenkins-scripts/docker-run.sh \
+              --label $label \
+              --node $NODE_NAME \
+              --distro $build_container_tag \
+              $(case "$target" in qemu-*) echo "--qemu $target" ;; esac) \
+              --dryrun "$dryrun" \
+              -- find $WORKSPACE/_build/builds -name cert.out -ls -delete
 
-            mkdir -p artifacts/
-
-            . ./jenkins-scripts/jenkins-helpers.sh
-
-            builder_type=$(print_type_for_label $label)
-
-            if [ x"$target" = x"$label" ]; then
-              target_opt="--target native"
-            elif [ x"$target" = x"aarch64-linux-gnu_ilp32" ]; then
-              target_opt="--target $target --override \"--extraconfigdir ../config/ilp32-dev\""
-            else
-              target_opt="--target $target"
-            fi
-
-            # Start build container
-            bash -x ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro ${build_container_tag} --prefix build_ > build-container.sh
-
-            # Define build_CONTAINER_RSH and build_container_cleanup
-            . ./build-container.sh
-
-            # Make sure to cleanup build container if something goes
-            # wrong when preparing the test environment
-            trap "cleanup_all_containers" EXIT
-
-            runtests_opt=""
-            if echo $runtests | grep -q $target; then
-              runtests_opt="--runtests"
-
-              tester_label=$(print_tester_label_for_target $target)
-              if [ x"$tester_label" != x"" ]; then
-                if [ x"$target" != x"aarch64-linux-gnu_ilp32" ]; then
-                  bash -x ./jenkins-scripts/start-container-docker.sh --label $tester_label --distro trusty --task test --prefix test_ > test-container.sh
-                else
-                  # Set weight to "2" to give VM decent amount of RAM.
-                  bash -x ./jenkins-scripts/start-container-qemu.sh --weight 2 --label $tester_label --distro xenial --task test --prefix test_ --kernel_url https://dev-01.tcwglab/~tcwg-buildslave/images/ilp32/norov-Image --initrd_url https://cloud-images.ubuntu.com/releases/16.04/release/unpacked/ubuntu-16.04-server-cloudimg-arm64-initrd-generic > test-container.sh
-                fi
-                . ./test-container.sh
-                runtests_opt="$runtests_opt --testcontainer ${test_container_host}:${test_container_port}"
-              fi
-            fi
-
-            ${build_CONTAINER_RSH} 'echo "Build session is up; ulimit config:"; ulimit -a'
-
-            case $label in
-                tcwg-x86_*-build) languages="$host_x86_64_languages" ;;
-                *) languages="$host_aarchXX_languages" ;;
-            esac
-
-            if $try_bootstrap; then
-                bootstrap="--bootstrap"
-            else
-                bootstrap=""
-            fi
-
-            if [ x"$log_name" != x"" ]; then
-                eval "logname_opt=\"--logname $log_name\""
-            fi
-
-            if $rebuild; then
-                norebuild=""
-            else
-                norebuild="--norebuild"
-            fi
-
-            # --tarbin needs to be passed to jenkins.sh as a user option
-            if $binaries; then
-                options="-o --tarbin"
-            else
-                options=""
-            fi
-
-            case $label in
-                tcwg-x86_*-build) excludecheck="$host_x86_64_excludecheck" ;;
-                *) excludecheck="$host_aarchXX_excludecheck" ;;
-            esac
-
-            excludecheck_opt=""
-            for testsuite in $excludecheck; do
-                excludecheck_opt="$excludecheck_opt --excludecheck $testsuite"
-            done
-
-            # If there were extraconfig options, extract the
-            # corresponding repo
-            if test -n "$extraconfig" ; then
-                git clone http://git.linaro.org/toolchain/abe-extraconfigs.git
-            fi
-
-            extraconfig_opt=""
-            for config in $extraconfig; do
-                case ${extraconfig} in
-                    *=*)
-                        tool=${extraconfig%=*}
-                        value=${extraconfig#*=}
-                        ;;
-                    *)
-                        echo ERROR: wrong extraconfig: $extraconfig
-                        exit 1
-                        ;;
-                esac
-                extraconfig_opt="${extraconfig_opt} --extraconfig $tool=$PWD/abe-extraconfigs/$value"
-            done
-
-            result="0"
-
-            ${build_CONTAINER_RSH} "cd ${WORKSPACE} && bash -x ${WORKSPACE}/jenkins-scripts/jenkins.sh --workspace ${WORKSPACE} --abedir ${WORKSPACE} --override \"$override\" $target_opt --languages ${languages} $bootstrap $runtests_opt $excludecheck_opt ${extraconfig_opt} --logserver $log_server $logname_opt $norebuild $options"|| result=$?
-
-            # If the build failed, stop the containers, which will
-            # leave them as-is for ~10 days.
-            if [ $result -ne 0 ]; then
-                trap "stop_all_containers" EXIT
-            fi
-
-            # If we actually built a toolchain, save its manifest.
-            # If the build was a no-op (results already present on log_server),
-            # copy the existing ones.
-            if [ -d _build/builds ]; then
-                manifest="`grep "^manifest=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-`"
-            else
-                manifest=""
-            fi
-            if [ x"${manifest}" != x ]; then
-                cp ${manifest} artifacts/
-            else
-                # We need to do the same name expansion as jenkins.sh
-                eval dir="$log_name"
-                scp "$log_server/$dir/*manifest.txt" artifacts/
-            fi
-
-            # Provide requested binaries as artifacts
-            if $binaries; then
-                cp $(grep "^toolchain=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-) artifacts/
-                cp $(grep "^toolchain_asc=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-) artifacts/
-                cp $(grep "^runtime=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-) artifacts/
-                cp $(grep "^runtime_asc=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-) artifacts/
-                cp $(grep "^sysroot=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-) artifacts/
-                cp $(grep "^sysroot_asc=" ${WORKSPACE}/build-artifacts.txt | cut -d = -f 2-) artifacts/
-            fi
-
-            # Save logs and their directory structure
-            rsync -a --exclude="/logs/" --include="*/" --include="*.log" --include="*.err" --include="*.out" --include="*.txt" --exclude="*" --prune-empty-dirs ./ ./logs/
-            if ! tar -I pxz -cf ./artifacts/logs.tar.xz ./logs/ >/dev/null 2>&1; then
-                # PXZ can [rarely] fail due to high RAM usage, so fallback to normal XZ.
-                rm -f ./artifacts/logs.tar.xz
-                tar -cJf ./artifacts/logs.tar.xz ./logs/
-            fi
-
-            echo "Result of jenkins.sh: $result"
-            if $dont_fail; then
-                result="0"
-            fi
-            exit $result
     publishers:
         - archive:
             artifacts: 'artifacts/*'
diff --git a/tcwg-buildslave-command.yaml b/tcwg-buildslave-command.yaml
index a851df1ace..fb2f051651 100644
--- a/tcwg-buildslave-command.yaml
+++ b/tcwg-buildslave-command.yaml
@@ -1,50 +1,45 @@
 - job:
     name: tcwg-buildslave-command
-    project-type: matrix
+    project-type: freestyle
     defaults: global
     properties:
         - authorization:
-            linaro:
+            anonymous:
                 - job-read
                 - job-extended-read
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
             days-to-keep: 30
-            num-to-keep: 30
+            num-to-keep: 100
     parameters:
-        - string:
-            name: machines_list
-            default: 'dev-01.tcwglab'
-            description: 'Machines to run on: apm-01.tcwglab apm-02.tcwglab test-armv8-01.tcwglab test-armv8-02.tcwglab tcwg-tx1-01.tcwglab tcwg-tx1-02.tcwglab tcwg-tx1-03.tcwglab tcwg-tx1-04.tcwglab tcwg-tx1-05.tcwglab tcwg-tx1-06.tcwglab tcwg-tx1-07.tcwglab tcwg-tx1-08.tcwglab tcwg-tk1-01.tcwglab tcwg-tk1-02.tcwglab tcwg-tk1-03.tcwglab tcwg-tk1-04.tcwglab tcwg-tk1-05.tcwglab tcwg-tk1-06.tcwglab tcwg-tk1-07.tcwglab tcwg-tk1-08.tcwglab tcwg-tk1-09.tcwglab build-01.tcwglab build-02.tcwglab build-03.tcwglab build-04.tcwglab build-05.tcwglab build-06.tcwglab build-07.tcwglab build-08.tcwglab dev-01.tcwglab dev-02.tcwglab bkp-01.tcwglab'
-        - string:
+        - label:
+            name: nodes
+            default: tcwg-amp_64-build || tcwg-apm_64-build || tcwg-apm_64-test || tcwg-coordinator || tcwg-sq_64-build || tcwg-tk1_32-build || tcwg-x86_64-build || tcwg-x86_64-cam
+            all-nodes: true
+            matching-label: 'allCases'
+            node-eligibility: 'ignore-offline'
+            description: 'Machines to run on'
+        - text:
             name: command
-            default: 'ls $HOME/*'
+            default: |
+              #!/bin/bash
+              set -ex
+
+              ls -la $HOME/
             description: 'Command to run'
-        - string:
-            name: target_user
-            default: 'tcwg-buildslave'
-            description: 'User to run as: tcwg-buildslave or tcwg-benchmark'
         - bool:
             name: dry_run
             default: 'false'
             description: 'Whether to do a dry-run'
+        - string:
+            name: displayname
+            default: 'unknown'
+            description: 'Name to display in the Jenkins console, so that the build name is more helpful'
     disabled: false
-    node: tcwg-coordinator
     concurrent: true
-    display-name: 'TCWG DDD Buildslave command'
-    axes:
-        - axis:
-            type: dynamic
-            name: machine
-            values:
-                - machines_list
-            description: 'SSH names of machines to run the command on'
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-coordinator
+    display-name: 'TCWG CCC Buildslave Command'
     wrappers:
         - timeout:
             timeout: 60
@@ -55,24 +50,24 @@
                 - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
                 - 'tcwg-benchmark'
         - build-name:
-            name: '#${BUILD_NUMBER}'
+            name: '${displayname}-${BUILD_NUMBER}-${NODE_NAME}'
     builders:
         - shell: |
             #!/bin/bash
 
             set -ex
 
-            cat > command.sh.$$$$ << EOF
-            #!/bin/bash
-
-            set -ex
-
+            cat > command-$BUILD_NUMBER.sh << EOF
             $command
             EOF
-            chmod +x command.sh.$$$$
-
-            cat command.sh.$$$$
+            chmod +x command-$BUILD_NUMBER.sh
 
-            scp command.sh.$$$$ $target_user@$machine:/tmp/
-            # Don't use ssh shared connection to reliably proxy SSH agent
-            $dry_run || ssh -Snone $target_user@$machine /tmp/command.sh.$$$$
+            if $dry_run; then
+              cat command-$BUILD_NUMBER.sh
+            else
+              ./command-$BUILD_NUMBER.sh
+            fi
+    publishers:
+        - email-ext:
+            recipients: 'tcwg-validation@linaro.org'
+            aborted: true
diff --git a/tcwg-check-ci-jobs-vs-yaml.yaml b/tcwg-check-ci-jobs-vs-yaml.yaml
new file mode 100644
index 0000000000..23caa90dbb
--- /dev/null
+++ b/tcwg-check-ci-jobs-vs-yaml.yaml
@@ -0,0 +1,66 @@
+- job:
+    name: tcwg-check-ci-jobs-vs-yaml
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+      - string:
+          name: job_subset
+          default: "tcwg"
+          description: 'Check only the jobs that are containing this pattern'
+    disabled: false
+    node: tcwg-coordinator
+    display-name: 'TCWG Check CI Jobs synchro versus configs.git'
+    concurrent: false
+    triggers:
+      - timed: '@daily'
+    wrappers:
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+              - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - workspace-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -euf -o pipefail
+
+            rm -rf artifacts
+            mkdir -p artifacts
+
+            rm -rf configs jenkins-scripts
+            git clone --depth 1 --single-branch \
+              https://git.linaro.org/ci/job/configs.git
+            git clone --depth 1 --single-branch \
+              https://git.linaro.org/toolchain/jenkins-scripts.git
+
+            # We have jenkins-job only in ubuntu:focal image.
+            ./jenkins-scripts/docker-run.sh --distro focal -- \
+            ./configs/tcwg-check-ci-jobs-vs-yaml/tcwg-check-ci-jobs-vs-yaml.sh \
+                --job_subset "$job_subset" \
+                --config_dir "." \
+                --result_dir "./artifacts" |& tee artifacts/check_ci_sync_summary.txt
+
+    publishers:
+        - email-ext:
+            recipients: 'maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org'
+            content-type: text
+            body: |
+              ${FILE,path="artifacts/check_ci_sync_summary.txt"}
+            failure: true
+            aborted: true
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
diff --git a/tcwg-check-ci-jobs-vs-yaml/tcwg-check-ci-jobs-vs-yaml.sh b/tcwg-check-ci-jobs-vs-yaml/tcwg-check-ci-jobs-vs-yaml.sh
new file mode 100755
index 0000000000..7a152de34b
--- /dev/null
+++ b/tcwg-check-ci-jobs-vs-yaml/tcwg-check-ci-jobs-vs-yaml.sh
@@ -0,0 +1,212 @@
+#!/bin/bash -f
+
+set -e
+
+# Processing script arguments
+verbose=true
+config_dir=configs
+job_subset=''
+result_dir="."
+while [[ $# -gt 0 ]]; do
+  case $1 in
+     --verbose) 
+       verbose=$2;
+       shift ;;
+     --job_subset)
+       job_subset=$2
+       shift ;;
+     --config_dir)
+       config_dir=$2
+       shift ;;
+     --result_dir)
+       result_dir=$2
+       shift ;;
+    -*)
+      echo "Unknown option $1"
+      exit 1
+  esac
+  shift
+done
+
+jenkinsurl=https://ci.linaro.org
+exit_status=0
+
+ci_jobs=()
+configs_jobs=()
+
+mkdir -p "$result_dir"
+
+if $verbose; then
+  DEBUGFILE=$result_dir/check_ci_sync_debug.txt
+  rm -f "$DEBUGFILE"
+else
+  DEBUGFILE=/dev/null
+fi
+
+
+## GET THE JOBS LIST LOOKING AT JENKINS SERVER
+get_ci_jobs()
+{
+   echo "==============  GET_CI_JOBS  ==============="		| tee -a "$DEBUGFILE"
+
+   # ssh ci.linaro.org list-jobs
+   CMD="ssh -p2222 -l $USER@linaro.org ci.linaro.org"
+   echo "$CMD list-jobs | grep $job_subset"
+
+   list_jobs_file=$(mktemp)
+   $CMD list-jobs > $list_jobs_file
+   while read -r jb; do
+      if [[ $jb == *$job_subset* ]]; then 
+         echo " * $jb"    					>> "$DEBUGFILE"
+         ci_jobs+=( "$jb" )
+      else
+         echo "   $jb"    					>> "$DEBUGFILE"
+      fi
+   done < $list_jobs_file
+
+   printf "  (found $(cat $list_jobs_file|wc -l) jobs, select ${#ci_jobs[*]} jobs)\n"
+   echo ""
+   rm -f $list_jobs_file
+}
+
+## GET THE JOBS LIST LOOKING AT GIT CONFIG
+get_configs_jobs()
+{
+   configs_jobs_failing=()
+   outdir="configs_jobs_out"
+   [ -d $outdir ] && rm -rf $outdir
+   mkdir $outdir
+
+   echo "============  GET_CONFIGS_JOBS  ============="		| tee -a "$DEBUGFILE"
+   # Yaml files
+   yaml_files=$(find $config_dir -name "*$job_subset*.yaml")
+   printf "  (found $(echo $yaml_files | wc -w) yaml files)\n"
+
+   # jenkins-job test <every file>
+   jjb_output_file=$(mktemp)
+   for fn in $yaml_files; do
+     if ! jenkins-jobs test -o $outdir $fn >& $jjb_output_file; then
+	echo ""
+	echo   "# WARNING: jenkins-job command fails"
+	echo " + jenkins-jobs test -o $outdir $fn  # Fails"	| tee -a "$DEBUGFILE"
+	cat "$jjb_output_file"
+	configs_jobs_failing+=( "$fn" )
+     else
+	echo "+ jenkins-jobs test -o $outdir $fn"		>> "$DEBUGFILE"
+     fi
+     rm "$jjb_output_file"
+   done
+
+   # Select the jobs, not the views
+   for fn in $(ls -1 $outdir); do
+      if grep -q "hudson.model.ListView" $outdir/$fn; then
+         configs_views+=( "$fn" )
+      else
+         configs_jobs+=( "$fn" )
+      fi
+   done
+   echo ""
+   echo "  (found ${#configs_jobs[*]} jobs, ${#configs_views[*]} views, ${#configs_jobs_failing[*]} jjb failing)"
+
+   # Print failing jenkins-job if any
+   if [ ${#configs_jobs_failing[@]} -gt 0 ]; then
+     echo "# jenkins-jobs failing for file :"			| tee -a "$DEBUGFILE"
+     for fn in ${configs_jobs_failing[*]}; do
+       echo "  jenkins-jobs test -o $outdir $fn"		| tee -a "$DEBUGFILE"
+     done
+     echo ""
+   fi
+   echo ""
+}
+
+yaml_exists_job_noexists=()
+yaml_noexists_job_exists=()
+yaml_exists_job_exists=()
+
+## COMPARE AND PRINT THE SUMMARY
+summary()
+{
+   rm -f "$DEBUGFILE"
+
+   echo "============  SUMMARY  ============="
+   sorted_jobs=( $(echo "${configs_jobs[@]}" "${ci_jobs[@]}"|xargs -n1|sort -u|xargs) )
+
+   for jb in "${sorted_jobs[@]}"; do
+      if [[ ${configs_jobs[*]} =~ (^|[[:space:]])"$jb"($|[[:space:]]) ]] &&
+         [[ ${ci_jobs[*]} =~ (^|[[:space:]])"$jb"($|[[:space:]]) ]]; then
+	 yaml_exists_job_exists+=( "$jb" )
+	 printf " %-100s | %15s | %15s |\n" "$jb" "yaml exists" "job exists"	>> "$DEBUGFILE"
+      fi
+      if [[ ! ${configs_jobs[*]} =~ (^|[[:space:]])"$jb"($|[[:space:]]) ]] &&
+         [[ ${ci_jobs[*]} =~ (^|[[:space:]])"$jb"($|[[:space:]]) ]]; then
+	 yaml_noexists_job_exists+=( "$jb" )
+	 printf " %-100s | %15s | %15s |\n" "$jb" "yaml NO exists" "job exists"	>> "$DEBUGFILE"
+      fi
+      if [[ ${configs_jobs[*]} =~ (^|[[:space:]])"$jb"($|[[:space:]]) ]] &&
+         [[ ! ${ci_jobs[*]} =~ (^|[[:space:]])"$jb"($|[[:space:]]) ]]; then
+	 yaml_exists_job_noexists+=( "$jb" )
+	 printf " %-100s | %15s | %15s |\n" "$jb" "yaml exists" "job NO exists"	>> "$DEBUGFILE"
+      fi
+   done
+   echo "JENKINS JOBS exists and YAML FILE exist             : ${#yaml_exists_job_exists[@]} jobs"	| tee -a "$DEBUGFILE"
+   echo "JENKINS JOBS doesnot exists but the YAML FILE exist : ${#yaml_noexists_job_exists[@]} jobs"	| tee -a "$DEBUGFILE"
+   echo "JENKINS JOBS exists but the YAML FILE doesnot exist : ${#yaml_exists_job_noexists[@]} jobs"	| tee -a "$DEBUGFILE"
+
+   if [ ${#yaml_noexists_job_exists[@]} != 0 ] || [ ${#yaml_exists_job_noexists[@]} != 0 ]; then
+      exit_status=1
+   fi
+
+   echo "  (See details in $DEBUGFILE)"
+   echo ""
+}
+
+## PRINT SUGGESTIONS TO RESOLVE THESE GAP
+print_suggestions()
+{
+   CMD="ssh -p2222 -l \$USER@linaro.org ci.linaro.org"
+
+   echo "============  SUGGESSTIONS  ============="
+
+   if [ ${#yaml_noexists_job_exists[@]} != 0 ]; then
+      echo "# Some JENKINS JOBS exists but the YAML FILE doesnot exist (${#yaml_noexists_job_exists[@]} jobs)"
+      echo "# --------------------------------------------------------"
+      echo "#   These are orphan jobs that are not linked to any yaml files."
+      echo "#   You could delete them by using commands below.              "
+      echo "#   Please make sure that's what you want before deleting.      "
+      if [ ${#configs_jobs_failing[@]} != 0 ]; then
+         echo "#    /!\ WARNING : some of the following orphan jobs may be due to the failing jenkins-job commands above."
+      fi
+
+      echo ""
+      for jb in "${yaml_noexists_job_exists[@]}"; do
+	 echo "    # $jenkinsurl/job/$jb"
+	 echo "    $CMD delete-job $jb"
+      done
+      echo ""
+   fi
+
+   if [ ${#yaml_exists_job_noexists[@]} != 0 ]; then
+      echo "# Some YAML FILES generates a xml, but the JENKINS JOB doesnot exist (${#yaml_noexists_job_exists[@]} jobs)"
+      echo "# --------------------------------------------------------"
+      echo "#   These jobs might probably exists, but are not readable by $USER."
+
+      echo ""
+      for jb in "${yaml_exists_job_noexists[@]}"; do
+	 echo "    # $jenkinsurl/job/$jb"
+      done
+      echo ""
+   fi
+}
+
+
+
+get_ci_jobs
+
+get_configs_jobs
+
+summary
+
+print_suggestions
+
+echo "exit $exit_status"
+exit $exit_status
diff --git a/tcwg-cleanup-stale-containers.yaml b/tcwg-cleanup-stale-containers.yaml
index 923fd13b02..e5c0b12ad1 100644
--- a/tcwg-cleanup-stale-containers.yaml
+++ b/tcwg-cleanup-stale-containers.yaml
@@ -1,37 +1,43 @@
 - job:
     name: tcwg-cleanup-stale-containers
-    project-type: matrix
+    project-type: freestyle
     defaults: global
     properties:
         - authorization:
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
             days-to-keep: 30
-            num-to-keep: 30
+            num-to-keep: 100
         - throttle:
             max-per-node: 1
             option: project
     parameters:
-        - string:
+        - label:
             name: slave_list
-            default: 'tcwg-apm-01 tcwg-apm-02 tcwg-apm-03 tcwg-apm-04 tcwg-tk1-01 tcwg-tk1-02 tcwg-tk1-03 tcwg-tk1-04 tcwg-tx1-01 tcwg-tx1-02 tcwg-tx1-03 tcwg-tx1-04 tcwg-x86_64-build-01 tcwg-x86_64-build-02 tcwg-x86_64-build-03 tcwg-x86_64-build-04 tcwg-x86_64-build-05 tcwg-x86_64-build-06 tcwg-x86_64-build-07 tcwg-x86_64-build-08'
-            description: 'List of slaves to run on -- should be a subset of slave axis'
+            default: tcwg
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
         - string:
             name: cleanup_running_hours
-            default: '10'
+            default: '48'
             description: 'Delete containers that are more then "hours" old.  Use "0" to disable time check.  Use negative values for dry-run.'
         - string:
             name: cleanup_stopped_hours
             default: '240'
-            description: 'Delete containers that are more then "hours" old.  Use "0" to disable time check.  Use negative values for dry-run.'
+            description: 'Delete containers that are more then "hours" old.  Use "0" to disable the cleanup.  Use negative values for dry-run.'
+        - string:
+            name: cleanup_ssh_agent_hours
+            default: '48'
+            description: 'Kill ssh-agent processes that are more then "hours" old.  Use "0" to disable time check.'
         - bool:
             name: cleanup_volumes
-            default: 'false'
+            default: 'true'
             description: 'Whether to cleanup dangling volumes'
         - bool:
             name: cleanup_images
@@ -46,70 +52,50 @@
             default: refs/heads/master
             description: 'Scripts revision to use'
     disabled: false
-    node: tcwg-coordinator
-    concurrent: false
+    concurrent: true
     display-name: 'TCWG CCC Cleanup stale containers'
+    workspace: workspace/tcwg-cleanup-stale-containers_$EXECUTOR_NUMBER/$NODE_NAME
     triggers:
         - timed: '@daily'
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             branches:
                 - ${scripts_branch}
             skip-tag: true
             shallow-clone: true
             wipe-workspace: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-apm-01
-                - tcwg-apm-02
-                - tcwg-apm-03
-                - tcwg-apm-04
-                - tcwg-tk1-01
-                - tcwg-tk1-02
-                - tcwg-tk1-03
-                - tcwg-tk1-04
-                - tcwg-tx1-01
-                - tcwg-tx1-02
-                - tcwg-tx1-03
-                - tcwg-tx1-04
-                - tcwg-x86_64-build-01
-                - tcwg-x86_64-build-02
-                - tcwg-x86_64-build-03
-                - tcwg-x86_64-build-04
-                - tcwg-x86_64-build-05
-                - tcwg-x86_64-build-06
-                - tcwg-x86_64-build-07
-                - tcwg-x86_64-build-08
-        - axis:
-            type: dynamic
-            name: slave
-            values:
-                - slave_list
-    execution-strategy:
-        combination-filter: |
-            label==slave
-        sequential: false
     wrappers:
         - timeout:
             timeout: 600
         - timestamps
         - ssh-agent-credentials:
-            # tcwg-buildslave user id
             users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+              - 'tcwg-benchmark'
         - build-name:
-            name: '#${BUILD_NUMBER}'
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
     builders:
         - shell: |
             #!/bin/bash
-
             set -ex
-            ./tcwg-cleanup-stale-containers.sh --cleanup-running-hours $cleanup_running_hours --cleanup-stopped-hours $cleanup_stopped_hours --cleanup-volumes $cleanup_volumes --cleanup-images $cleanup_images --verbose $verbose
+            cat << EOF > mail-body.txt
+            Cleaning stale containers on $NODE_NAME.
+            Please check console output at $BUILD_URL to view the results
+            EOF
+            case " $NODE_LABELS " in
+              *" tcwg-secondary-node "*)
+                # Only cleanup ssh-agent processes for secondary nodes.
+                ./tcwg-cleanup-stale-containers.sh --cleanup-running-hours 0 --cleanup-stopped-hours 0 --cleanup-ssh-agent-hours $cleanup_ssh_agent_hours --cleanup-volumes false --cleanup-images false --verbose $verbose || true
+                exit 0
+                ;;
+            esac
+
+            $WORKSPACE/tcwg-cleanup-stale-containers.sh --cleanup-running-hours $cleanup_running_hours --cleanup-stopped-hours $cleanup_stopped_hours --cleanup-ssh-agent-hours $cleanup_ssh_agent_hours --cleanup-volumes $cleanup_volumes --cleanup-images $cleanup_images --verbose $verbose
     publishers:
-        - email:
-            recipients: tcwg@linaro.org
+        - email-ext:
+            recipients: tcwg-validation@linaro.org
+            aborted: true
+            content-type: text
+            body: |
+              ${FILE,path="mail-body.txt"}
diff --git a/tcwg-cleanup-stale-results.yaml b/tcwg-cleanup-stale-results.yaml
new file mode 100644
index 0000000000..2111414048
--- /dev/null
+++ b/tcwg-cleanup-stale-results.yaml
@@ -0,0 +1,119 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-cleanup-stale-results.yaml.in and tcwg-cleanup-stale-results/tcwg-cleanup-stale-results.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts-master
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/master:refs/remotes/origin/master
+          branches:
+            - master
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-cleanup-stale-results
+    project-type: freestyle
+    defaults: global
+    properties:
+        - default-properties
+    parameters:
+        - choice:
+            name: cleanup_gc
+            choices:
+              - 'true'
+              - 'dryrun'
+              - 'false'
+            description: 'Cleanup the git repositories'
+        - choice:
+            name: cleanup_annex
+            choices:
+              - 'dryrun'
+              - 'true'
+              - 'false'
+            description: 'Cleanup the annex results files'
+        - bool:
+            name: verbose
+            default: 'false'
+            description: 'Whether to be verbose'
+    disabled: false
+    node: tcwg-bkp-01
+    concurrent: false
+    display-name: 'TCWG CCC Cleanup stale results'
+    workspace: workspace/tcwg-cleanup-stale-results
+    triggers:
+        - timed: '@daily'
+    scm:
+        - jenkins-scripts-master
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -ex
+
+            rm -rf artifacts
+            mkdir artifacts
+
+            ./jenkins-scripts/tcwg-cleanup-stale-results.sh \
+            --cleanup_gc $cleanup_gc \
+            --cleanup_annex $cleanup_annex \
+            --verbose $verbose
+
+            if [ x"$(cat list_annex.exist_but_not_referenced.txt | wc -l)" != x"0" ]; then
+              (
+                if [ "$cleanup_annex" = "dryrun" ]; then
+                  echo "# Cleanup-stale-results was run in DRYRUN mode."
+                  echo "# Please double check and run this script manually."
+                else
+                  echo "# Cleanup-stale-results executed the following"
+                fi
+                echo "#"
+                echo "# List of missing results :"
+                sed -e 's|^|#     |' list_annex.referenced_but_not_exist.txt
+                echo "#"
+                echo "# List of useless results :"
+                sed -e 's|^|rm -f |' list_annex.exist_but_not_referenced.txt
+                echo ""
+              ) > artifacts/email-body.txt
+              exit 1
+            fi
+
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+        - email-ext:
+            recipients: 'maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org'
+            content-type: text
+            body: |
+              ${FILE,path="artifacts/email-body.txt"}
+            failure: true
+            aborted: true
+# checksum: b82d7a10cb9e3dc101d3faaf2ecc565d
diff --git a/tcwg-cleanup-stale-results.yaml.in b/tcwg-cleanup-stale-results.yaml.in
new file mode 100644
index 0000000000..4ba3db60ae
--- /dev/null
+++ b/tcwg-cleanup-stale-results.yaml.in
@@ -0,0 +1,85 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-cleanup-stale-results
+    project-type: freestyle
+    defaults: global
+    properties:
+        - default-properties
+    parameters:
+        - choice:
+            name: cleanup_gc
+            choices:
+              - 'true'
+              - 'dryrun'
+              - 'false'
+            description: 'Cleanup the git repositories'
+        - choice:
+            name: cleanup_annex
+            choices:
+              - 'dryrun'
+              - 'true'
+              - 'false'
+            description: 'Cleanup the annex results files'
+        - bool:
+            name: verbose
+            default: 'false'
+            description: 'Whether to be verbose'
+    disabled: false
+    node: tcwg-bkp-01
+    concurrent: false
+    display-name: 'TCWG CCC Cleanup stale results'
+    workspace: workspace/tcwg-cleanup-stale-results
+    triggers:
+        - timed: '@daily'
+    scm:
+        - jenkins-scripts-master
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -ex
+
+            rm -rf artifacts
+            mkdir artifacts
+
+            ./jenkins-scripts/tcwg-cleanup-stale-results.sh \
+            --cleanup_gc $cleanup_gc \
+            --cleanup_annex $cleanup_annex \
+            --verbose $verbose
+
+            if [ x"$(cat list_annex.exist_but_not_referenced.txt | wc -l)" != x"0" ]; then
+              (
+                if [ "$cleanup_annex" = "dryrun" ]; then
+                  echo "# Cleanup-stale-results was run in DRYRUN mode."
+                  echo "# Please double check and run this script manually."
+                else
+                  echo "# Cleanup-stale-results executed the following"
+                fi
+                echo "#"
+                echo "# List of missing results :"
+                sed -e 's|^|#     |' list_annex.referenced_but_not_exist.txt
+                echo "#"
+                echo "# List of useless results :"
+                sed -e 's|^|rm -f |' list_annex.exist_but_not_referenced.txt
+                echo ""
+              ) > artifacts/email-body.txt
+              exit 1
+            fi
+
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+        - email-ext:
+            recipients: 'maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org'
+            content-type: text
+            body: |
+              ${FILE,path="artifacts/email-body.txt"}
+            failure: true
+            aborted: true
diff --git a/tcwg-cleanup-stale-results/tcwg-cleanup-stale-results.def b/tcwg-cleanup-stale-results/tcwg-cleanup-stale-results.def
new file mode 100644
index 0000000000..7902d045c0
--- /dev/null
+++ b/tcwg-cleanup-stale-results/tcwg-cleanup-stale-results.def
@@ -0,0 +1 @@
+-v JENKINS_SCRIPTS=master
diff --git a/tcwg-cleanup-stale-workspaces.yaml b/tcwg-cleanup-stale-workspaces.yaml
deleted file mode 100644
index 5bd6943192..0000000000
--- a/tcwg-cleanup-stale-workspaces.yaml
+++ /dev/null
@@ -1,104 +0,0 @@
-- job:
-    name: tcwg-cleanup-stale-workspaces
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-        - throttle:
-            max-per-node: 1
-            option: project
-        - build-blocker:
-            use-build-blocker: true
-            blocking-jobs:
-              - "tcwg-.*"
-            block-level: 'NODE'
-    parameters:
-        - string:
-            name: days
-            default: '3'
-            description: 'Delete workspace more then days old.  To effectively disable time check use 0.'
-        - bool:
-            name: dry_run
-            default: 'false'
-            description: 'Whether to do a dry-run'
-        - string:
-            name: workspace_top
-            default: '/home/tcwg-buildslave/workspace'
-            description: 'Top-level workspace directory.  Can be used to delete workspaces for specific jobs.  Do not override unless you understand what you are doing.'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Scripts branch to use'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: false
-    display-name: 'TCWG CCC Cleanup stale workspaces'
-    triggers:
-        - timed: '@daily'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-apm-01
-                - tcwg-apm-02
-                - tcwg-apm-03
-                - tcwg-apm-04
-                - tcwg-tk1-01
-                - tcwg-tk1-02
-                - tcwg-tk1-03
-                - tcwg-tk1-04
-                - tcwg-tx1-01
-                - tcwg-tx1-02
-                - tcwg-tx1-03
-                - tcwg-tx1-04
-                - tcwg-x86_64-build-01
-                - tcwg-x86_64-build-02
-                - tcwg-x86_64-build-03
-                - tcwg-x86_64-build-04
-                - tcwg-x86_64-build-05
-                - tcwg-x86_64-build-06
-                - tcwg-x86_64-build-07
-                - tcwg-x86_64-build-08
-                - tcwg-x86_64-dev-01
-                - tcwg-x86_64-dev-02
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            ./tcwg-cleanup-stale-workspaces.sh --days $days --dry_run $dry_run --workspace_top $workspace_top
-    publishers:
-        - email:
-            recipients: tcwg@linaro.org
diff --git a/tcwg-compare-results-gerrit.yaml b/tcwg-compare-results-gerrit.yaml
index 1f7a49730a..be5ad55353 100644
--- a/tcwg-compare-results-gerrit.yaml
+++ b/tcwg-compare-results-gerrit.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -20,7 +20,7 @@
     display-name: 'TCWG Gerrit Compare results'
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/gcc-compare-results.git
+            url: https://git.linaro.org/toolchain/gcc-compare-results.git
             refspec: ${GERRIT_REFSPEC}
             branches:
                 - ${GERRIT_BRANCH}
diff --git a/tcwg-compare-results.yaml b/tcwg-compare-results.yaml
index 86a5dafa36..020ad36652 100644
--- a/tcwg-compare-results.yaml
+++ b/tcwg-compare-results.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
                 - job-workspace
@@ -28,6 +28,10 @@
             default: '0.95'
             description: 'Pass threshold, below which the comparison returns an error'
         - string:
+            name: target_list
+            default:
+            description: 'List of targets to compare -- aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build'
+        - string:
             name: log_server
             default: dev-01.tcwglab:/home/tcwg-buildslave/logs
             description: 'Log_Server'
@@ -39,13 +43,17 @@
             name: cmp_version
             default: refs/heads/master
             description: 'Comparison scripts version to use'
+        - bool:
+            name: dryrun
+            default: false
+            description: 'Dry-run, do nothing, just print steps'
     disabled: false
     node: tcwg-x86_64-dev-01-short
     retry-count: 3
     display-name: 'TCWG AAA Compare results'
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/gcc-compare-results.git
+            url: https://git.linaro.org/toolchain/gcc-compare-results.git
             refspec: +refs/changes/*:refs/remotes/changes/*
             branches:
                 - ${cmp_version}
@@ -78,26 +86,33 @@
 
             trap "ssh ${log_server} rm -rf ${dest}" EXIT HUP INT QUIT TRAP KILL PIPE TERM
 
-            LOGSDIR=${WORKSPACE}/artifacts/logs
+            if ! $dryrun; then
+                LOGSDIR=${WORKSPACE}/artifacts/logs
 
-            mkdir -p ${LOGSDIR}
+                mkdir -p ${LOGSDIR}
 
-            ssh ${log_server} mkdir -p ${dest}
-            scp ./compare_jobs.sh \
-                ./compare_tests \
-                ./compare_dg_tests.pl \
-                ./unstable-tests.txt ${log_server}:${dest} || status=1
-            ssh ${log_server} bash ${dest}/compare_jobs.sh \
-                -pass-thresh ${pass_thresh} \
-                $basedir/$ref_logs $basedir/$new_logs || status=1
+                ssh ${log_server} mkdir -p ${dest}
+                scp ./compare_jobs.sh \
+                    ./compare_tests \
+                    ./compare_dg_tests.pl \
+                    ./host-hw-dependent-tests.txt \
+                    ./unstable-tests.txt ${log_server}:${dest} || status=1
+                ssh ${log_server} bash ${dest}/compare_jobs.sh \
+                    -pass-thresh ${pass_thresh} \
+                    $basedir/$ref_logs $basedir/$new_logs ${target_list} || status=1
 
-            # Copy the generated reports
-            scp ${log_server}:${dest}/\*-diff-\*.txt ${LOGSDIR} || true
-            scp ${log_server}:${dest}/\*.html report.css ${LOGSDIR} || true
+                # Copy the generated reports
+                scp ${log_server}:${dest}/\*-diff-\*.txt ${LOGSDIR} || true
+                scp ${log_server}:${dest}/\*.html report.css ${LOGSDIR} || true
 
-            # Print results in console
-            if $show_results; then
-                cat ${LOGSDIR}/*.txt
+                # Print results in console
+                if $show_results; then
+                    cat ${LOGSDIR}/*.txt
+                fi
+            else
+                echo DRYRUN: compare_jobs.sh \
+                     -pass-thresh ${pass_thresh} \
+                     $basedir/$ref_logs $basedir/$new_logs ${target_list}
             fi
 
             exit $status
diff --git a/tcwg-dev-build.yaml.in b/tcwg-dev-build.yaml.in
new file mode 100644
index 0000000000..b1f0c449c3
--- /dev/null
+++ b/tcwg-dev-build.yaml.in
@@ -0,0 +1,282 @@
+#include tcwg/default.yaml.inc
+
+- job:
+#if TOOLCHAIN_llvm && HOST_windows
+    name: tcwg-llvm_woa-build
+#else
+    name: tcwg-#{TOOLCHAIN}-build
+#endif
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+#if TOOLCHAIN_gnu
+        - string:
+            name: release_name
+            default: default
+            description: 'Name of release series; default is "date +%Y%m%d-%H_%M_%S"'
+#elif TOOLCHAIN_llvm
+        - string:
+            name: release
+# if !HOST_windows
+            default: ''
+            description: 'Release number. Ex. 4.0.1'
+# else
+            default: 'main'
+            description: 'Release build ID (13.0.0-rc1, 13.0.0) or git branch/sha1'
+# endif
+#endif
+#if TOOLCHAIN_gnu
+        - string:
+            name: buildnumber
+            default: 0
+            description: 'Build number in release series'
+        - choice:
+            name: target
+            choices:
+              - aarch64-linux-gnu
+              - aarch64-elf
+              - aarch64-linux-gnu_ilp32
+              - aarch64_be-elf
+              - aarch64_be-linux-gnu
+              - arm-eabi
+              - arm-linux-gnueabi
+              - arm-linux-gnueabihf
+              - armeb-eabi
+              - armeb-linux-gnueabi
+              - armeb-linux-gnueabihf
+              - armv8l-linux-gnueabihf
+              - native
+            description: 'Target'
+        - choice:
+            name: version
+            choices:
+              - default
+              - latest-rel
+              - master
+              - gcc8
+              - gcc7
+              - gcc6
+              - gcc5
+              - gcc4_9
+            description: 'Toolchain version; should match a supported ABE config'
+#elif TOOLCHAIN_llvm
+# if !HOST_windows
+        - string:
+            name: candidate
+            default: 'git-ref=main'
+            description: 'RC number. Ex. 1, 2, final'
+        - string:
+            name: toolchain
+            default: ''
+            description: 'URL of the toolchain to use. This needs to be a tarball with a /bin directory inside with either GCC or LLVM from make install'
+        - string:
+            name: compiler
+            default: 'clang'
+            description: 'Override the default system compiler. Only used if "toolchain" is empty.'
+        - bool:
+            name: useninja
+            default: true
+            description: 'Whether or not to use ninja for the release (works for releases > 9.0.0)'
+        - bool:
+            name: testsuite
+            default: true
+            description: 'Whether or not to trigger a test-suite with this build.'
+# else
+        - choice:
+            name: build_type
+            choices:
+              - test
+              - release
+# endif
+#endif
+#if TOOLCHAIN_gnu
+        - choice:
+            name: distro
+            choices:
+              - lts_1
+              - lts
+            description: 'Ubuntu distro to use for build environment'
+#elif TOOLCHAIN_llvm && !HOST_windows
+        - string:
+            name: build_container_tag
+            default: 'lts_1'
+            description: 'Type of image to use in the container: lts_1, lts, ...'
+#endif
+        - label:
+            name: builder
+#if HOST_windows
+            default: tcwg-surface
+#else
+            default: tcwg-x86_64-build
+#endif
+            description: 'Jenkins label to build on; determines host of the toolchain'
+#if TOOLCHAIN_gnu
+        - file:
+            name: manifest.txt
+            description: 'Use provided manifest file (which may override above settings)'
+        - bool:
+            name: verbose
+            default: false
+            description: 'Whether to be verbose'
+#endif
+        - string:
+            name: scripts_branch
+#if TOOLCHAIN_gnu || HOST_windows
+            default: master
+#elif TOOLCHAIN_llvm
+            default: tested
+#endif
+            description: 'Scripts revision to use'
+#if TOOLCHAIN_gnu
+        - text:
+            name: extra_options
+            default:
+            description: 'Extra options to pass to docker-run'
+#endif
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG AAA #{TOOLCHAIN} #{HOST} Build'
+#if HOST_windows
+    # Save bytes in limited 250-byte windows PATHs
+    workspace: ws/tdb$EXECUTOR_NUMBER
+#endif
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+#if TOOLCHAIN_gnu
+            timeout: 300
+#else TOOLCHAIN_llvm
+            timeout: 1800
+#endif
+        - timestamps
+#if HOST_linux
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#endif
+        - build-name:
+#if TOOLCHAIN_gnu
+            name: '#$BUILD_NUMBER-$version-$release_name-$buildnumber/$builder-$target'
+#elif TOOLCHAIN_llvm && !HOST_windows
+            name: '#$BUILD_NUMBER-$release-$candidate/$builder'
+#elif TOOLCHAIN_llvm && HOST_windows
+            name: '#$BUILD_NUMBER-$release/$builder'
+#endif
+        - workspace-cleanup
+    builders:
+#if TOOLCHAIN_gnu
+        - shell: |
+            #!/bin/bash
+            set -ex
+            abe_branch=tested
+            eval $extra_options
+            ./jenkins-scripts/docker-run.sh --distro "$distro" \
+            -- \
+            ./jenkins-scripts/tcwg-dev-build.sh \
+            --abe_branch "$abe_branch" \
+            --release_name "$release_name" \
+            --buildnumber "$buildnumber" \
+            --target "$target" \
+            --version "$version" \
+            --manifest "$(pwd)/manifest.txt" \
+            --verbose "$verbose"
+#elif TOOLCHAIN_llvm
+# if HOST_linux
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            rm -rf artifacts
+            mkdir artifacts
+
+            # Until we figure out a way to use heavy-job with different weights
+            # based on the builder, we hardcode to one.
+            buildjobs=1
+
+            # Select builder arch/type/container
+            case ${builder} in
+                tcwg-x86_64-build|tcwg-x86_64-cam)
+                    builder_arch=amd64
+                    buildjobs=8 # 1 slot is 32/4
+                    ;;
+                tcwg-tk1_32-build|tcwg-llvm_tk1-*)
+                    builder_arch=armhf
+                    buildjobs=3 # TK1s only have 4 cores and little RAM
+                    ;;
+                tcwg-jade*)
+                    builder_arch=arm64
+                    buildjobs=64 # Jades have lots of cores
+                    ;;
+                *) echo "ERROR: Unsupported label: $builder"; exit 1 ;;
+            esac
+
+            # Sets the system compiler
+            compiler_option=''
+            if [ "${toolchain:+set}" != "set" ] && [ "${compiler:+set}" = "set" ]; then
+              compiler_option="--compiler=${compiler}"
+            fi
+
+            # Trigger toolchain name
+            toolchain_file="${WORKSPACE}/llvm.params.toolchain"
+            toolchain_file_option=""
+            if ${twostage} || ${testsuite}; then
+              toolchain_file_option="--toolchain-file=$toolchain_file"
+            fi
+
+            # Setup job parameters and run (for now, just pretend to run)
+            ret=0
+            ./jenkins-scripts/docker-run.sh \
+                --arch ${builder_arch} \
+                --distro ${build_container_tag} \
+                -- \
+                bash -x ./jenkins-scripts/tcwg-llvm-release.sh \
+                --workspace=${WORKSPACE} \
+                --release=${release} \
+                --candidate=${candidate} \
+                --buildjobs=${buildjobs} \
+                --toolchain=${toolchain} \
+                --use-ninja=${useninja} \
+                $toolchain_file_option $compiler_option \
+                > artifacts/release.log 2>&1 || ret=$?
+
+            if [ $ret -ne 0 ]; then
+                touch llvm.failed
+            fi
+
+            # Chained jobs
+            if ${testsuite}; then
+              echo "target_list=$builder" > llvm.params.testsuite
+              cat $toolchain_file >> llvm.params.testsuite
+            fi
+
+            # failure is handled by conditional step on llvm.failed
+            # so that the testsuite job is always triggered
+            exit 0
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: llvm.params.testsuite
+            steps:
+                - trigger-builds:
+                    - project: 'tcwg-llvm-testsuite'
+                      property-file: llvm.params.testsuite
+                      current-parameters: true
+                      block: true
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: llvm.failed
+            steps:
+                - shell: "exit 1"
+# elif HOST_windows
+      - batch: |
+          jenkins-scripts\tcwg-llvm-release.bat %release% %build_type%
+# endif
+#endif
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
diff --git a/tcwg-dev-build/tcwg-gnu-build.def b/tcwg-dev-build/tcwg-gnu-build.def
new file mode 100644
index 0000000000..8c93ea2aad
--- /dev/null
+++ b/tcwg-dev-build/tcwg-gnu-build.def
@@ -0,0 +1,2 @@
+-v TOOLCHAIN=gnu
+-v HOST=linux
diff --git a/tcwg-dev-build/tcwg-llvm-build.def b/tcwg-dev-build/tcwg-llvm-build.def
new file mode 100644
index 0000000000..20e96f2b1a
--- /dev/null
+++ b/tcwg-dev-build/tcwg-llvm-build.def
@@ -0,0 +1,2 @@
+-v TOOLCHAIN=llvm
+-v HOST=linux
diff --git a/tcwg-dev-build/tcwg-llvm_woa-build.def b/tcwg-dev-build/tcwg-llvm_woa-build.def
new file mode 100644
index 0000000000..b94438be5a
--- /dev/null
+++ b/tcwg-dev-build/tcwg-llvm_woa-build.def
@@ -0,0 +1,2 @@
+-v TOOLCHAIN=llvm
+-v HOST=windows
diff --git a/tcwg-dev-builds.yaml.in b/tcwg-dev-builds.yaml.in
new file mode 100644
index 0000000000..ead11899bd
--- /dev/null
+++ b/tcwg-dev-builds.yaml.in
@@ -0,0 +1,301 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-#{TOOLCHAIN}-builds
+    project-type: multijob
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+      - string:
+          name: release_name
+          default: test
+          description: 'Name of release series'
+      - string:
+          name: buildnumber
+          default: 0
+          description: 'Build number in release series'
+      - choice:
+          name: version
+          choices:
+            - latest-rel
+            - master
+          description: 'Toolchain version; should match a supported ABE config'
+      - bool:
+          name: host_x86_64_target_aarch64
+          default: true
+      - bool:
+          name: host_x86_64_target_armhf
+          default: true
+      - bool:
+          name: host_aarch64_target_native
+          default: true
+      - bool:
+          name: host_aarch64_target_armhf
+          default: true
+      - bool:
+          name: host_armhf_target_native
+          # FIXME: https://linaro.atlassian.net/browse/STG-5042
+          default: false
+      - choice:
+          name: distro
+          choices:
+            - lts_1
+            - lts
+          description: 'Ubuntu distro to use for build environment'
+      - bool:
+          name: publish
+          default: false
+          description: 'Whether to publish to snapshots.linaro.org'
+      - bool:
+          name: verbose
+          default: true
+          description: 'Whether to be verbose'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG AAA GNU Builds'
+    wrappers:
+      - build-name:
+          name: '#$BUILD_NUMBER-$version-$release_name-$buildnumber'
+      - timeout:
+          timeout: 600
+      - timestamps
+      - workspace-cleanup
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          if $verbose; then
+            set -x
+          fi
+
+          if [ x"$(ls)" != x"" ]; then
+            echo "ERROR: Dirty workspace"
+            exit 1
+          fi
+          
+          cat > build-params.txt <<EOF
+          release_name=$release_name
+          buildnumber=$buildnumber
+          version=$version
+          distro=$distro
+          EOF
+      - multijob:
+          name: Build
+          projects:
+            - name: tcwg-#{TOOLCHAIN}-build
+              alias: "host_x86_64_target_aarch64"
+              enable-condition: "$host_x86_64_target_aarch64"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-x86_64-build"
+              property-file: build-params.txt
+              predefined-parameters: "target=aarch64-linux-gnu"
+            - name: tcwg-#{TOOLCHAIN}-build
+              alias: "host_x86_64_target_armhf"
+              enable-condition: "$host_x86_64_target_armhf"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-x86_64-build"
+              property-file: build-params.txt
+              predefined-parameters: "target=arm-linux-gnueabihf"
+            - name: tcwg-#{TOOLCHAIN}-build
+              alias: "host_aarch64_target_aarch64"
+              enable-condition: "$host_aarch64_target_native"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-armv8_64"
+              property-file: build-params.txt
+              predefined-parameters: "target=native"
+            - name: tcwg-#{TOOLCHAIN}-build
+              alias: "host_aarch64_target_armhf"
+              enable-condition: "$host_aarch64_target_armhf"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-armv8_64"
+              property-file: build-params.txt
+              predefined-parameters: "target=arm-linux-gnueabihf"
+            - name: tcwg-#{TOOLCHAIN}-build
+              alias: "host_armhf_target_native"
+              enable-condition: "$host_armhf_target_native"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-armv7"
+              property-file: build-params.txt
+              predefined-parameters: "target=native"
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          if $verbose; then
+            set -x
+          fi
+          
+          env | grep "TCWG_#{TOOLCHAIN2}_BUILD"
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_#{TOOLCHAIN2}_BUILD
+          comparator: greater-than-equal
+          rhs: 1
+          steps:
+            - copyartifact:
+                project: tcwg-#{TOOLCHAIN}-build
+                which-build: specific-build
+                # Note that $TCWG_#{TOOLCHAIN2}_BUILD_BUILD_NUMBER points to the last
+                # build (i.e., it's the same as $TCWG_#{TOOLCHAIN2}_BUILD_5_BUILD_NUMBER
+                # in a full 5-configuration build).  At the same time,
+                # $TCWG_#{TOOLCHAIN2}_BUILD_nnn_BUILD_NUMBER variables are defined only
+                # when multiple builds were triggered.
+                # We need to use $TCWG_#{TOOLCHAIN2}_BUILD_BUILD_NUMBER here to correctly
+                # handle single-toolchain builds.
+                build-number: $TCWG_#{TOOLCHAIN2}_BUILD_BUILD_NUMBER
+                target: tcwg-#{TOOLCHAIN}-build-1
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_#{TOOLCHAIN2}_BUILD
+          comparator: greater-than-equal
+          rhs: 2
+          steps:
+            - copyartifact:
+                project: tcwg-#{TOOLCHAIN}-build
+                which-build: specific-build
+                build-number: $TCWG_#{TOOLCHAIN2}_BUILD_1_BUILD_NUMBER
+                target: tcwg-#{TOOLCHAIN}-build-2
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_#{TOOLCHAIN2}_BUILD
+          comparator: greater-than-equal
+          rhs: 3
+          steps:
+            - copyartifact:
+                project: tcwg-#{TOOLCHAIN}-build
+                which-build: specific-build
+                build-number: $TCWG_#{TOOLCHAIN2}_BUILD_2_BUILD_NUMBER
+                target: tcwg-#{TOOLCHAIN}-build-3
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_#{TOOLCHAIN2}_BUILD
+          comparator: greater-than-equal
+          rhs: 4
+          steps:
+            - copyartifact:
+                project: tcwg-#{TOOLCHAIN}-build
+                which-build: specific-build
+                build-number: $TCWG_#{TOOLCHAIN2}_BUILD_3_BUILD_NUMBER
+                target: tcwg-#{TOOLCHAIN}-build-4
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_#{TOOLCHAIN2}_BUILD
+          comparator: greater-than-equal
+          rhs: 5
+          steps:
+            - copyartifact:
+                project: tcwg-#{TOOLCHAIN}-build
+                which-build: specific-build
+                build-number: $TCWG_#{TOOLCHAIN2}_BUILD_4_BUILD_NUMBER
+                target: tcwg-#{TOOLCHAIN}-build-5
+      - linaro-publish-token
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          if $verbose; then
+            set -x
+          fi
+
+          mkdir out
+
+          i="$TRIGGERED_BUILD_RUN_COUNT_TCWG_#{TOOLCHAIN2}_BUILD"
+          while [ $i -gt 0 ]; do
+            rsync -a tcwg-#{TOOLCHAIN}-build-$i/artifacts/binaries/ out/
+            i=$(($i-1))
+          done
+
+          if [ x"$(ls out/ | wc -l)" != x"1" ]; then
+            echo "ERROR: not a single directory in builds artifacts:"
+            ls -l out/
+            exit 1
+          fi
+          out_release=$(set +f; echo out/*-$release_name-$buildnumber)
+          if ! [ -d "$out_release" ]; then
+            echo "ERROR: no $out_release directory in builds artifacts:"
+            ls -l out/
+            exit 1
+          fi
+
+          cat > HEADER-latest-rel.textile <<EOF
+          h4. Linaro Toolchain Upstream Integration Builds - Stable $release_name-$buildnumber
+          
+          These builds are made from latest release branches of GNU toolchain
+           components.
+           See included manifests for details.
+
+          These builds are not for production environments.
+           We will do our best to investigate problems reported via
+           "Linaro Bugzilla":https://bugs.linaro.org/ and issue trackers of
+           upstream projects.
+          EOF
+
+          cat > HEADER-master.textile <<EOF
+          h4. Linaro Toolchain Upstream Integration Builds - *UNSTABLE* $release_name-$buildnumber
+          
+          These builds are made from whatever happened to be in master branches
+           of GNU toolchain components at the moment.
+           See included manifests for details.
+
+          These builds are for experimental environments only.  They *will*
+           break your stuff and drink all your beer.  You have been warned.
+           We will do our best to investigate problems reported via
+           "Linaro Bugzilla":https://bugs.linaro.org/ and issue trackers of
+           upstream projects.
+          EOF
+
+          cp HEADER-$version.textile HEADER.textile
+          cp HEADER.textile "$out_release/"
+
+          wget https://git.linaro.org/ci/publishing-api.git/plain/linaro-cp.py -O ./linaro-cp.py
+          linaro_cp_opts=""
+          if ! $publish; then
+            linaro_cp_opts="--dry-run"
+          fi
+          time python3 ./linaro-cp.py --api_version 3 $linaro_cp_opts \
+            "$out_release/" "gnu-toolchain/$(basename "$out_release")"
+
+- job:
+    name: tcwg-#{TOOLCHAIN}-builds-monthly
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: false
+    display-name: 'TCWG AAA GNU Builds Monthly Trigger'
+    triggers:
+      - timed: '@weekly'
+    wrappers:
+      - timeout:
+          timeout: 300
+      - timestamps
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          set -x
+
+          # Release name is Year.Month-Week_of_month
+          buildnumber=$((($(date +%e)+6)/7))
+          publish=false
+          if [ x"$buildnumber" = x"1" ]; then
+            publish=true
+          fi
+          cat > build-params.txt <<EOF
+          release_name=$(date +%Y.%m)
+          buildnumber=$buildnumber
+          publish=$publish
+          EOF
+      - trigger-builds:
+          - project: tcwg-#{TOOLCHAIN}-builds
+            property-file: build-params.txt
+            predefined-parameters: |
+              version=latest-rel
+              distro=lts_1
+          - project: tcwg-#{TOOLCHAIN}-builds
+            property-file: build-params.txt
+            predefined-parameters: |
+              version=master
+              distro=lts
diff --git a/tcwg-dev-builds/tcwg-gnu-builds.def b/tcwg-dev-builds/tcwg-gnu-builds.def
new file mode 100644
index 0000000000..b26e58c12f
--- /dev/null
+++ b/tcwg-dev-builds/tcwg-gnu-builds.def
@@ -0,0 +1,2 @@
+-v TOOLCHAIN=gnu
+-v TOOLCHAIN2=GNU
diff --git a/tcwg-gcc-bisect.yaml b/tcwg-gcc-bisect.yaml
index 0fa0695da0..1210b2ab03 100644
--- a/tcwg-gcc-bisect.yaml
+++ b/tcwg-gcc-bisect.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -39,13 +39,17 @@
             default: ''
             description: '--with-mode GCC configure option (arm or thumb)'
         - string:
-            name: GOOD
+            name: GOODGIT
             default: ''
-            description: 'Good SVN revision'
+            description: 'Good GIT revision'
         - string:
-            name: BAD
+            name: BADGIT
             default: ''
-            description: 'Bad SVN revision'
+            description: 'Bad GIT revision'
+        - string:
+            name: build_container_tag
+            default: 'lts_1'
+            description: 'Distro to use on the builder: lts_1, lts, ...'
     disabled: false
     node: tcwg-x86_64-cam
     concurrent: true
@@ -59,7 +63,7 @@
             users:
                 - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
         - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="GOOD"}-${ENV,var="BAD"}-${ENV,var="TARGET"}'
+            name: '#${BUILD_NUMBER}-${ENV,var="GOODGIT"}-${ENV,var="BADGIT"}-${ENV,var="TARGET"}'
     builders:
         - shell: |
             #!/bin/bash
@@ -69,21 +73,36 @@
             shell="/bin/bash"
 
             rm -rf jenkins-scripts
-            git clone --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
+            git clone --depth 1 https://git.linaro.org/toolchain/jenkins-scripts
+
             # Configure git user info to make git stash happy. It is
             # used during the second build, because the sources are
             # already present.
             git config --global user.email "tcwg-buildslave@linaro.org"
             git config --global user.name "TCWG BuildSlave"
 
+            # Start build container
+            # Force amd64 arch to workaround a bug in jenkins-helpers.sh
+            bash -x ./jenkins-scripts/start-container-docker.sh --arch amd64 --node $NODE_NAME --distro ${build_container_tag} --prefix build_ > build-container.sh
+
+            # Define build_CONTAINER_RSH and build_container_cleanup
+            . ./build-container.sh
+
+            # Make sure to cleanup build container if something goes
+            # wrong when preparing the test environment
+            trap "cleanup_all_containers" EXIT
+
             # Jenkins puts the parameters in the environment
-            ${shell} ${WORKSPACE}/jenkins-scripts/abe-bisect.sh
+            ${build_CONTAINER_RSH} "cd ${WORKSPACE} && EXP=$EXP TESTNAME=$TESTNAME TARGET=$TARGET CPU=$CPU FPU=$FPU MODE=$MODE GOODGIT=$GOODGIT BADGIT=$BADGIT BUILD_URL=$BUILD_URL ${shell} ${WORKSPACE}/jenkins-scripts/abe-bisect.sh"
     publishers:
-        - email:
-            recipients: 'christophe.lyon@linaro.org'
         - email-ext:
             recipients: 'christophe.lyon@linaro.org'
+            content-type: text
+            body: |
+              ${FILE,path="mail-body.txt"}
+            aborted: true
             send-to:
               requester
               recipients
             always: true
+
diff --git a/tcwg-gcc-idle.yaml b/tcwg-gcc-idle.yaml
deleted file mode 100644
index b7fbc2d77c..0000000000
--- a/tcwg-gcc-idle.yaml
+++ /dev/null
@@ -1,145 +0,0 @@
-- job:
-    name: tcwg-idle-gcc-trunk-build
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/linaro_binutils-2_25-branch gcc=gcc.git~linaro/gcc-5-branch glibc=glibc.git~release/2.21/master'
-        - string:
-            name: host_x86_64_languages
-            default: 'default'
-            description: 'Languages to build for x86_64-hosted toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: host_aarchXX_languages
-            default: 'default'
-            description: 'Languages to build for AArchXX-hosted toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:logs-bkk16
-            description: 'Log_Server'
-        - string:
-            name: targets
-            default: 'cross_main cross_aux'
-            description: 'Which target toolchains to build'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/bkk16
-            description: 'ABE revision to test'
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number or empty string to skip comparison'
-    disabled: true
-    node: tcwg-x86_64-dev-01
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG BKK16 Idle GCC Trunk Build'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-    triggers:
-        - timed: '0 * * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            i=$(wget -q -O - https://ci.linaro.org/label/tcwg-x86_64-build/api/xml | grep -o "<idleExecutors>.*</idleExecutors>" | grep -o "[0-9]*")
-            t=$(wget -q -O - https://ci.linaro.org/label/tcwg-x86_64-build/api/xml | grep -o "<totalExecutors>.*</totalExecutors>" | grep -o "[0-9]*")
-
-            if [ "$i" -gt 0 ] ; then
-                gcc_curr_rev=$(git rev-parse HEAD)
-                log_prefix="${JOB_NAME}"
-
-                cat << EOF > buildfarm_parameters
-            override=glibc=glibc.git~master gcc=gcc.git~$gcc_curr_rev $override
-            log_name=${JOB_NAME}-${BUILD_NUMBER}/\$builder_type.\$target
-            host_x86_64_languages=${host_x86_64_languages}
-            host_aarchXX_languages=${host_aarchXX_languages}
-            log_server=${log_server}
-            targets=$targets
-            abe_branch=${abe_branch}
-            runtests=yes
-            try_bootstrap=true
-            rebuild=false
-            dont_fail=true
-            run_benchmark=false
-            host_x86_64_excludecheck=
-            host_aarchXX_excludecheck=
-            EOF
-
-                if [ x"${ref_build}" != x ] ; then
-                    case "${ref_build}" in
-                        lastSuccess)
-                            ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber")
-                            ;;
-                        previous)
-                            ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber")
-                            ;;
-                        [1-9]*([0-9]))
-                            ref_build_num="${ref_build}"
-                            ;;
-                        *)
-                            echo "ERROR: Cannot handle ref_build: ${ref_build}"
-                            exit 1
-                            ;;
-                    esac
-
-                    # Scrambled indentation because of here-doc
-                    cat << EOF > compare_results_parameters
-            ref_logs=${log_prefix}-${ref_build_num}
-            new_logs=${log_prefix}-${BUILD_NUMBER}
-            log_server=${log_server}
-            abe_branch=${abe_branch}
-            EOF
-                fi
-            fi
-        - trigger-builds:
-            - project: tcwg-buildfarm
-              property-file: buildfarm_parameters
-              block: true
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: compare_results_parameters
-            steps:
-                - trigger-builds:
-                    - project: tcwg-compare-results
-                      property-file: compare_results_parameters
-                      block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-             recipients: 'christophe.lyon@linaro.org'
diff --git a/tcwg-gcc-release-automation.yaml b/tcwg-gcc-release-automation.yaml
deleted file mode 100644
index c423ba7646..0000000000
--- a/tcwg-gcc-release-automation.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: tcwg-gcc-release-automation
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 10
-            num-to-keep: 10
-    parameters:
-        - choice:
-            name: tag_kind
-            choices:
-                - snapshot
-                - candidate
-                - release
-            description: 'Type of release to do.'
-        - string:
-            name: spin
-            default: ''
-            description: 'Spin number'
-        - string:
-            name: gcc_ref
-            default: ''
-            description: 'GCC tag or branch name (like linaro-6.3-2017.03, origin/linaro/gcc-6-branch)'
-        - string:
-            name: date
-            default: ''
-            description: 'snapshot or release date (yyyy.mm)'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/tested
-            description: 'ABE branch to use.'
-    disabled: false
-    node: tcwg-x86_64-dev-01
-    concurrent: true
-    display-name: 'TCWG GCC Release Automation'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - refs/heads/master
-            basedir: gcc_src
-            per-build-tag: false
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-            clean:
-                before: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/tcwg-release-tools
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - refs/heads/automation
-            basedir: tcwg-release-tools
-            per-build-tag: false
-            wipe-workspace: false
-            clean:
-                before: true
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="tag"}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-
-            pushd gcc_src
-
-            # Git/Gerrit config
-            git config --local user.name "TCWG Automation"
-            git config --local user.email linaro-toolchain@lists.linaro.org
-            if git remote | grep -q gerrit; then
-              git remote rm gerrit
-            fi
-            git remote add gerrit ssh://tcwg-buildslave@review.linaro.org:29418/toolchain/gcc
-            git remote update
-
-            FLAGS="-t $gcc_ref -e gerrit"
-            [ "${spin:+set}" = "set" ] && FLAGS+=" $spin"
-            [ "${date:+set}" = "set" ] && FLAGS+=" -d $date"
-
-            case "$tag_kind" in
-                snapshot)  FLAGS+=" -S" ; dir_suffix="-snap";;
-                candidate) FLAGS+=" -r" ;;
-                release)   FLAGS+=" -R" ;;
-                *) echo "ERROR: tag_king is missing"; exit 1 ;;
-            esac
-
-            ${WORKSPACE}/tcwg-release-tools/tcwg-release-tag.sh $FLAGS
-
-            # Pick up the created tag.
-            tag=$(git describe --abbrev=0)
-
-            case ${tag} in
-              *-4\.*) toolchainconf="gcc4_9" ;;
-              *-5\.*) toolchainconf="gcc5" ;;
-              *-6\.*) toolchainconf="gcc6" ;;
-              *-7\.*) toolchainconf="gcc7" ;;
-              *) echo "ERROR: Bad tag: ${tag}"; exit 1 ;;
-            esac
-
-            # Remove linaro-[snapshot-] prefix
-            upload_dir=${tag#*ro-}
-            upload_dir="/home/tcwg-buildslave/releases/sources/${upload_dir#*ot-}$dir_suffix"
-
-            popd 1>/dev/null
-
-            cat << EOF > ${WORKSPACE}/buildfarm_parameters
-            override=gcc=gcc.git~$tag --extraconfigdir ../config/$toolchainconf
-            log_name=${JOB_NAME}-${tag}-${BUILD_NUMBER}/\${builder_type}.\$target
-            abe_branch=$abe_branch
-            EOF
-
-            cat << EOF > ${WORKSPACE}/env.properties
-            tag=$tag
-            toolchainconf=$toolchainconf
-            upload_dir=$upload_dir
-            EOF
-        - trigger-builds:
-            - project: tcwg-buildfarm
-              property-file: buildfarm_parameters
-              block: true
-        - inject:
-            properties-file: ${WORKSPACE}/env.properties
-        - shell: |
-            #!/bin/bash
-            set -ex
-
-            pushd /home/tcwg-buildslave/logs/${JOB_NAME}-${tag}-${BUILD_NUMBER}
-
-            mkdir -p $upload_dir
-            for i in * ; do
-                cp ${i}/gcc-linaro-*-manifest.txt ${upload_dir}/${i}-gcc-${tag}-manifest.txt
-            done
-
-            popd 1>/dev/null
-        - trigger-builds:
-            - project: tcwg-make-source-tarball
-              property-file: ${WORKSPACE}/env.properties
-              block: true
-            - project: tcwg-make-and-test-release
-              property-file: ${WORKSPACE}/env.properties
-              predefined-parameters: |
-                  gcc_src=gcc.git~$tag
-                  toolchain_config=$toolchainconf
-                  abe_branch=$abe_branch
-              block: true
-    publishers:
-        - email:
-            recipients: 'yvan.roux@linaro.org'
-        - workspace-cleanup:
-            clean-if:
-                - success: true
-                - unstable: false
-                - failure: false
-                - aborted: false
-                - not-built: false
-
diff --git a/tcwg-gdb.yaml b/tcwg-gdb.yaml
deleted file mode 100644
index ea0d109fd2..0000000000
--- a/tcwg-gdb.yaml
+++ /dev/null
@@ -1,151 +0,0 @@
-- job:
-    name: tcwg-gdb
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: gdb_rev
-            default: 'refs/remotes/origin/master'
-            description: 'gdb revision to build'
-        - string:
-            name: target_list
-            default: 'aarch64-linux-gnu aarch64_be-linux-gnu aarch64-none-elf aarch64_be-none-elf arm-linux-gnueabi arm-linux-gnueabihf armv8l-linux-gnueabihf arm-none-eabi armeb-linux-gnueabihf tcwg-x86_64-cam tcwg-x86_32-build tcwg-apm_64-build tcwg-apm_32-build tcwg-tk1_32-build'
-            description: 'List of targets to test'
-        - string:
-            name: bfd_list
-            default: '--enable-64-bit-bfd=no --enable-64-bit-bfd=yes'
-            description: 'Type of BFD to enable: --enable-64-bit-bfd=yes --enable-64-bit-bfd=no'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Jenkins-scripts branch to use'
-        - bool:
-            name: dont_fail
-            default: false
-            description: 'Do not fail the build'
-        - string:
-            name: log_name
-            default: '${JOB_NAME}-${BUILD_NUMBER}/${builder_type}.$target.$bfd'
-            description: 'Logname directory on logserver'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:/home/tcwg-buildslave/logs
-            description: 'Log_Server'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG BBB GDB'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/binutils-gdb.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            branches:
-                - ${gdb_rev}
-            skip-tag: true
-            shallow-clone: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/binutils-gdb.git
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-cam
-                - tcwg-x86_32-build
-                - tcwg-apm_64-build
-                - tcwg-apm_32-build
-                - tcwg-tk1_32-build
-        - axis:
-            type: dynamic
-            name: bfd
-            values:
-                - bfd_list
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        combination-filter: |
-            ((label==~/tcwg-x86_.*/) && ! (target==~/tcwg-.*/)) || (target==label)
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="gdb_rev"}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            rm -rf jenkins-scripts
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
-
-            ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh
-            . ./build-container.sh
-            BUILD_SHELL="build_container_exec bash"
-            $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a"
-
-            builder_type=$(print_type_for_label $label)
-
-            # Remove container on exit
-            trap "build_container_cleanup" EXIT HUP INT QUIT TRAP KILL PIPE TERM
-
-            case $target in
-                tcwg-*) target_opt="" ;;
-                *) target_opt="--target $target" ;;
-            esac
-
-            rm -rf build-$target || true
-            mkdir -p build-$target
-            cd build-$target
-            result=0
-            jobs=$(nproc --all)
-            echo BUILD STARTED $(date)
-            echo WORKSPACE: ${WORKSPACE}
-
-            # For the moment, only build gdb (do not run the tests).
-            # Do this in a different subdir.
-            # GDB is no longer supported on arm-vxworks
-            case ${target} in
-              arm-vxworks) ;;
-              *)
-                ${BUILD_SHELL} -c "mkdir build-gdb && cd build-gdb && ../../configure --with-gnu-ld --enable-plugins --enable-tui --disable-gas --disable-binutils --disable-ld --disable-gold --disable-gprof $target_opt ${bfd}"
-                ${BUILD_SHELL} -c "cd build-gdb && make all -j$jobs"
-                ;;
-            esac
-
-            echo BUILD FINISHED $(date)
-
-            # Cleanup to save disk space
-            cd ..
-            du -sh build-$target
-            rm -rf build-$target || true
-
-            if $dont_fail; then
-                result="0"
-            fi
-            exit $result
-    publishers:
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org,yao.qi@linaro.org'
-            matrix-trigger: only-parent
diff --git a/tcwg-gnu-build.yaml b/tcwg-gnu-build.yaml
new file mode 100644
index 0000000000..82936b829f
--- /dev/null
+++ b/tcwg-gnu-build.yaml
@@ -0,0 +1,141 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-dev-build.yaml.in and tcwg-dev-build/tcwg-gnu-build.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-gnu-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - string:
+            name: release_name
+            default: default
+            description: 'Name of release series; default is "date +%Y%m%d-%H_%M_%S"'
+        - string:
+            name: buildnumber
+            default: 0
+            description: 'Build number in release series'
+        - choice:
+            name: target
+            choices:
+              - aarch64-linux-gnu
+              - aarch64-elf
+              - aarch64-linux-gnu_ilp32
+              - aarch64_be-elf
+              - aarch64_be-linux-gnu
+              - arm-eabi
+              - arm-linux-gnueabi
+              - arm-linux-gnueabihf
+              - armeb-eabi
+              - armeb-linux-gnueabi
+              - armeb-linux-gnueabihf
+              - armv8l-linux-gnueabihf
+              - native
+            description: 'Target'
+        - choice:
+            name: version
+            choices:
+              - default
+              - latest-rel
+              - master
+              - gcc8
+              - gcc7
+              - gcc6
+              - gcc5
+              - gcc4_9
+            description: 'Toolchain version; should match a supported ABE config'
+        - choice:
+            name: distro
+            choices:
+              - lts_1
+              - lts
+            description: 'Ubuntu distro to use for build environment'
+        - label:
+            name: builder
+            default: tcwg-x86_64-build
+            description: 'Jenkins label to build on; determines host of the toolchain'
+        - file:
+            name: manifest.txt
+            description: 'Use provided manifest file (which may override above settings)'
+        - bool:
+            name: verbose
+            default: false
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+        - text:
+            name: extra_options
+            default:
+            description: 'Extra options to pass to docker-run'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG AAA gnu linux Build'
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 300
+        - timestamps
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#$BUILD_NUMBER-$version-$release_name-$buildnumber/$builder-$target'
+        - workspace-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -ex
+            abe_branch=tested
+            eval $extra_options
+            ./jenkins-scripts/docker-run.sh --distro "$distro" \
+            -- \
+            ./jenkins-scripts/tcwg-dev-build.sh \
+            --abe_branch "$abe_branch" \
+            --release_name "$release_name" \
+            --buildnumber "$buildnumber" \
+            --target "$target" \
+            --version "$version" \
+            --manifest "$(pwd)/manifest.txt" \
+            --verbose "$verbose"
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+# checksum: b637c21346ceef1cc9961b2b42ef6a42
diff --git a/tcwg-gnu-builds.yaml b/tcwg-gnu-builds.yaml
new file mode 100644
index 0000000000..106759bedc
--- /dev/null
+++ b/tcwg-gnu-builds.yaml
@@ -0,0 +1,335 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-dev-builds.yaml.in and tcwg-dev-builds/tcwg-gnu-builds.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-gnu-builds
+    project-type: multijob
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+      - string:
+          name: release_name
+          default: test
+          description: 'Name of release series'
+      - string:
+          name: buildnumber
+          default: 0
+          description: 'Build number in release series'
+      - choice:
+          name: version
+          choices:
+            - latest-rel
+            - master
+          description: 'Toolchain version; should match a supported ABE config'
+      - bool:
+          name: host_x86_64_target_aarch64
+          default: true
+      - bool:
+          name: host_x86_64_target_armhf
+          default: true
+      - bool:
+          name: host_aarch64_target_native
+          default: true
+      - bool:
+          name: host_aarch64_target_armhf
+          default: true
+      - bool:
+          name: host_armhf_target_native
+          # FIXME: https://linaro.atlassian.net/browse/STG-5042
+          default: false
+      - choice:
+          name: distro
+          choices:
+            - lts_1
+            - lts
+          description: 'Ubuntu distro to use for build environment'
+      - bool:
+          name: publish
+          default: false
+          description: 'Whether to publish to snapshots.linaro.org'
+      - bool:
+          name: verbose
+          default: true
+          description: 'Whether to be verbose'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG AAA GNU Builds'
+    wrappers:
+      - build-name:
+          name: '#$BUILD_NUMBER-$version-$release_name-$buildnumber'
+      - timeout:
+          timeout: 600
+      - timestamps
+      - workspace-cleanup
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          if $verbose; then
+            set -x
+          fi
+
+          if [ x"$(ls)" != x"" ]; then
+            echo "ERROR: Dirty workspace"
+            exit 1
+          fi
+          
+          cat > build-params.txt <<EOF
+          release_name=$release_name
+          buildnumber=$buildnumber
+          version=$version
+          distro=$distro
+          EOF
+      - multijob:
+          name: Build
+          projects:
+            - name: tcwg-gnu-build
+              alias: "host_x86_64_target_aarch64"
+              enable-condition: "$host_x86_64_target_aarch64"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-x86_64-build"
+              property-file: build-params.txt
+              predefined-parameters: "target=aarch64-linux-gnu"
+            - name: tcwg-gnu-build
+              alias: "host_x86_64_target_armhf"
+              enable-condition: "$host_x86_64_target_armhf"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-x86_64-build"
+              property-file: build-params.txt
+              predefined-parameters: "target=arm-linux-gnueabihf"
+            - name: tcwg-gnu-build
+              alias: "host_aarch64_target_aarch64"
+              enable-condition: "$host_aarch64_target_native"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-armv8_64"
+              property-file: build-params.txt
+              predefined-parameters: "target=native"
+            - name: tcwg-gnu-build
+              alias: "host_aarch64_target_armhf"
+              enable-condition: "$host_aarch64_target_armhf"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-armv8_64"
+              property-file: build-params.txt
+              predefined-parameters: "target=arm-linux-gnueabihf"
+            - name: tcwg-gnu-build
+              alias: "host_armhf_target_native"
+              enable-condition: "$host_armhf_target_native"
+              node-label-name: "builder"
+              node-label: "tcwg-build && tcwg-armv7"
+              property-file: build-params.txt
+              predefined-parameters: "target=native"
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          if $verbose; then
+            set -x
+          fi
+          
+          env | grep "TCWG_GNU_BUILD"
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_GNU_BUILD
+          comparator: greater-than-equal
+          rhs: 1
+          steps:
+            - copyartifact:
+                project: tcwg-gnu-build
+                which-build: specific-build
+                # Note that $TCWG_GNU_BUILD_BUILD_NUMBER points to the last
+                # build (i.e., it's the same as $TCWG_GNU_BUILD_5_BUILD_NUMBER
+                # in a full 5-configuration build).  At the same time,
+                # $TCWG_GNU_BUILD_nnn_BUILD_NUMBER variables are defined only
+                # when multiple builds were triggered.
+                # We need to use $TCWG_GNU_BUILD_BUILD_NUMBER here to correctly
+                # handle single-toolchain builds.
+                build-number: $TCWG_GNU_BUILD_BUILD_NUMBER
+                target: tcwg-gnu-build-1
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_GNU_BUILD
+          comparator: greater-than-equal
+          rhs: 2
+          steps:
+            - copyartifact:
+                project: tcwg-gnu-build
+                which-build: specific-build
+                build-number: $TCWG_GNU_BUILD_1_BUILD_NUMBER
+                target: tcwg-gnu-build-2
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_GNU_BUILD
+          comparator: greater-than-equal
+          rhs: 3
+          steps:
+            - copyartifact:
+                project: tcwg-gnu-build
+                which-build: specific-build
+                build-number: $TCWG_GNU_BUILD_2_BUILD_NUMBER
+                target: tcwg-gnu-build-3
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_GNU_BUILD
+          comparator: greater-than-equal
+          rhs: 4
+          steps:
+            - copyartifact:
+                project: tcwg-gnu-build
+                which-build: specific-build
+                build-number: $TCWG_GNU_BUILD_3_BUILD_NUMBER
+                target: tcwg-gnu-build-4
+      - conditional-step:
+          condition-kind: num-comp
+          lhs: $TRIGGERED_BUILD_RUN_COUNT_TCWG_GNU_BUILD
+          comparator: greater-than-equal
+          rhs: 5
+          steps:
+            - copyartifact:
+                project: tcwg-gnu-build
+                which-build: specific-build
+                build-number: $TCWG_GNU_BUILD_4_BUILD_NUMBER
+                target: tcwg-gnu-build-5
+      - linaro-publish-token
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          if $verbose; then
+            set -x
+          fi
+
+          mkdir out
+
+          i="$TRIGGERED_BUILD_RUN_COUNT_TCWG_GNU_BUILD"
+          while [ $i -gt 0 ]; do
+            rsync -a tcwg-gnu-build-$i/artifacts/binaries/ out/
+            i=$(($i-1))
+          done
+
+          if [ x"$(ls out/ | wc -l)" != x"1" ]; then
+            echo "ERROR: not a single directory in builds artifacts:"
+            ls -l out/
+            exit 1
+          fi
+          out_release=$(set +f; echo out/*-$release_name-$buildnumber)
+          if ! [ -d "$out_release" ]; then
+            echo "ERROR: no $out_release directory in builds artifacts:"
+            ls -l out/
+            exit 1
+          fi
+
+          cat > HEADER-latest-rel.textile <<EOF
+          h4. Linaro Toolchain Upstream Integration Builds - Stable $release_name-$buildnumber
+          
+          These builds are made from latest release branches of GNU toolchain
+           components.
+           See included manifests for details.
+
+          These builds are not for production environments.
+           We will do our best to investigate problems reported via
+           "Linaro Bugzilla":https://bugs.linaro.org/ and issue trackers of
+           upstream projects.
+          EOF
+
+          cat > HEADER-master.textile <<EOF
+          h4. Linaro Toolchain Upstream Integration Builds - *UNSTABLE* $release_name-$buildnumber
+          
+          These builds are made from whatever happened to be in master branches
+           of GNU toolchain components at the moment.
+           See included manifests for details.
+
+          These builds are for experimental environments only.  They *will*
+           break your stuff and drink all your beer.  You have been warned.
+           We will do our best to investigate problems reported via
+           "Linaro Bugzilla":https://bugs.linaro.org/ and issue trackers of
+           upstream projects.
+          EOF
+
+          cp HEADER-$version.textile HEADER.textile
+          cp HEADER.textile "$out_release/"
+
+          wget https://git.linaro.org/ci/publishing-api.git/plain/linaro-cp.py -O ./linaro-cp.py
+          linaro_cp_opts=""
+          if ! $publish; then
+            linaro_cp_opts="--dry-run"
+          fi
+          time python3 ./linaro-cp.py --api_version 3 $linaro_cp_opts \
+            "$out_release/" "gnu-toolchain/$(basename "$out_release")"
+
+- job:
+    name: tcwg-gnu-builds-monthly
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: false
+    display-name: 'TCWG AAA GNU Builds Monthly Trigger'
+    triggers:
+      - timed: '@weekly'
+    wrappers:
+      - timeout:
+          timeout: 300
+      - timestamps
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          set -x
+
+          # Release name is Year.Month-Week_of_month
+          buildnumber=$((($(date +%e)+6)/7))
+          publish=false
+          if [ x"$buildnumber" = x"1" ]; then
+            publish=true
+          fi
+          cat > build-params.txt <<EOF
+          release_name=$(date +%Y.%m)
+          buildnumber=$buildnumber
+          publish=$publish
+          EOF
+      - trigger-builds:
+          - project: tcwg-gnu-builds
+            property-file: build-params.txt
+            predefined-parameters: |
+              version=latest-rel
+              distro=lts_1
+          - project: tcwg-gnu-builds
+            property-file: build-params.txt
+            predefined-parameters: |
+              version=master
+              distro=lts
+# checksum: 92639f8f3e3bffb05670cef4ddc174ec
diff --git a/tcwg-gnu-patch-benchmarking.yaml b/tcwg-gnu-patch-benchmarking.yaml
deleted file mode 100644
index b11010fdf0..0000000000
--- a/tcwg-gnu-patch-benchmarking.yaml
+++ /dev/null
@@ -1,264 +0,0 @@
-- job:
-    name: tcwg-gnu-patch-benchmarking
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: GERRIT_PATCHSET_REVISION
-            default: refs/remotes/origin/linaro/gcc-7-branch
-            description: 'Patched GCC revision'
-        - string:
-            name: GERRIT_BRANCH
-            default: linaro-local/gcc-7-integration-branch
-            description: 'Base GCC branch'
-        - string:
-            name: gcc_orig
-            default: gcc_patch_prev
-            description: 'Original GCC revision'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/tested
-            description: 'ABE revision to use'
-        - string:
-            name: target_list
-            default: 'aarch64-linux-gnu arm-linux-gnueabihf'
-            description: 'List of targets'
-        - string:
-            name: extension_list
-            default: 'O2g'
-            description: 'List of build profiles: O2, O3, O2g, O3g, Ofast, Os'
-        - text:
-            name: buildfarm_params
-            default: |
-              host_x86_64_languages=c,c++,fortran
-              host_aarchXX_languages=c,c++,fortran
-              runtests=
-              try_bootstrap=false
-              host_x86_64_excludecheck=gdb
-              host_aarchXX_excludecheck=gdb
-              extraconfig=
-              rebuild=true
-              dont_fail=false
-              log_server=dev-01.tcwglab:logs
-              scripts_branch=master
-              build_container_tag=trusty
-              binaries=true
-            description: 'Buildfarm parameters, see tcwg-buildfarm job'
-        - text:
-            name: benchmark_params
-            default: |
-              bench_list=bzip2
-              cflags=
-              testmode=benchmark
-              iterations=1
-              sysroot=tarball
-              fileserver=dev-01.tcwglab
-              forceinstall=false
-              run_profile=parallel3x3
-              scripts_branch=master
-              bmk_branch=master
-            description: 'Benchmark parameters, see tcwg-benchmark job'
-    disabled: false
-    node: tcwg-bmk-coordinator
-    concurrent: true
-    display-name: 'TCWG ZZZ GNU Patch Benchmarking'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            basedir: gcc
-            branches:
-                - ${GERRIT_PATCHSET_REVISION}
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-            choosing-strategy: gerrit
-        - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            basedir: abe
-            branches:
-                - $abe_branch
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-coordinator
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-        - axis:
-            type: dynamic
-            name: extension
-            values:
-                - extension_list
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            users:
-                - 'tcwg-benchmark'
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -ex
-
-          # Gather revisions to build.
-          abe_rev=$(git -C abe rev-parse --short $abe_branch)
-          gcc_patch_rev=$(git -C gcc rev-parse $GERRIT_PATCHSET_REVISION)
-          if [ x"$gcc_orig" = x"gcc_patch_prev" ]; then
-            gcc_orig="$gcc_patch_rev^"
-          fi
-          gcc_orig_rev=$(git -C gcc rev-parse $gcc_orig)
-
-          # Get matching config.
-          case ${GERRIT_BRANCH} in
-            *gcc-4_9*)
-              toolchainconf='--extraconfigdir ../config/gcc4_9'
-              ;;
-            *gcc-5*)
-              toolchainconf='--extraconfigdir ../config/gcc5'
-              ;;
-            *gcc-6*)
-              toolchainconf='--extraconfigdir ../config/gcc6'
-              ;;
-            *gcc-7*)
-              toolchainconf='--extraconfigdir ../config/gcc7'
-              ;;
-            *)
-              toolchainconf='--extraconfigdir ../config/gcc7 binutils=binutils-gdb.git/master glibc=glibc.git~master newlib=newlib.git~master'
-              ;;
-          esac
-          cat > gcc_orig_params <<EOF
-          override=$toolchainconf gcc=gcc.git@$gcc_orig_rev
-          log_name=tcwg-gnu-patch-benchmarking-$gcc_orig_rev/$abe_rev/\$builder_type.\$target
-          target_list=$target
-          abe_branch=$abe_rev
-          displaytag=gnu-patch-benchmarking-ref-${gcc_orig_rev}
-          EOF
-          echo "$buildfarm_params" >> gcc_orig_params
-
-          cat > gcc_patch_params <<EOF
-          override=$toolchainconf gcc=gcc.git@$gcc_patch_rev
-          log_name=tcwg-gnu-patch-benchmarking-$gcc_orig_patch/$abe_rev/\$builder_type.\$target
-          target_list=$target
-          abe_branch=$abe_rev
-          displaytag=gnu-patch-benchmarking-patch-${gcc_patch_rev}
-          EOF
-          echo "$buildfarm_params" >> gcc_patch_params
-      - trigger-builds:
-          - project: 'tcwg-buildfarm'
-            parameter-factories:
-              - factory: filebuild
-                file-pattern: gcc_*_params
-            block: true
-      - shell: |
-          #!/bin/bash
-          set -ex
-
-          # Note that armv8l-linux-gnueabihf will not match "arm-"*, and will run on tx1.
-          case "$target" in
-            "arm-"*) board="tk1" ;;
-            *) board="tx1" ;;
-          esac
-          # Assuming cross build as a first step
-          label=tcwg-x86_64-build
-
-          # Extract triggered build numbers from comma separated list
-          bf_buildnum=(${TRIGGERED_BUILD_NUMBERS_tcwg_buildfarm//,/ })
-          REFNUM=${bf_buildnum[0]}
-          PATCHNUM=${bf_buildnum[1]}
-
-          BF_URL_PREFIX=https://ci.linaro.org/job/tcwg-buildfarm
-          BF_URL_SUFIX=label=${label},target=${target}
-
-          # Hackish way to get tarball name from json api
-          TAR_REF_NAME=$(wget --quiet ${BF_URL_PREFIX}/${REFNUM}/${BF_URL_SUFIX}/api/json?pretty=true -O -| grep -P "fileName.*\"gcc-linaro-.*.tar.xz\"" | awk '{print $3}' | sed -e 's/[",]//g')
-          TAR_PATCH_NAME=$(wget --quiet ${BF_URL_PREFIX}/${PATCHNUM}/${BF_URL_SUFIX}/api/json?pretty=true -O -| grep -P "fileName.*\"gcc-linaro-.*.tar.xz\"" | awk '{print $3}' | sed -e 's/[",]//g')
-
-          rm -rf ref-tools
-          mkdir -p ref-tools
-          cd ref-tools
-          wget --progress=dot -e dotbytes=2M  "${BF_URL_PREFIX}/${REFNUM}/${BF_URL_SUFIX}/artifact/artifacts/${TAR_REF_NAME}"
-          tar xJf gcc-linaro*.tar.xz
-          REF_CCPREFIX=$(readlink -f  gcc-linaro-*/bin)/${target}-
-          cd ..
-
-          rm -rf patch-tools
-          mkdir -p patch-tools
-          cd patch-tools
-          wget --progress=dot -e dotbytes=2M  "${BF_URL_PREFIX}/${PATCHNUM}/${BF_URL_SUFIX}/artifact/artifacts/${TAR_PATCH_NAME}"
-          tar xJf gcc-linaro*.tar.xz
-          PATCH_CCPREFIX=$(readlink -f  gcc-linaro-*/bin)/${target}-
-          cd ..
-
-          cat > ref_params <<EOF
-          toolchain_url=rsync://${NODE_NAME}.tcwglab:$REF_CCPREFIX
-          target_list=$board
-          extension=$extension
-          EOF
-          echo "$benchmark_params" >> ref_params
-
-          cat > patch_params <<EOF
-          toolchain_url=rsync://${NODE_NAME}.tcwglab:$PATCH_CCPREFIX
-          target_list=$board
-          extension=$extension
-          EOF
-          echo "$benchmark_params" >> patch_params
-      - trigger-builds:
-          - project: 'tcwg-benchmark'
-            property-file: ref_params
-            block: true
-      - trigger-builds:
-          - project: 'tcwg-benchmark'
-            property-file: patch_params
-            block: true
-      - shell: |
-          #!/bin/bash
-          set -ex
-
-          case "$target" in
-            "arm-"*) board="tk1" ;;
-            *) board="tx1" ;;
-          esac
-
-          # Extract triggered build numbers from comma separated list
-          bf_buildnum=(${TRIGGERED_BUILD_NUMBERS_tcwg_benchmark//,/ })
-          REFNUM=${bf_buildnum[0]}
-          PATCHNUM=${bf_buildnum[1]}
-
-          cat > res_params << EOF
-          results_ref=${board}/tcwg-benchmark-${REFNUM}
-          results_id=${board}/tcwg-benchmark-${PATCHNUM}
-          EOF
-
-          cat > cmp_params << EOF
-          resultsref=${board}/tcwg-benchmark-${REFNUM}
-          resultseval=${board}/tcwg-benchmark-${PATCHNUM}
-          EOF
-      - trigger-builds:
-          - project: 'tcwg-benchmark-results'
-            property-file: res_params
-            block: false
-          - project: 'tcwg-benchmark-compare'
-            property-file: cmp_params
-            block: false
diff --git a/tcwg-infra-update-home.yaml b/tcwg-infra-update-home.yaml
deleted file mode 100644
index 636215d3c7..0000000000
--- a/tcwg-infra-update-home.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-- job:
-    name: tcwg-infra-update-home
-    project-type: freestyle
-    defaults: global
-    description: |
-      This job tracks changes to /home/tcwg-* files in ci/dockerfiles.git
-      repository and updates machines in machine_list with new versions
-      of the files.  The files are .gitconfig, .ssh/*, etc.
-      The update is done by fetching files from the repo using git-archive,
-      and untarring them to /home directories of tcwg-infra users.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: machines_list
-            default: 'apm-01.tcwglab apm-02.tcwglab test-armv8-01.tcwglab test-armv8-02.tcwglab tcwg-tx1-01.tcwglab tcwg-tx1-02.tcwglab tcwg-tx1-03.tcwglab tcwg-tx1-04.tcwglab tcwg-tx1-05.tcwglab tcwg-tx1-06.tcwglab tcwg-tx1-07.tcwglab tcwg-tx1-08.tcwglab tcwg-tk1-01.tcwglab tcwg-tk1-02.tcwglab tcwg-tk1-03.tcwglab tcwg-tk1-04.tcwglab tcwg-tk1-05.tcwglab tcwg-tk1-06.tcwglab tcwg-tk1-07.tcwglab tcwg-tk1-08.tcwglab tcwg-tk1-09.tcwglab build-01.tcwglab build-02.tcwglab build-03.tcwglab build-04.tcwglab build-05.tcwglab build-06.tcwglab build-07.tcwglab build-08.tcwglab dev-01.tcwglab dev-02.tcwglab'
-            description: 'Machines to run on, see https://ci.linaro.org/job/tcwg-buildslave-command'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: false
-    display-name: 'TCWG CCC Update TCWG Infra /home files'
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'ci/dockerfiles'
-                  branches:
-                    - branch-pattern: 'master'
-                  file-paths:
-                    - compare-type: ANT
-                      pattern: tcwg-base/tcwg-build/tcwg-buildslave/**
-                    - compare-type: ANT
-                      pattern: tcwg-base/tcwg-build/tcwg-benchmark/**
-            silent-start: true
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - trigger-builds:
-            - project: 'tcwg-buildslave-command'
-              predefined-parameters: |
-                machines_list=$machines_list
-                command=ssh -o StrictHostKeyChecking=no git@git-us.linaro.org true || true; git archive --remote ssh://git@git-us.linaro.org/ci/dockerfiles.git HEAD | tar x --strip-components=3 -C /home/tcwg-buildslave tcwg-base/tcwg-build/tcwg-buildslave
-                target_user=tcwg-buildslave
-              block: true
-            - project: 'tcwg-buildslave-command'
-              predefined-parameters: |
-                machines_list=$machines_list
-                command=ssh -o StrictHostKeyChecking=no git@git-us.linaro.org true || true; git archive --remote ssh://git@git-us.linaro.org/ci/dockerfiles.git HEAD | tar x --strip-components=3 -C /home/tcwg-benchmark tcwg-base/tcwg-build/tcwg-benchmark
-                target_user=tcwg-benchmark
-              block: true
-    publishers:
-        - email:
-            recipients: tcwg@linaro.org
diff --git a/tcwg-llvm-build.yaml b/tcwg-llvm-build.yaml
new file mode 100644
index 0000000000..dcd55112f8
--- /dev/null
+++ b/tcwg-llvm-build.yaml
@@ -0,0 +1,185 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-dev-build.yaml.in and tcwg-dev-build/tcwg-llvm-build.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-llvm-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - string:
+            name: release
+            default: ''
+            description: 'Release number. Ex. 4.0.1'
+        - string:
+            name: candidate
+            default: 'git-ref=main'
+            description: 'RC number. Ex. 1, 2, final'
+        - string:
+            name: toolchain
+            default: ''
+            description: 'URL of the toolchain to use. This needs to be a tarball with a /bin directory inside with either GCC or LLVM from make install'
+        - string:
+            name: compiler
+            default: 'clang'
+            description: 'Override the default system compiler. Only used if "toolchain" is empty.'
+        - bool:
+            name: useninja
+            default: true
+            description: 'Whether or not to use ninja for the release (works for releases > 9.0.0)'
+        - bool:
+            name: testsuite
+            default: true
+            description: 'Whether or not to trigger a test-suite with this build.'
+        - string:
+            name: build_container_tag
+            default: 'lts_1'
+            description: 'Type of image to use in the container: lts_1, lts, ...'
+        - label:
+            name: builder
+            default: tcwg-x86_64-build
+            description: 'Jenkins label to build on; determines host of the toolchain'
+        - string:
+            name: scripts_branch
+            default: tested
+            description: 'Scripts revision to use'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG AAA llvm linux Build'
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 1800
+        - timestamps
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#$BUILD_NUMBER-$release-$candidate/$builder'
+        - workspace-cleanup
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            rm -rf artifacts
+            mkdir artifacts
+
+            # Until we figure out a way to use heavy-job with different weights
+            # based on the builder, we hardcode to one.
+            buildjobs=1
+
+            # Select builder arch/type/container
+            case ${builder} in
+                tcwg-x86_64-build|tcwg-x86_64-cam)
+                    builder_arch=amd64
+                    buildjobs=8 # 1 slot is 32/4
+                    ;;
+                tcwg-tk1_32-build|tcwg-llvm_tk1-*)
+                    builder_arch=armhf
+                    buildjobs=3 # TK1s only have 4 cores and little RAM
+                    ;;
+                tcwg-jade*)
+                    builder_arch=arm64
+                    buildjobs=64 # Jades have lots of cores
+                    ;;
+                *) echo "ERROR: Unsupported label: $builder"; exit 1 ;;
+            esac
+
+            # Sets the system compiler
+            compiler_option=''
+            if [ "${toolchain:+set}" != "set" ] && [ "${compiler:+set}" = "set" ]; then
+              compiler_option="--compiler=${compiler}"
+            fi
+
+            # Trigger toolchain name
+            toolchain_file="${WORKSPACE}/llvm.params.toolchain"
+            toolchain_file_option=""
+            if ${twostage} || ${testsuite}; then
+              toolchain_file_option="--toolchain-file=$toolchain_file"
+            fi
+
+            # Setup job parameters and run (for now, just pretend to run)
+            ret=0
+            ./jenkins-scripts/docker-run.sh \
+                --arch ${builder_arch} \
+                --distro ${build_container_tag} \
+                -- \
+                bash -x ./jenkins-scripts/tcwg-llvm-release.sh \
+                --workspace=${WORKSPACE} \
+                --release=${release} \
+                --candidate=${candidate} \
+                --buildjobs=${buildjobs} \
+                --toolchain=${toolchain} \
+                --use-ninja=${useninja} \
+                $toolchain_file_option $compiler_option \
+                > artifacts/release.log 2>&1 || ret=$?
+
+            if [ $ret -ne 0 ]; then
+                touch llvm.failed
+            fi
+
+            # Chained jobs
+            if ${testsuite}; then
+              echo "target_list=$builder" > llvm.params.testsuite
+              cat $toolchain_file >> llvm.params.testsuite
+            fi
+
+            # failure is handled by conditional step on llvm.failed
+            # so that the testsuite job is always triggered
+            exit 0
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: llvm.params.testsuite
+            steps:
+                - trigger-builds:
+                    - project: 'tcwg-llvm-testsuite'
+                      property-file: llvm.params.testsuite
+                      current-parameters: true
+                      block: true
+        - conditional-step:
+            condition-kind: file-exists
+            condition-filename: llvm.failed
+            steps:
+                - shell: "exit 1"
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+# checksum: cdb8d674f740a34207177d820ba56794
diff --git a/tcwg-llvm-precommit.yaml b/tcwg-llvm-precommit.yaml
index bc5c7ff09b..64295124c8 100644
--- a/tcwg-llvm-precommit.yaml
+++ b/tcwg-llvm-precommit.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -48,7 +48,7 @@
             description: 'Which branch to validate (should not be master).'
         - string:
             name: scripts_branch
-            default: 'refs/remotes/origin/llvmprod'
+            default: 'refs/remotes/origin/tested'
             description: 'Branch to pull jenkins-script from'
     disabled: false
     node: tcwg-coordinator
@@ -57,7 +57,7 @@
     display-name: 'TCWG LLVM Pre-Commit'
     scm:
         - git:
-            url: http://git-us.linaro.org/toolchain/jenkins-scripts.git
+            url: http://git.linaro.org/toolchain/jenkins-scripts.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             name: origin
             branches:
@@ -97,8 +97,8 @@
             fi
 
             # Default values, only add them to parameters if really needed
-            repository="https://git-us.linaro.org/toolchain/llvm"
-            build_container_tag="xenial"
+            repository="https://git.linaro.org/toolchain/llvm"
+            build_container_tag="lts"
 
             # Find projects from branch
             . "${WORKSPACE}/tcwg-llvm-common.sh"
diff --git a/tcwg-llvm-release.yaml b/tcwg-llvm-release.yaml
index c696c6be70..ac0a38741d 100644
--- a/tcwg-llvm-release.yaml
+++ b/tcwg-llvm-release.yaml
@@ -7,12 +7,12 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
             days-to-keep: 30
-            num-to-keep: 100
+            num-to-keep: 10
     parameters:
         - string:
             name: release
@@ -20,7 +20,7 @@
             description: 'Release number. Ex. 4.0.1'
         - string:
             name: candidate
-            default: ''
+            default: 'git-ref=main'
             description: 'RC number. Ex. 1, 2, final'
         - string:
             name: toolchain
@@ -28,21 +28,25 @@
             description: 'URL of the toolchain to use. This needs to be a tarball with a /bin directory inside with either GCC or LLVM from make install'
         - string:
             name: build_container_tag
-            default: 'xenial'
-            description: 'Type of image to use in the container: trusty, xenial.'
+            default: 'lts_1'
+            description: 'Type of image to use in the container: lts_1, lts, ...'
         - string:
             name: compiler
             default: 'clang'
             description: 'Override the default system compiler. Only used if "toolchain" is empty.'
         - string:
             name: target_list
-            default: 'tcwg-x86_64-cam tcwg-tk1_32-build tcwg-apm_64-build'
+            default: 'tcwg-x86_64-cam tcwg-tk1_32-build tcwg-jade-03'
             description: 'List of targets should be a subset of slave axis'
         - string:
             name: scripts_branch
-            default: 'refs/remotes/origin/llvmprod'
+            default: 'refs/remotes/origin/tested'
             description: 'Branch to pull jenkins-script from'
         - bool:
+            name: useninja
+            default: true
+            description: 'Whether or not to use ninja for the release (works for releases > 9.0.0)'
+        - bool:
             name: testsuite
             default: true
             description: 'Whether or not to trigger a test-suite with this build.'
@@ -53,7 +57,7 @@
     display-name: 'TCWG LLVM Release'
     scm:
         - git:
-            url: http://git-us.linaro.org/toolchain/jenkins-scripts.git
+            url: http://git.linaro.org/toolchain/jenkins-scripts.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             name: origin
             branches:
@@ -61,6 +65,8 @@
             skip-tag: true
             shallow-clone: true
             wipe-workspace: true
+    triggers:
+        - timed: '@weekly'
     axes:
         - axis:
             type: slave
@@ -68,7 +74,11 @@
             values:
                 - tcwg-x86_64-cam
                 - tcwg-tk1_32-build
-                - tcwg-apm_64-build
+                - tcwg-llvm_tk1-01
+                - tcwg-llvm_tk1-02
+                - tcwg-jade-02
+                - tcwg-jade-03
+                - tcwg-jade-04
         - axis:
             type: dynamic
             name: target
@@ -80,7 +90,7 @@
         sequential: false
     wrappers:
         - timeout:
-            timeout: 1200
+            timeout: 3840
         - timestamps
         - ssh-agent-credentials:
             # tcwg-buildslave user id
@@ -107,13 +117,13 @@
                     builder_arch=amd64
                     buildjobs=8 # 1 slot is 32/4
                     ;;
-                tcwg-tk1_32-build)
+                tcwg-tk1_32-build|tcwg-llvm_tk1-*)
                     builder_arch=armhf
-                    buildjobs=4 # TK1s only have 4 cores
+                    buildjobs=3 # TK1s only have 4 cores and little RAM
                     ;;
-                tcwg-apm_64-build)
+                tcwg-jade*)
                     builder_arch=arm64
-                    buildjobs=8 # APMs only have 8 cores
+                    buildjobs=64 # Jades have lots of cores
                     ;;
                 *) echo "ERROR: Unsupported label: $label"; exit 1 ;;
             esac
@@ -155,6 +165,7 @@
                 --candidate=${candidate} \
                 --buildjobs=${buildjobs} \
                 --toolchain=${toolchain} \
+                --use-ninja=${useninja} \
                 $toolchain_file_option $compiler_option" || ret=$?
 
             if [ $ret -ne 0 ]; then
@@ -185,3 +196,7 @@
             condition-filename: llvm.failed
             steps:
                 - shell: "exit 1"
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
diff --git a/tcwg-llvm-staged-build.yaml b/tcwg-llvm-staged-build.yaml
index 25c99cafe1..f3cac334c5 100644
--- a/tcwg-llvm-staged-build.yaml
+++ b/tcwg-llvm-staged-build.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -32,8 +32,8 @@
             description: 'Additional CMake flags, ex. CMAKE_CXX_FLAGS, etc.'
         - string:
             name: build_container_tag
-            default: 'xenial'
-            description: 'Type of image to use in the container: trusty, xenial.'
+            default: 'lts'
+            description: 'Type of image to use in the container: lts_1, lts, ...'
         - bool:
             name: twostage
             default: false
@@ -48,7 +48,7 @@
             description: 'Override the default system compiler. Only used if "toolchain" is empty. Accepts: clang, gcc.'
         - string:
             name: repository
-            default: 'https://git-us.linaro.org/toolchain/llvm'
+            default: 'https://git.linaro.org/toolchain/llvm'
             description: 'Repository to pull changes from.'
         - string:
             name: projects
@@ -60,20 +60,20 @@
             description: 'Which branch to pull from. Need to exist in all projects above, if any selected.'
         - string:
             name: scripts_branch
-            default: 'refs/remotes/origin/llvmprod'
+            default: 'refs/remotes/origin/tested'
             description: 'Branch to pull jenkins-script from'
         - string:
             name: target_list
             default: 'tcwg-x86_64-cam'
-            description: 'List of targets -- tcwg-x86_64-cam tcwg-tk1_32-build tcwg-apm_64-build -- should be a subset of slave axis'
-    disabled: false
+            description: 'List of targets -- tcwg-x86_64-cam tcwg-tk1_32-build tcwg-apm_32-build tcwg-apm_64-build-- should be a subset of slave axis'
+    disabled: true
     node: tcwg-coordinator
     retry-count: 3
     concurrent: true
     display-name: 'TCWG LLVM Staged Build'
     scm:
         - git:
-            url: http://git-us.linaro.org/toolchain/jenkins-scripts.git
+            url: http://git.linaro.org/toolchain/jenkins-scripts.git
             refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
             name: origin
             branches:
@@ -88,6 +88,7 @@
             values:
                 - tcwg-x86_64-cam
                 - tcwg-tk1_32-build
+                - tcwg-apm_32-build
                 - tcwg-apm_64-build
         - axis:
             type: dynamic
@@ -126,6 +127,10 @@
                     builder_arch=armhf
                     buildjobs=4 # TK1s only have 4 cores
                     ;;
+                tcwg-apm_32-build)
+                    builder_arch=armhf
+                    buildjobs=8 # APMs only have 8 cores
+                    ;;
                 tcwg-apm_64-build)
                     builder_arch=arm64
                     buildjobs=8 # APMs only have 8 cores
@@ -208,3 +213,7 @@
                       property-file: llvm.params.testsuite
                       current-parameters: true
                       block: true
+    publishers:
+        - archive:
+            artifacts: '*.tar.xz'
+            latest-only: false
diff --git a/tcwg-llvm-testsuite-diana.yaml b/tcwg-llvm-testsuite-diana.yaml
deleted file mode 100644
index 0901e872aa..0000000000
--- a/tcwg-llvm-testsuite-diana.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-- job:
-    name: tcwg-llvm-testsuite-diana
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 10
-            num-to-keep: 10
-    parameters:
-        - string:
-            name: toolchain
-            default: ''
-            description: 'URL of the toolchain to use. This needs to be a tarball with a /bin directory inside with either GCC or LLVM from make install'
-        - string:
-            name: nt_flags
-            default: ''
-            description: 'Flags to pass to the LNT nt producer (e.g. --threads=8 --cflag -O0)'
-        - string:
-            name: build_container_tag
-            default: 'xenial'
-            description: 'Type of image to use in the container: trusty, xenial.'
-        - string:
-            name: target_list
-            default: 'tcwg-tk1_32-build tcwg-apm_64-build'
-            description: 'List of targets -- tcwg-x86_64-cam tcwg-tk1_32-build tcwg-apm_64-build -- should be a subset of slave axis'
-        - string:
-            name: scripts_branch
-            default: 'refs/remotes/origin/llvmprod'
-            description: 'Branch to pull jenkins-script from'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG LLVM Test-Suite Experiments'
-    scm:
-        - git:
-            url: http://git.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            name: origin
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-cam
-                - tcwg-tk1_32-build
-                - tcwg-apm_64-build
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        combination-filter: |
-            label==target
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -exu
-
-            . jenkins-helpers.sh
-
-            if [ "${toolchain:+set}" != "set" ]; then
-              echo "Test-suite needs a toolchain to test"
-              exit 1
-            fi
-
-            # Start build container
-            ${WORKSPACE}/start-container-docker.sh --label ${label} --node ${NODE_NAME} --distro ${build_container_tag} --prefix build_ > build-container.sh
-
-            # Define build_CONTAINER_RSH and build_container_cleanup
-            . ./build-container.sh
-
-            trap "build_container_cleanup" EXIT
-
-            # Setup job parameters and run
-            build_container_exec ${WORKSPACE}/tcwg-llvm-testsuite.sh \
-                                      --workspace=${WORKSPACE} \
-                                      --toolchain=${toolchain} \
-                                      ${nt_flags:+--nt-flags="$nt_flags"}
diff --git a/tcwg-llvm-testsuite.yaml b/tcwg-llvm-testsuite.yaml
index 0bcdcaae72..4040ab6a16 100644
--- a/tcwg-llvm-testsuite.yaml
+++ b/tcwg-llvm-testsuite.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -24,15 +24,15 @@
             description: 'Flags to pass to the LNT nt producer (e.g. --threads=8 --cflag -O0)'
         - string:
             name: build_container_tag
-            default: 'xenial'
-            description: 'Type of image to use in the container: trusty, xenial.'
+            default: 'lts'
+            description: 'Type of image to use in the container: lts_1, lts, ...'
         - string:
             name: target_list
             default: 'tcwg-tk1_32-build tcwg-apm_64-build'
             description: 'List of targets -- tcwg-x86_64-cam tcwg-tk1_32-build tcwg-apm_64-build -- should be a subset of slave axis'
         - string:
             name: scripts_branch
-            default: 'refs/remotes/origin/llvmprod'
+            default: 'refs/remotes/origin/tested'
             description: 'Branch to pull jenkins-script from'
     disabled: false
     node: tcwg-coordinator
diff --git a/tcwg-llvm_woa-build.yaml b/tcwg-llvm_woa-build.yaml
new file mode 100644
index 0000000000..fc86ec695e
--- /dev/null
+++ b/tcwg-llvm_woa-build.yaml
@@ -0,0 +1,81 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-dev-build.yaml.in and tcwg-dev-build/tcwg-llvm_woa-build.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-llvm_woa-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - string:
+            name: release
+            default: 'main'
+            description: 'Release build ID (13.0.0-rc1, 13.0.0) or git branch/sha1'
+        - choice:
+            name: build_type
+            choices:
+              - test
+              - release
+        - label:
+            name: builder
+            default: tcwg-surface
+            description: 'Jenkins label to build on; determines host of the toolchain'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG AAA llvm windows Build'
+    # Save bytes in limited 250-byte windows PATHs
+    workspace: ws/tdb$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 1800
+        - timestamps
+        - build-name:
+            name: '#$BUILD_NUMBER-$release/$builder'
+        - workspace-cleanup
+    builders:
+      - batch: |
+          jenkins-scripts\tcwg-llvm-release.bat %release% %build_type%
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+# checksum: 2248d72fadb3e02bf7bfd7a7778cf04b
diff --git a/tcwg-lnt-check.yaml b/tcwg-lnt-check.yaml
new file mode 100644
index 0000000000..0f631241bd
--- /dev/null
+++ b/tcwg-lnt-check.yaml
@@ -0,0 +1,77 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-sanity-check.yaml.in and tcwg-sanity-check/tcwg-lnt-check.def. Do not edit.
+- job:
+    name: tcwg-lnt-check
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+    disabled: false
+    node: tcwg-x86_64-build
+
+    display-name: 'TCWG LNT check'
+    scm:
+        # Get a stable copy of the check script
+        - git:
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
+            branches:
+                - origin/master
+            basedir: jenkins-scripts-master
+        # Then this is what we're actually checking
+        # (which might also be jenkins-scripts, but Gerrit's version)
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: ${GERRIT_PROJECT}
+    triggers:
+        - gerrit:
+            server-name: 'review.linaro.org'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: true
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'toolchain/llvm-lnt'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'linaro-local/master'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GERRIT_PROJECT}'
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+    builders:
+        - shell:
+            command: |
+                #!/bin/bash
+                set -ex
+
+                # Shellcheck source= directives are relative to
+                # the CWD, so run from inside the folder.
+                # GERRIT_PROJECT is for example toolchain/jenkins-scripts
+                cd ${GERRIT_PROJECT}
+                ../../jenkins-scripts-master/docker-run.sh --distro focal -- ../../jenkins-scripts-master/tcwg-lnt/lnt-check.sh
+            # Aka some files had issues
+            # Any other non-zero means we called shellcheck incorrectly
+            unstable-return: 1
+# checksum: 088d4f73722e3d703155c92a79317711
diff --git a/tcwg-lnt-report-check_gcc.yaml b/tcwg-lnt-report-check_gcc.yaml
new file mode 100644
index 0000000000..0db989413c
--- /dev/null
+++ b/tcwg-lnt-report-check_gcc.yaml
@@ -0,0 +1,38 @@
+- job:
+    name: tcwg-lnt-report-check_gcc
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: tcwg-coordinator
+    display-name: 'TCWG Submit LNT reports for gcc_check results'
+    concurrent: false
+    triggers:
+      - timed: '@daily'
+    wrappers:
+      - timestamps
+    builders:
+        - shell: |
+            #!/usr/bin/env bash
+            set -ex
+
+            [ -d "scripts" ] \
+              || git clone https://git.linaro.org/people/antoine.moynault/scripts.git
+
+            (
+              cd scripts
+              git fetch origin master
+              git checkout FETCH_HEAD
+            )
+
+            ./scripts/lnt-gcc_check-report.sh
diff --git a/tcwg-lnt-run-spec-codesize.yaml b/tcwg-lnt-run-spec-codesize.yaml
new file mode 100644
index 0000000000..267f584d39
--- /dev/null
+++ b/tcwg-lnt-run-spec-codesize.yaml
@@ -0,0 +1,56 @@
+- job:
+    name: tcwg-lnt-run-spec-codesize
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: tcwg-jade-03
+    display-name: 'TCWG LNT test spec codesize'
+    concurrent: false
+    parameters:
+      - string:
+          name: llvm_rev
+          default: ''
+          description: 'llvm revision'
+    triggers:
+      - timed: '@daily'
+    wrappers:
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+              - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+    builders:
+        - shell: |
+            #!/usr/bin/env bash
+            set -ex
+
+            [ -d "scripts" ] \
+              || git clone https://git.linaro.org/people/antoine.moynault/scripts.git
+
+            (
+              cd scripts
+              git fetch origin master
+              git checkout FETCH_HEAD
+            )
+
+            [ -d "jenkins-scripts" ] \
+              || git clone https://git.linaro.org/toolchain/jenkins-scripts.git
+
+            (
+              cd jenkins-scripts
+              git fetch origin master
+              git checkout FETCH_HEAD
+            )
+
+            ./jenkins-scripts/docker-run.sh --distro jammy -- ./scripts/lnt-run-spec-codesize.sh
diff --git a/tcwg-make-and-test-release.yaml b/tcwg-make-and-test-release.yaml
deleted file mode 100644
index b039b33533..0000000000
--- a/tcwg-make-and-test-release.yaml
+++ /dev/null
@@ -1,179 +0,0 @@
-- job:
-    name: tcwg-make-and-test-release
-    project-type: multijob
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: gcc_src
-            default: 'gcc-linaro-5.3-2016.02.tar.xz'
-            description: 'The source of GCC. Specify as it would be passed to abe.sh, either a source tarballs, git branch and revision, or a URL of a tarball e.g., "gcc-linaro-5.3-2016.02.tar.xz"'
-        - string:
-            name: binutils_src
-            default: ''
-            description: 'A optional revision of binutils to use for this release, e.g., "binutils-gdb.git~linaro_binutils-2_25-branch"'
-        - string:
-            name: glibc_src
-            default: ''
-            description: 'An optional revision of Glibc to use for this release, e.g., "glibc.git~linaro/2.21/master"'
-        - string:
-            name: release_name
-            default: ''
-            description: 'Optional release string to use, e.g., "2016.05", "2016.05-rc3", "2016.05-1", "2016.05-1-rc2". The default is to extract the release string from the gcc_src field'
-        - string:
-            name: toolchain_config
-            default: 'default'
-            description: 'Toolchain version config, e.g., "default", "gcc5", or "gcc6"'
-        - string:
-            name: target_list
-            default: 'aarch64-elf aarch64-linux-gnu aarch64-linux-gnu_ilp32 aarch64_be-elf aarch64_be-linux-gnu armv8l-linux-gnueabihf arm-eabi arm-linux-gnueabi arm-linux-gnueabihf armeb-eabi armeb-linux-gnueabi armeb-linux-gnueabihf'
-            description: 'List of targets to use'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/tested
-            description: 'ABE revision to test'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Scripts branch to use'
-        - choice:
-            name: debug
-            choices:
-                - none
-                - abe
-                - yaml
-            description: "Level of debug information: none - No debugging information, abe - ABE debugging information, yaml - tcwg-make-release.yaml debug information (and exit)."
-        - string:
-            name: fileserver
-            default: dev-01.tcwglab
-            description: 'Remote file server for logs and binaries'
-        - bool:
-            name: testrelease
-            default: 'true'
-            description: 'Run test-release if make-release is successful'
-        - string:
-            name: tcwg_regression_rev
-            default: 'master'
-            description: 'tcwg-regression revision to use'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG Make and Test Release'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="release_name"}'
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            tcwg_release=${release_name}
-            # If there is no release_name set, extract release information from the gcc_src
-            if test "${release_name:+set}" != "set"; then
-                case "$gcc_src" in
-                *.tar.xz)
-                    tcwg_release="$(basename $gcc_src | cut -d '-' -f4-)"
-                    tcwg_release=${tcwg_release%".tar.xz"}
-                    ;;
-                gcc.git~*)
-                    tcwg_release="$(echo $gcc_src | grep -o -e '-\(20[0-9]\{2\}\.[01][0-9].*\)' )"
-                    tcwg_release=${tcwg_release#-}
-                    ;;
-                *)
-                    echo "ERROR: Could not find tcwg release"
-                    exit 1
-                    ;;
-                esac
-            fi
-
-            if [ x"${tcwg_release}" = x"" ]; then
-                echo "ERROR: Could not find tcwg release"
-                exit 1
-            fi
-
-            # Extract the gcc_version information from gcc_src to determine
-            # which directory to copy the tarballs into.
-            case "$gcc_src" in
-                *.tar.*) # src tarballs usually named like this
-                    gcc_version=$(basename $gcc_src | awk -F '-' '{ print $3 }')
-                    ;;
-                *.git~*) # building from git branch or tag
-                    gcc_version=$(basename $gcc_src | awk -F '-' '{ print $2 }')
-                    ;;
-                *)
-                    echo "ERROR: could not extract version from gcc_src"
-                    exit 1
-                    ;;
-            esac
-            if ! echo "${gcc_version}" | grep -xEq '[0-9]+\.[0-9]+(\.[0-9]+)?'; then
-                echo "ERROR: gcc version '${gcc_version}' invalid"
-                exit 1
-            fi
-
-            gcc_major="`echo $gcc_version | awk -F '.' '{ print $1 }'`"
-            gcc_minor="`echo $gcc_version | awk -F '.' '{ print $2 }'`"
-            tcwg_version="${gcc_major}.${gcc_minor}"
-            if test ${gcc_major} -lt 5; then
-                gcc_point="`echo $gcc_version | awk -F '.' '{ print $2 }'`"
-                tcwg_version="${gcc_major}.${gcc_minor}.${gcc_point}"
-            fi
-
-            buildid=`printf '%04d' ${BUILD_NUMBER}`
-
-            binariesdir=releases/binaries/${tcwg_version}-${tcwg_release}-${buildid}
-            logsdir=releases/logs/${tcwg_version}-${tcwg_release}-${buildid}
-            cat << EOF > make_release_parameters
-            binariesdir=${binariesdir}
-            logsdir=${logsdir}
-            EOF
-
-            echo "NOTE: Make-release job parameters:"
-            cat make_release_parameters
-
-            cat << EOF > test_release_parameters
-            tarball_url=http://${fileserver}/~tcwg-buildslave/${binariesdir}
-            release=${tcwg_release}
-            EOF
-
-            echo "NOTE: Test-release job parameters:"
-            cat test_release_parameters
-
-            exit 0
-
-        - multijob:
-            name: 'Check Make Release'
-            condition: COMPLETED
-            projects:
-              - name: tcwg-make-release
-                current-parameters: true
-                property-file: make_release_parameters
-        - multijob:
-            name: 'Check Test Release'
-            condition: COMPLETED
-            projects:
-              - name: tcwg-test-release-matrix
-                current-parameters: true
-                property-file: test_release_parameters
-    publishers:
-        - email-ext:
-            recipients: 'tcwg-validation@linaro.org'
-            send-to:
-              requester
-              recipients
diff --git a/tcwg-make-gcc-release-tag.yaml b/tcwg-make-gcc-release-tag.yaml
index f9752b0ea0..d938ae5828 100644
--- a/tcwg-make-gcc-release-tag.yaml
+++ b/tcwg-make-gcc-release-tag.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -33,14 +33,14 @@
             name: date
             default: ''
             description: 'Snapshot or Release date (YYYY.MM)'
-    disabled: false
+    disabled: true
     node: tcwg-x86_64-dev-01-short
     retry-count: 3
     concurrent: true
     display-name: 'TCWG Tag GCC Sources'
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
+            url: https://git.linaro.org/toolchain/gcc.git
             refspec: +refs/heads/*:refs/remotes/origin/*
             branches:
                 - refs/heads/master
@@ -70,7 +70,7 @@
 
             rm -rf release
             rm -rf tcwg-release-tools
-            git clone -b automation --depth 1 https://git-us.linaro.org/toolchain/tcwg-release-tools
+            git clone -b automation --depth 1 https://git.linaro.org/toolchain/tcwg-release-tools
 
             pushd gcc_src
 
diff --git a/tcwg-make-release.yaml b/tcwg-make-release.yaml
deleted file mode 100644
index ada3480f23..0000000000
--- a/tcwg-make-release.yaml
+++ /dev/null
@@ -1,352 +0,0 @@
-# http://docs.openstack.org/infra/jenkins-job-builder/definition.html
-- job:
-    name: tcwg-make-release
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 10
-    parameters:
-        - string:
-            name: gcc_src
-            default: 'gcc-linaro-5.3-2016.02.tar.xz'
-            description: 'The source of GCC. Specify as it would be passed to abe.sh, either a source tarball, git branch and revision, git tag, or a URL of a tarball e.g., "gcc-linaro-5.3-2016.02.tar.xz"'
-        - string:
-            name: binutils_src
-            default: ''
-            description: 'Optional revision of binutils to use for this release, e.g., "binutils-gdb.git~linaro_binutils-2_25-branch"'
-        - string:
-            name: glibc_src
-            default: ''
-            description: 'Optional revision of Glibc to use for this release, e.g., "glibc.git~linaro/2.21/master"'
-        - string:
-            name: release_name
-            default: ''
-            description: 'Optional release string to use, e.g., "2016.05", "2016.05-rc3", "2016.05-1", "2016.05-1-rc2". The default is to extract the release string from the gcc_src field'
-        - string:
-            name: toolchain_config
-            default: 'default'
-            description: 'Toolchain version config, e.g., "default", "gcc5", or "gcc6". Relative to abe config/ dir'
-        - string:
-            name: target_list
-            default: 'aarch64-elf aarch64-linux-gnu aarch64-linux-gnu_ilp32 aarch64_be-elf aarch64_be-linux-gnu armv8l-linux-gnueabihf arm-eabi arm-linux-gnueabi arm-linux-gnueabihf armeb-eabi armeb-linux-gnueabi armeb-linux-gnueabihf'
-            description: 'List of targets to use'
-        - string:
-            name: builder_arch_list
-            default: 'i386 amd64'
-            description: 'List of builder architectures to use (i386,amd64)'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/tested
-            description: 'ABE revision to test'
-        - string:
-            name: scripts_branch
-            default: master
-            description: 'Scripts branch to use'
-        - choice:
-            name: debug
-            choices:
-                - none
-                - abe
-                - yaml
-            description: "Level of debug information: none - No debugging information, abe - ABE debugging information, yaml - tcwg-make-release.yaml debug information (and exit)."
-        - string:
-            name: fileserver
-            default: dev-01.tcwglab
-            description: 'Remote file server for logs and binaries'
-        - bool:
-            name: testrelease
-            default: 'true'
-            description: 'Run test-release if make-release is successful'
-        - string:
-            name: tcwg_regression_rev
-            default: 'master'
-            description: 'tcwg-regression revision to use'
-        - string:
-            name: binariesdir
-            default: ''
-            description: 'Optional upload dir for binaries on fileserver. If empty, a suitable value is computed by the script'
-        - string:
-            name: logsdir
-            default: ''
-            description: 'Optional upload dir for logs on fileserver. If empty, a suitable value is computed by the script'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG Make Release'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - ${abe_branch}
-            skip-tag: true
-            shallow-clone: true
-            basedir: abe
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-build
-        - axis:
-            type: dynamic
-            name: builder_arch
-            values:
-                - builder_arch_list
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="release_name"}'
-        - workspace-cleanup:
-            include:
-              - "*"
-            dirmatch: true
-    builders:
-      - shell: |
-            #!/bin/bash
-            set -e
-
-            if test x"${debug}" = x"abe"; then
-              shell="/bin/bash -x"
-              set -x
-            else
-                shell="/bin/bash"
-            fi
-
-            if test x"${debug}" = x"yaml"; then
-                echo WORKSPACE:  $WORKSPACE
-                echo CURRENTDIR: `pwd`
-                ls -lR
-                exit 0
-            fi
-
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
-            . jenkins-scripts/jenkins-helpers.sh
-
-            # Start build container
-            build_container_type=docker
-            build_container_distro=trusty
-            builder=$(print_host_for_node $NODE_NAME)
-            bash -x ./jenkins-scripts/start-container-${build_container_type}.sh --arch ${builder_arch} --distro ${build_container_distro} --session-host ${builder} > build-container.sh
-
-            # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port
-            . ./build-container.sh
-            BUILD_CONTAINER="${CONTAINER}"
-            BUILD_CONTAINER_CLEANUP="${CONTAINER_CLEANUP}"
-
-            # Make sure to cleanup build container if something goes
-            # wrong when preparing the rest of the environment
-            if [ x"${BUILD_CONTAINER_CLEANUP}" != x ]; then
-                CONTAINERS_CLEANUP="${BUILD_CONTAINER_CLEANUP}"
-                trap "${CONTAINERS_CLEANUP}" EXIT
-            fi
-
-            tcwg_release=${release_name}
-            # If there is no release_name set, extract release information from the gcc_src
-            if test "${release_name:+set}" != "set"; then
-                case "$gcc_src" in
-                *.tar.xz)
-                    tcwg_release="$(basename $gcc_src | cut -d '-' -f4-)"
-                    tcwg_release=${tcwg_release%".tar.xz"}
-                    ;;
-                gcc.git~*)
-                    tcwg_release="$(echo $gcc_src | grep -o -e '-\(20[0-9]\{2\}\.[01][0-9].*\)' )"
-                    tcwg_release=${tcwg_release#-}
-                    ;;
-                *)
-                    echo "ERROR: Could not find tcwg release"
-                    exit 1
-                    ;;
-                esac
-            fi
-
-            if [ x"${tcwg_release}" = x"" ]; then
-                echo "ERROR: Could not find tcwg release"
-                exit 1
-            fi
-
-            case "$target:$toolchain_config:$tcwg_release" in
-              aarch64-linux-gnu_ilp32:gcc7:*-rc*)
-                # Building ILP32 toolchain as release candidate of gcc7.
-                ;;
-              aarch64-linux-gnu_ilp32:*)
-                echo "SKIPPING ILP32 TOOLCHAIN IN NON-RC/NON-GCC7 BUILD" | tee MakeRelease.log
-                xz MakeRelease.log
-                exit 0
-                ;;
-            esac
-
-            # This job always uses Canadian cross builds and builds 2
-            # toolchains at a time when run on a amd64 slave.
-            # When run on a i386 host, no need to duplicate the
-            # Canadian cross build for mingw.
-            canadian=
-            case ${builder_arch} in
-              amd64)
-                host=x86_64
-                canadian=--canadian ;;
-              i386)
-                host=i686
-                canadian= ;;
-             *)
-                echo "ERROR: unsupported label: ${label}"
-                exit 1
-                ;;
-            esac
-
-            # FIXME. MakeRelease copies to a directory, while
-            # TestRelease downloads from a URL, so both dirs differ
-            # depending on httpd's DocumentRoot
-            # Setting url_prefix can be removed once test-release is
-            # started after make-release has completed.
-            case ${binariesdir} in
-              releases/binaries/*)
-                url_prefix=$(echo \~${USER}/${binariesdir})
-                ;;
-              "")
-                # Compute default binariesdirs/logsdir in case they
-                # are not supplied by the user. Normally they are set
-                # by tcwg-make-and-test-release.
-
-                # Extract the gcc_version information from gcc_src to determine
-                # which directory to copy the tarballs into.
-                case "$gcc_src" in
-                    *.tar.*) # src tarballs usually named like this
-                        gcc_version=$(basename $gcc_src | awk -F '-' '{ print $3 }')
-                        ;;
-                    *.git~*) # building from git branch or tag
-                        gcc_version=$(basename $gcc_src | awk -F '-' '{ print $2 }')
-                        ;;
-                    *)
-                        echo "ERROR: could not extract version from gcc_src"
-                        exit 1
-                        ;;
-                esac
-                if ! echo "${gcc_version}" | grep -xEq '[0-9]+\.[0-9]+(\.[0-9]+)?'; then
-                    echo "ERROR: gcc version '${gcc_version}' invalid"
-                    exit 1
-                fi
-
-                gcc_major="`echo $gcc_version | awk -F '.' '{ print $1 }'`"
-                gcc_minor="`echo $gcc_version | awk -F '.' '{ print $2 }'`"
-                tcwg_version="${gcc_major}.${gcc_minor}"
-                if test ${gcc_major} -lt 5; then
-                    gcc_point="`echo $gcc_version | awk -F '.' '{ print $2 }'`"
-                    tcwg_version="${gcc_major}.${gcc_minor}.${gcc_point}"
-                fi
-
-                buildid=`printf '%04d' ${BUILD_NUMBER}`
-
-                binariesdir=releases/binaries/${tcwg_version}-${tcwg_release}-${buildid}
-                logsdir=releases/logs/${tcwg_version}-${tcwg_release}-${buildid}
-
-                url_prefix=$(echo \~${USER}/${binariesdir})
-                ;;
-              *)
-                echo Unsupported binariesdir: ${binariesdir}. Fix the job.
-                ;;
-            esac
-
-            ${BUILD_CONTAINER} "cd ${WORKSPACE} && ${shell} ${WORKSPACE}/jenkins-scripts/MakeRelease.job --abedir ${WORKSPACE}/abe --workspace ${WORKSPACE} ${canadian} --target ${target}${tcwg_release:+ --release_name ${tcwg_release}} --fileserver ${fileserver} --toolchainconfig ${toolchain_config} --binariesdir ${binariesdir}/${target} --logsdir ${logsdir}/${target} --buildnumber ${BUILD_NUMBER} ${gcc_src:+ --gcc ${gcc_src}} ${binutils_src:+ --binutils ${binutils_src}} ${glibc_src:+ --glibc ${glibc_src}}"
-            if test $? -gt 0; then
-              exit 1
-            fi
-
-            # tarballs are written in ${WORKSPACE}/snapshots, which is
-            # not shared between host and container. So, we need to
-            # execute the find command inside the container.
-
-            if test x"${canadian}" = x"--canadian"; then
-                linux_artifacts=artifacts1.txt
-                mingw_artifacts=artifacts2.txt
-            else
-                linux_artifacts=artifacts2.txt
-            fi
-
-            # We always build a Linux tarball, even in canadian cross mode
-            tarball_linux=$(grep "^toolchain=" ${WORKSPACE}/${linux_artifacts} | cut -d = -f 2-)
-            if test x"${tarball_linux}" = x"" -o ! -f "${tarball_linux}"; then
-              echo "ERROR: no binary Linux tarball found!"
-              exit 1
-            fi
-
-            if test x"${canadian}" = x"--canadian"; then
-              tarball_mingw=$(grep "^toolchain=" ${WORKSPACE}/${mingw_artifacts} | cut -d = -f 2-)
-              if test x"${tarball_mingw}" = x"" -o ! -f "${tarball_mingw}"; then
-                echo "ERROR: no binary MingW tarball found!"
-                exit 1
-              fi
-            fi
-
-            if $testrelease; then
-              tarball_linux="`basename ${tarball_linux}`"
-              tarball_linux_url="http://${fileserver}/${url_prefix}/${target}/${tarball_linux}"
-              cat << EOF > tcwg.params.linux
-            tarball_url=${tarball_linux_url}
-            release=${tcwg_version}-${tcwg_release}
-            target=${host}-${target}
-            EOF
-
-              if test x"${canadian}" = x"--canadian"; then
-                tarball_mingw="`basename ${tarball_mingw}`"
-                tarball_mingw_url="http://${fileserver}/${url_prefix}/${target}/${tarball_mingw}"
-                cat << EOF > tcwg.params.mingw
-            tarball_url=${tarball_mingw_url}
-            release=${tcwg_version}-${tcwg_release}
-            target=mingw-${target}
-            EOF
-              fi
-            fi
-
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: tcwg.params.linux
-          steps:
-              - trigger-builds:
-                  - project: 'tcwg-test-release'
-                    property-file: tcwg.params.linux
-                    current-parameters: true
-                    block: false
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: tcwg.params.mingw
-          steps:
-              - trigger-builds:
-                  - project: 'tcwg-test-release'
-                    property-file: tcwg.params.mingw
-                    current-parameters: true
-                    block: false
-    publishers:
-        - archive:
-            artifacts: 'MakeRelease*.log.xz'
-            latest-only: false
-        - email:
-            recipients: 'tcwg-validation@linaro.org'
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org'
-            send-to:
-              requester
-              recipients
diff --git a/tcwg-make-source-tarball.yaml b/tcwg-make-source-tarball.yaml
deleted file mode 100644
index 7d951e339b..0000000000
--- a/tcwg-make-source-tarball.yaml
+++ /dev/null
@@ -1,103 +0,0 @@
-- job:
-    name: tcwg-make-source-tarball
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 10
-            num-to-keep: 10
-    parameters:
-        - string:
-            name: tag
-            default: ''
-            description: 'GCC tagged version to use (like linaro-6.3-2017.03).'
-        - string:
-            name: upload_dir
-            default: ''
-            description: 'Destination directory on dev-01 (Artifacts only when empty).'
-    disabled: false
-    node: tcwg-x86_64-dev-01
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG Make GCC Source Tarball'
-    scm:
-        - git:
-            url: http://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - refs/heads/master
-            basedir: gcc_src
-            per-build-tag: false
-            shallow-clone: false
-            wipe-workspace: true
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-            clean:
-                before: true
-    execution-strategy:
-        sequential: false
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${tag}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-
-            rm -rf jenkins-scripts
-            git clone --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
-            . jenkins-scripts/jenkins-helpers.sh
-
-            rm -rf tcwg-release-tools
-            git clone -b automation --depth 1 https://git-us.linaro.org/toolchain/tcwg-release-tools
-
-            rm -rf release_build
-            mkdir -p ${WORKSPACE}/release_build
-
-            rm -rf artifacts
-            mkdir -p ${WORKSPACE}/artifacts
-
-            # Start build container
-            host=$(print_host_for_node $NODE_NAME)
-            bash ${WORKSPACE}/jenkins-scripts/start-container-docker.sh --arch amd64 --distro trusty --session-host ${host} > build-container.sh
-
-            # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port
-            . ./build-container.sh
-            BUILD_CONTAINER="${CONTAINER}"
-            BUILD_CONTAINER_CLEANUP="${CONTAINER_CLEANUP}"
-
-            # Make sure to cleanup build container if something goes
-            # wrong when preparing the test environment
-            if [ x"${BUILD_CONTAINER_CLEANUP}" != x ]; then
-                CONTAINERS_CLEANUP="${BUILD_CONTAINER_CLEANUP}"
-                trap "${CONTAINERS_CLEANUP}" EXIT
-            fi
-
-            # Setup job parameters and run
-            ${BUILD_CONTAINER} "sudo apt-get update ; sudo apt-get -y install libgmp-dev libmpfr-dev libmpc-dev"
-            ${BUILD_CONTAINER} "bash -x ${WORKSPACE}/tcwg-release-tools/tcwg-release-tarball.sh -g ${WORKSPACE}/gcc_src -r ${WORKSPACE}/release_build -t ${tag}"
-
-            cp release_build/gcc-${tag}/*.tar.* artifacts/.
-            cp release_build/gcc-${tag}/gcc-${tag}/ChangeLog.linaro artifacts/.
-
-            if [ "${upload_dir:+set}" = "set" ]; then
-                mkdir -p "$upload_dir"
-                rsync -a artifacts/ "$upload_dir"
-            fi
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            latest-only: false
diff --git a/tcwg-publish-files.yaml b/tcwg-publish-files.yaml
index 1030331e70..a6724fc526 100644
--- a/tcwg-publish-files.yaml
+++ b/tcwg-publish-files.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -26,7 +26,7 @@
                name: dry_run
                default: true
                description: 'Whether to do a dry-run'
-    disabled: false
+    disabled: true
     node: tcwg-x86_64-dev-01-short
     display-name: 'TCWG DDD Copy files to snapshots.l.o'
     wrappers:
@@ -46,7 +46,7 @@
             wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
             dry_run_opt=""
             $dry_run && dry_run_opt="--dry-run" || true
-            time python ${HOME}/bin/linaro-cp.py $dry_run_opt --api_version 3 \
+            time python3 ${HOME}/bin/linaro-cp.py $dry_run_opt --api_version 3 \
               $src_dir components/toolchain/$dst_dir/
     publishers:
         - email-ext:
diff --git a/tcwg-publish-snapshot.yaml b/tcwg-publish-snapshot.yaml
index 3545b87581..462098f7d4 100644
--- a/tcwg-publish-snapshot.yaml
+++ b/tcwg-publish-snapshot.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -104,7 +104,7 @@
             # Publish to snapshots
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget https://git.linaro.org/ci/publishing-api.git/plain/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               out ${dest_dir}/${snapshot_version}/
     publishers:
diff --git a/tcwg-reboot.yaml b/tcwg-reboot.yaml
new file mode 100644
index 0000000000..ebb408ff7d
--- /dev/null
+++ b/tcwg-reboot.yaml
@@ -0,0 +1,78 @@
+- job:
+    name: tcwg-reboot
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+        - build-blocker:
+            blocking-jobs:
+              - "tcwg.*"
+            block-level: 'NODE'
+    parameters:
+        - label:
+            name: node_list
+            default: tcwg-apm_64-build
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - bool:
+            name: dry_run
+            default: 'false'
+            description: 'Whether to do a dry-run'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG CCC Reboot periodically'
+    triggers:
+        - timed: '@daily'
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            if $dry_run ; then
+                DRYRUN=echo
+            else
+                DRYRUN=
+            fi
+
+            $DRYRUN ssh -p22 -o StrictHostKeyChecking=no localhost "sudo reboot; sleep 60"
+            # We expect non-zero exit when node is rebooted.  If we get here
+            # that means we have a failure (unless $dry_run, of course).
+            if $dry_run; then
+              echo "DRY-RUN: Ignoring failure to reboot"
+              false
+            else
+              echo "ERROR: Failed to reboot"
+              true
+            fi
+    publishers:
+        - email-ext:
+            recipients: tcwg-validation@linaro.org
+            content-type: text
+            subject: '[CI-NOTIFY]: ${PROJECT_NAME} on ${NODE_NAME} - Build # ${BUILD_NUMBER} ${BUILD_STATUS}'
+            aborted: true
+            failure: false
+            success: true
diff --git a/tcwg-regression-detection.yaml b/tcwg-regression-detection.yaml
deleted file mode 100644
index 2fe01eb3c3..0000000000
--- a/tcwg-regression-detection.yaml
+++ /dev/null
@@ -1,172 +0,0 @@
-- job:
-    name: tcwg-regression-detection
-    project-type: multijob
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: abe_test_list
-            default: 'abe-tests-checkout'
-            description: 'List of ABE tests to perform'
-        - string:
-            name: release_target_list
-            default: 'arm-linux-gnueabihf'
-            description: 'List of release targets to use'
-        - string:
-            name: ref_abe_rev
-            default: ''
-            description: 'Reference ABE revision to use. Empty (default) means previous revision'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG Regression Detection'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/abe.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            branches:
-                - refs/heads/master
-            wipe-workspace: false
-            scm-name: abe
-            skip-tag: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/abe-tests.git
-            basedir: abe-tests
-            branches:
-                - refs/heads/master
-            wipe-workspace: false
-            scm-name: abe-tests
-            skip-tag: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc-compare-results.git
-            basedir: gcc-compare-results
-            branches:
-                - refs/heads/master
-            wipe-workspace: false
-            scm-name: gcc-compare-results
-            skip-tag: true
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            basedir: jenkins-scripts
-            branches:
-                - refs/heads/master
-            wipe-workspace: false
-            scm-name: jenkins-scripts
-            skip-tag: true
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            trigger-on:
-                - change-merged-event
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'toolchain/jenkins-scripts'
-                  branches:
-                    - branch-pattern: 'master'
-                  forbidden-file-paths:
-                    - compare-type: REG_EXP
-                      pattern: tcwg-llvm-*
-                    - compare-type: PLAIN
-                      pattern: tcwg-benchmark.sh
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'toolchain/abe'
-                  branches:
-                    - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'toolchain/abe-tests'
-                  branches:
-                    - branch-pattern: 'master'
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'toolchain/gcc-compare-results'
-                  branches:
-                    - branch-pattern: 'master'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            mkdir -p artifacts/
-
-            # Abe's revisions to test
-            # TODO: gather reference from previous build instead of using N-1.
-            cur_abe_rev=$(git rev-parse HEAD)
-            if [ "x$ref_abe_rev" = "x" ]; then
-              ref_abe_rev=$(git rev-parse HEAD~)
-            fi
-
-            echo "abe_revision=$cur_abe_rev" > artifacts/infos.txt
-
-            cat << EOF > buildfarm_cmp_parameters
-            ref_override=--extraconfigdir ../config/gcc7 gcc=gcc.git~linaro/gcc-7-branch
-            eval_override=--extraconfigdir ../config/gcc7 gcc=gcc.git~linaro/gcc-7-branch
-            ref_abe_branch=$ref_abe_rev
-            eval_abe_branch=$cur_abe_rev
-            target_list=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf
-            displaytag=reg-detection-${BUILD_NUMBER}
-            EOF
-
-            echo "NOTE: Buildfarm cmp job parameters:"
-            cat buildfarm_cmp_parameters
-
-            # TODO: Change fileserver and/or location to avoid mixing "real"
-            # releases and regression detection builds.
-            # testrelease=false means that tcwg-make-release should
-            # not spawn tcwg-test-release itself. This is taken care
-            # of by tcwg-make-and-test-release.
-            # keep 6.2-2016.11 regtest tag until we make one for 7.1
-            cat << EOF > make_release_parameters
-            gcc_src=http://releases.linaro.org/components/toolchain/gcc-linaro/7.2-2017.11/gcc-linaro-7.2-2017.11.tar.xz
-            release_name=2017.05-regtest-${BUILD_NUMBER}
-            toolchain_config=gcc7
-            abe_branch=$cur_abe_rev
-            fileserver=dev-01.tcwglab
-            target_list=$release_target_list
-            testrelease=false
-            tcwg_regression_rev=ok-for-regtest-with-gcc-linaro-7.2-2017.11
-            EOF
-
-            echo "NOTE: Make-release job parameters:"
-            cat make_release_parameters
-        - multijob:
-            name: 'Check Manifest'
-            condition: ALWAYS
-            projects:
-              - name: tcwg-abe-test
-                predefined-parameters: |
-                  test_list=$abe_test_list
-        - multijob:
-            name: 'Check build/testsuite and releases'
-            condition: COMPLETED
-            projects:
-              - name: tcwg-buildfarm-cmp
-                property-file: buildfarm_cmp_parameters
-              - name: tcwg-make-and-test-release
-                property-file: make_release_parameters
-                predefined-parameters: |
-                  target_list='arm-linux-gnueabihf'
-    publishers:
-        - archive:
-            artifacts: 'artifacts/*'
-            latest-only: false
-        - email:
-            recipients: 'yvan.roux@linaro.org tcwg-validation@linaro.org'
diff --git a/tcwg-report-stale-rr-jobs.yaml b/tcwg-report-stale-rr-jobs.yaml
new file mode 100644
index 0000000000..a19070dd07
--- /dev/null
+++ b/tcwg-report-stale-rr-jobs.yaml
@@ -0,0 +1,98 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-report-stale-rr-jobs.yaml.in and tcwg-report-stale-rr-jobs/tcwg-report-stale-rr-jobs.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts-master
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/master:refs/remotes/origin/master
+          branches:
+            - master
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-report-stale-rr-jobs
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+      - string:
+          name: days
+          default: 8
+          description: 'List jobs with no successful run in DAYS'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: false
+    display-name: 'TCWG CCC Report Stale RR Jobs'
+    scm:
+      - jenkins-scripts-master
+    triggers:
+      - timed: '@daily'
+    wrappers:
+      - timeout:
+          timeout: 300
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          set -x
+
+          rm -rf artifacts
+          mkdir artifacts
+          bash -x ./jenkins-scripts/tcwg-report-stale-rr-jobs.sh --days "$days" \
+              --output artifacts/stale-jobs.log
+          bash -x ./jenkins-scripts/tcwg-report-stale-rr-jobs.sh \
+              --classify artifacts/stale-jobs.log \
+              --output artifacts/stale-jobs-analysis.log || true
+          n_lines=$(cat artifacts/stale-jobs.log | wc -l)
+          ./jenkins-scripts/tcwg-report-ci-status.sh > artifacts/ci-status.log
+          if [ x"$n_lines" != x"0" ]; then
+            (
+              echo "Jobs with no new results in $days days ($n_lines entries):"
+              cat artifacts/ci-status.log
+              cat artifacts/stale-jobs-analysis.log
+              cat artifacts/stale-jobs.log
+            ) > artifacts/email-body.txt
+            exit 1
+          fi
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+        - email-ext:
+            recipients: 'maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org'
+            content-type: text
+            body: |
+              ${FILE,path="artifacts/email-body.txt"}
+            failure: true
+            aborted: true
+# checksum: a020d23dcdda834e74fb3a69446e7e1e
diff --git a/tcwg-report-stale-rr-jobs.yaml.in b/tcwg-report-stale-rr-jobs.yaml.in
new file mode 100644
index 0000000000..3c371ab190
--- /dev/null
+++ b/tcwg-report-stale-rr-jobs.yaml.in
@@ -0,0 +1,64 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-report-stale-rr-jobs
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+      - string:
+          name: days
+          default: 8
+          description: 'List jobs with no successful run in DAYS'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: false
+    display-name: 'TCWG CCC Report Stale RR Jobs'
+    scm:
+      - jenkins-scripts-master
+    triggers:
+      - timed: '@daily'
+    wrappers:
+      - timeout:
+          timeout: 300
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+    builders:
+      - shell: |
+          #!/bin/bash
+          set -euf -o pipefail
+          set -x
+
+          rm -rf artifacts
+          mkdir artifacts
+          bash -x ./jenkins-scripts/tcwg-report-stale-rr-jobs.sh --days "$days" \
+              --output artifacts/stale-jobs.log
+          bash -x ./jenkins-scripts/tcwg-report-stale-rr-jobs.sh \
+              --classify artifacts/stale-jobs.log \
+              --output artifacts/stale-jobs-analysis.log || true
+          n_lines=$(cat artifacts/stale-jobs.log | wc -l)
+          ./jenkins-scripts/tcwg-report-ci-status.sh > artifacts/ci-status.log
+          if [ x"$n_lines" != x"0" ]; then
+            (
+              echo "Jobs with no new results in $days days ($n_lines entries):"
+              cat artifacts/ci-status.log
+              cat artifacts/stale-jobs-analysis.log
+              cat artifacts/stale-jobs.log
+            ) > artifacts/email-body.txt
+            exit 1
+          fi
+    publishers:
+        - archive:
+            artifacts: 'artifacts/**'
+            latest-only: false
+        - email-ext:
+            recipients: 'maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org'
+            content-type: text
+            body: |
+              ${FILE,path="artifacts/email-body.txt"}
+            failure: true
+            aborted: true
diff --git a/tcwg-report-stale-rr-jobs/tcwg-report-stale-rr-jobs.def b/tcwg-report-stale-rr-jobs/tcwg-report-stale-rr-jobs.def
new file mode 100644
index 0000000000..7902d045c0
--- /dev/null
+++ b/tcwg-report-stale-rr-jobs/tcwg-report-stale-rr-jobs.def
@@ -0,0 +1 @@
+-v JENKINS_SCRIPTS=master
diff --git a/tcwg-sanity-check.yaml.in b/tcwg-sanity-check.yaml.in
new file mode 100644
index 0000000000..28e3a04e2a
--- /dev/null
+++ b/tcwg-sanity-check.yaml.in
@@ -0,0 +1,95 @@
+- job:
+#if CHECK_TYPE_shell_scripts_sanity
+    name: tcwg-shell-scripts-sanity-check
+#elif CHECK_TYPE_lnt
+    name: tcwg-lnt-check
+#endif
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+    disabled: false
+    node: tcwg-x86_64-build
+
+#if CHECK_TYPE_shell_scripts_sanity
+    display-name: 'TCWG shell scripts sanity check'
+#elif CHECK_TYPE_lnt
+    display-name: 'TCWG LNT check'
+#endif
+    scm:
+        # Get a stable copy of the check script
+        - git:
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
+            branches:
+                - origin/master
+            basedir: jenkins-scripts-master
+        # Then this is what we're actually checking
+        # (which might also be jenkins-scripts, but Gerrit's version)
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: ${GERRIT_PROJECT}
+    triggers:
+        - gerrit:
+            server-name: 'review.linaro.org'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: true
+            projects:
+#if CHECK_TYPE_shell_scripts_sanity
+                - project-compare-type: 'REG_EXP'
+                  project-pattern: 'toolchain\/(jenkins-scripts|bmk-scripts)'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'master'
+#elif CHECK_TYPE_lnt
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'toolchain/llvm-lnt'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'linaro-local/master'
+#endif
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GERRIT_PROJECT}'
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+    builders:
+        - shell:
+            command: |
+                #!/bin/bash
+                set -ex
+
+                # Shellcheck source= directives are relative to
+                # the CWD, so run from inside the folder.
+                # GERRIT_PROJECT is for example toolchain/jenkins-scripts
+                cd ${GERRIT_PROJECT}
+#if CHECK_TYPE_shell_scripts_sanity
+                ../../jenkins-scripts-master/docker-run.sh -- ../../jenkins-scripts-master/sanity-check.sh
+#elif CHECK_TYPE_lnt
+                ../../jenkins-scripts-master/docker-run.sh --distro focal -- ../../jenkins-scripts-master/tcwg-lnt/lnt-check.sh
+#endif
+            # Aka some files had issues
+            # Any other non-zero means we called shellcheck incorrectly
+            unstable-return: 1
diff --git a/tcwg-sanity-check/tcwg-lnt-check.def b/tcwg-sanity-check/tcwg-lnt-check.def
new file mode 100644
index 0000000000..9c6fcbf4b7
--- /dev/null
+++ b/tcwg-sanity-check/tcwg-lnt-check.def
@@ -0,0 +1 @@
+-v CHECK_TYPE=lnt
diff --git a/tcwg-sanity-check/tcwg-shell-scripts-sanity-check.def b/tcwg-sanity-check/tcwg-shell-scripts-sanity-check.def
new file mode 100644
index 0000000000..395e327b5e
--- /dev/null
+++ b/tcwg-sanity-check/tcwg-shell-scripts-sanity-check.def
@@ -0,0 +1 @@
+-v CHECK_TYPE=shell_scripts_sanity
diff --git a/tcwg-shell-scripts-sanity-check.yaml b/tcwg-shell-scripts-sanity-check.yaml
new file mode 100644
index 0000000000..73563c0a62
--- /dev/null
+++ b/tcwg-shell-scripts-sanity-check.yaml
@@ -0,0 +1,77 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-sanity-check.yaml.in and tcwg-sanity-check/tcwg-shell-scripts-sanity-check.def. Do not edit.
+- job:
+    name: tcwg-shell-scripts-sanity-check
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+    disabled: false
+    node: tcwg-x86_64-build
+
+    display-name: 'TCWG shell scripts sanity check'
+    scm:
+        # Get a stable copy of the check script
+        - git:
+            url: https://git.linaro.org/toolchain/jenkins-scripts.git
+            branches:
+                - origin/master
+            basedir: jenkins-scripts-master
+        # Then this is what we're actually checking
+        # (which might also be jenkins-scripts, but Gerrit's version)
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: ${GERRIT_PROJECT}
+    triggers:
+        - gerrit:
+            server-name: 'review.linaro.org'
+            trigger-on:
+                - patchset-created-event:
+                    exclude-drafts: true
+            projects:
+                - project-compare-type: 'REG_EXP'
+                  project-pattern: 'toolchain\/(jenkins-scripts|bmk-scripts)'
+                  branches:
+                    - branch-compare-type: 'PLAIN'
+                      branch-pattern: 'master'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GERRIT_PROJECT}'
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+    builders:
+        - shell:
+            command: |
+                #!/bin/bash
+                set -ex
+
+                # Shellcheck source= directives are relative to
+                # the CWD, so run from inside the folder.
+                # GERRIT_PROJECT is for example toolchain/jenkins-scripts
+                cd ${GERRIT_PROJECT}
+                ../../jenkins-scripts-master/docker-run.sh -- ../../jenkins-scripts-master/sanity-check.sh
+            # Aka some files had issues
+            # Any other non-zero means we called shellcheck incorrectly
+            unstable-return: 1
+# checksum: 026510132c28ef8e0bd44df8dfba2501
diff --git a/tcwg-test-release-matrix.yaml b/tcwg-test-release-matrix.yaml
deleted file mode 100644
index d28fd0dbfc..0000000000
--- a/tcwg-test-release-matrix.yaml
+++ /dev/null
@@ -1,174 +0,0 @@
-- job:
-    name: tcwg-test-release-matrix
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: tarball_url
-            default: 'http://releases.linaro.org/components/toolchain/binaries/latest'
-            description: 'The GCC binary tarball to test'
-        - string:
-            name: scripts_branch
-            default: refs/remotes/origin/master
-            description: 'Scripts revision to use '
-        - string:
-            name: build_container_tag
-            default: 'trusty'
-            description: 'Distro to use for the container: trusty, xenial.'
-        - string:
-            name: release
-            default:
-            description: 'Release name'
-        - string:
-           name: target_list
-           default: 'aarch64-elf aarch64-linux-gnu aarch64-linux-gnu_ilp32 aarch64_be-elf aarch64_be-linux-gnu armv8l-linux-gnueabihf arm-eabi arm-linux-gnueabi arm-linux-gnueabihf armeb-eabi armeb-linux-gnueabi armeb-linux-gnueabihf'
-           description: 'List of targets to use'
-        - string:
-            name: tcwg_regression_rev
-            default: 'master'
-            description: 'tcwg-regression revision to use'
-        - bool:
-            name: debug
-            default: false
-            description: 'Whether to enable bash debugging output.'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG Test Release matrix'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-               - tcwg-x86_32-build
-               - tcwg-x86_64-build
-        - axis:
-            type: dynamic
-            name: target
-            values:
-                - target_list
-    execution-strategy:
-        sequential: false
-    triggers:
-        - gerrit:
-            server-name: 'review.linaro.org'
-            gerrit-build-successful-codereview-value: 1
-            gerrit-build-failed-codereview-value: -1
-            projects:
-                - project-compare-type: 'PLAIN'
-                  project-pattern: 'toolchain/tcwg-regression'
-                  branches:
-                    - branch-pattern: 'master'
-            silent-start: true
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="release"}-${ENV,var="target"}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -e
-
-            if test x${debug} = x"true"; then
-              shell="/bin/bash -x"
-              set -x
-            else
-              shell="/bin/bash"
-            fi
-
-            . jenkins-helpers.sh
-
-            if [ x"$GERRIT_REFSPEC" != x"" ]; then
-              tcwg_regression_rev="$GERRIT_REFSPEC"
-            fi
-
-            if test x"${tarball_url}" = x; then
-              echo "ERROR: no binary tarball specified!"
-              exit 1
-            fi
-
-            case "$target:$toolchain_config:release" in
-              aarch64-linux-gnu_ilp32:gcc7:*-rc*)
-                # Building ILP32 toolchain as release candidate of gcc7.
-                ;;
-              aarch64-linux-gnu_ilp32:*)
-                echo "SKIPPING ILP32 TOOLCHAIN IN NON-RC/NON-GCC7 BUILD"
-                exit 0
-                ;;
-            esac
-
-            case ${label} in
-                *32*)
-                    host=i686
-                    builder_arch=i386
-                    ;;
-                *64*)
-                    host=x86_64
-                    builder_arch=amd64
-                    ;;
-                *)
-                    echo "Unsupported slave type: ${label}"
-                    exit 1
-                    ;;
-            esac
-
-            # Start build container
-            builder=$(print_host_for_node $NODE_NAME)
-            build_container_type=docker
-            bash -x ${WORKSPACE}/start-container-${build_container_type}.sh --arch ${builder_arch} --distro ${build_container_tag} --session-host ${builder} > build-container.sh
-
-            # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port
-            . ./build-container.sh
-            BUILD_CONTAINER="${CONTAINER}"
-            BUILD_CONTAINER_CLEANUP="${CONTAINER_CLEANUP}"
-
-            # Make sure to cleanup build container if something goes wrong
-            if [ x"${BUILD_CONTAINER_CLEANUP}" != x ]; then
-                CONTAINERS_CLEANUP="${BUILD_CONTAINER_CLEANUP}"
-                trap "${CONTAINERS_CLEANUP}" EXIT
-            fi
-
-            container_exec ${shell} ${WORKSPACE}/TestRelease.job --tarball "${tarball_url}/${target}/gcc-linaro-*-*-${host}_${target}.tar.xz" --workspace ${WORKSPACE}/linux --tcwg-regression-rev ${tcwg_regression_rev}
-
-            # Test the mingw toolchain on 32 bit host only
-            case ${label} in
-                *32*)
-                    host=i686-mingw32
-                    container_exec ${shell} ${WORKSPACE}/TestRelease.job --tarball "${tarball_url}/${target}/gcc-linaro-*-*-${host}_${target}.tar.xz" --workspace ${WORKSPACE}/mingw --tcwg-regression-rev ${tcwg_regression_rev}
-                    ;;
-            esac
-
-            exit $?
-    publishers:
-        - email-ext:
-            recipients: 'tcwg-validation@linaro.org'
-            send-to:
-              requester
-              recipients
diff --git a/tcwg-test-release.yaml b/tcwg-test-release.yaml
deleted file mode 100644
index 5510fb1fbf..0000000000
--- a/tcwg-test-release.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
-- job:
-    name: tcwg-test-release
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 60
-            num-to-keep: 100
-    parameters:
-        - string:
-            name: tarball_url
-            default: ''
-            description: 'The GCC binary tarball to test'
-        - string:
-            name: scripts_branch
-            default: refs/remotes/origin/master
-            description: 'Scripts revision to use '
-        - string:
-            name: build_container_tag
-            default: 'trusty'
-            description: 'Distro to use for the container: trusty, xenial.'
-        - string:
-            name: release
-            default:
-            description: 'Release name, only displayed in job name'
-        - string:
-            name: target
-            default:
-            description: 'Target, only displayed in job name'
-        - string:
-            name: tcwg_regression_rev
-            default: 'master'
-            description: 'tcwg-regression revision to use'
-        - bool:
-            name: debug
-            default: false
-            description: 'Whether to enable bash debugging output.'
-    disabled: false
-    node: tcwg-x86_64-build
-    retry-count: 3
-    concurrent: true
-    workspace: /home/tcwg-buildslave/workspace/tcwg-test-release/$release/$target
-    display-name: 'TCWG Test Release'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    wrappers:
-        - timeout:
-            timeout: 300
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}-${ENV,var="release"}-${ENV,var="target"}'
-    builders:
-        - shell: |      
-            #!/bin/bash
-
-            . jenkins-helpers.sh
-
-            if test x${debug} = x"true"; then
-              shell="/bin/bash -x"
-              set -x
-            else
-              shell="/bin/bash"
-            fi
-
-            # tarball_url is read from the tcwg.params file, which is
-            # setup by the MakeRelease job.
-            if test x"${tarball_url}" = x; then
-              echo "ERROR: no binary tarball specified!"
-              exit 1
-            fi
-
-            # Start build container
-            builder=$(print_host_for_node $NODE_NAME)
-            build_container_type=docker
-            # Use tarball name to decide if we use an i386 container or an amd64 one
-            tarball_file=$(basename ${tarball_url})
-            case ${tarball_file} in
-                *-i686*) builder_arch=i386 ;;
-                *-x86_64*) builder_arch=amd64 ;;
-                *)
-                    echo "ERROR: could not determine container type from tarball ${tarball_file}"
-                    exit 1
-                    ;;
-            esac
-            bash -x ${WORKSPACE}/start-container-${build_container_type}.sh --arch ${builder_arch} --distro ${build_container_tag} --session-host ${builder} > build-container.sh
-
-            # Define CONTAINER, CONTAINER_CLEANUP, session_host and session_port
-            . ./build-container.sh
-            BUILD_CONTAINER="${CONTAINER}"
-            BUILD_CONTAINER_CLEANUP="${CONTAINER_CLEANUP}"
-
-            # Make sure to cleanup build container if something goes wrong
-            if [ x"${BUILD_CONTAINER_CLEANUP}" != x ]; then
-                CONTAINERS_CLEANUP="${BUILD_CONTAINER_CLEANUP}"
-                trap "${CONTAINERS_CLEANUP}" EXIT
-            fi
-
-            ${BUILD_CONTAINER} "cd ${WORKSPACE} && ${shell} ${WORKSPACE}/TestRelease.job --tarball ${tarball_url} --tcwg-regression-rev ${tcwg_regression_rev}"
-
-            exit $?
-    publishers:
-        - email:
-            recipients: 'tcwg-validation@linaro.org'
-        - email-ext:
-            recipients: 'christophe.lyon@linaro.org'
-            send-to:
-              requester
-              recipients
diff --git a/tcwg-trigger-binutils.yaml b/tcwg-trigger-binutils.yaml
deleted file mode 100644
index 257e07d76b..0000000000
--- a/tcwg-trigger-binutils.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- job:
-    name: tcwg-trigger-binutils
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number or empty string to skip comparison'
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: false
-    display-name: 'TCWG Trigger Binutils'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/binutils-gdb.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            cat << EOF > binutils_parameters
-            log_name=${JOB_NAME}-${BUILD_NUMBER}/\$builder_type.\$target.\$bfd
-            dont_fail=true
-            EOF
-
-            if [ x"$ref_build" != x ] ; then
-                case "$ref_build" in
-                    lastSuccess)   ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber") ;;
-                    previous)      ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber") ;;
-                    [1-9]*([0-9])) ref_build_num="$ref_build" ;;
-                    *) echo "ERROR: Cannot handle ref_build: $ref_build"; exit 1 ;;
-                esac
-
-            # Scrambled indentation because of here-doc
-                cat << EOF > compare_results_parameters
-            ref_logs=${JOB_NAME}-${ref_build_num}
-            new_logs=${JOB_NAME}-${BUILD_NUMBER}
-            pass_thresh=0.66
-            show_results=false
-            EOF
-            else
-                rm -f compare_results_parameters
-            fi
-        - trigger-builds:
-            - project: tcwg-binutils
-              property-file: binutils_parameters
-              block: true
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: compare_results_parameters
-            steps:
-                - trigger-builds:
-                    - project: tcwg-compare-results
-                      property-file: compare_results_parameters
-                      block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-             recipients: 'christophe.lyon@linaro.org'
diff --git a/tcwg-trigger-buildapp.yaml b/tcwg-trigger-buildapp.yaml
deleted file mode 100644
index 22c344d369..0000000000
--- a/tcwg-trigger-buildapp.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: tcwg-trigger-buildapp
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: false
-    display-name: 'TCWG Trigger Buildapp'
-    triggers:
-        # Every day at 2:02am
-        - timed: '2 2 * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-            set -ex
-
-            cat << EOF > buildapp_parameters
-            toolchain_url="http://releases.linaro.org/components/toolchain/binaries/7.2-2017.11/"
-            app_list="linux+multi_v7"
-            boot=true
-            target_list="arm-linux-gnueabihf"
-            EOF
-
-        - trigger-builds:
-            - project: tcwg-buildapp
-              property-file: buildapp_parameters
-              block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-             recipients: 'christophe.lyon@linaro.org'
diff --git a/tcwg-trigger-gcc-linaro-5.yaml b/tcwg-trigger-gcc-linaro-5.yaml
deleted file mode 100644
index 8cc1347ddf..0000000000
--- a/tcwg-trigger-gcc-linaro-5.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-- scm:
-    name: gcc
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro/gcc-5-branch
-            basedir: gcc
-            scm-name: GCC
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-            clean:
-                before: true
-- scm:
-    name: glibc
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/glibc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro/2.21/master
-            basedir: glibc
-            scm-name: Glibc
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/glibc.git
-            clean:
-                before: true
-- scm:
-    name: binutils
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/binutils-gdb.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro_binutils-2_25-branch
-            basedir: binutils
-            scm-name: Binutils
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/binutils-gdb.git
-            clean:
-                before: true
-- job:
-    name: tcwg-trigger-gcc-linaro-5
-    project-type: multijob
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/linaro_binutils-2_25-branch gcc=gcc.git~linaro/gcc-5-branch glibc=glibc.git~release/2.21/master'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:logs
-            description: 'Log_Server'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/master
-            description: 'ABE revision to test'
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number or empty string to skip comparison'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: true
-    display-name: 'TCWG Trigger GCC Linaro 5'
-    scm:
-        - gcc
-        - glibc
-        - binutils
-    triggers:
-        - pollscm:
-            cron: 'H * * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            for i in gcc glibc binutils; do
-                pushd $i
-                comp_rev=$(git rev-parse HEAD)
-                comp_list="$i=$i.git@$comp_rev $comp_list"
-                popd
-            done
-
-            cat << EOF > buildfarm_parameters
-            override=$comp_list --extraconfigdir ../config/gcc5 $override
-            log_name=${JOB_NAME}-${BUILD_NUMBER}/\$builder_type.\$target
-            log_server=$log_server
-            abe_branch=$abe_branch
-            target_list=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build
-            runtests=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build
-            try_bootstrap=true
-            rebuild=false
-            dont_fail=false
-            host_x86_64_excludecheck=gdb
-            host_aarchXX_excludecheck=
-            displaytag=gcc-linaro-5-${BUILD_NUMBER}
-            EOF
-
-            if [ x"$ref_build" != x ] ; then
-                case "$ref_build" in
-                    lastSuccess)   ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber") ;;
-                    previous)      ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber") ;;
-                    [1-9]*([0-9])) ref_build_num="$ref_build" ;;
-                    *) echo "ERROR: Cannot handle ref_build: $ref_build"; exit 1 ;;
-                esac
-
-            # Scrambled indentation because of here-doc
-                cat << EOF > compare_results_parameters
-            ref_logs=${JOB_NAME}-$ref_build_num
-            new_logs=${JOB_NAME}-$BUILD_NUMBER
-            log_server=$log_server
-            abe_branch=$abe_branch
-            EOF
-            fi
-        - multijob:
-            name: 'Builds'
-            projects:
-              - name: tcwg-buildfarm
-                condition: COMPLETED
-                property-file: buildfarm_parameters
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: compare_results_parameters
-            steps:
-                - trigger-builds:
-                    - project: tcwg-compare-results
-                      property-file: compare_results_parameters
-                      block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-            recipients: 'tcwg-validation@linaro.org'
diff --git a/tcwg-trigger-gcc-linaro-6.yaml b/tcwg-trigger-gcc-linaro-6.yaml
deleted file mode 100644
index 4f3e64e1ca..0000000000
--- a/tcwg-trigger-gcc-linaro-6.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-- scm:
-    name: gcc
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro/gcc-6-branch
-            basedir: gcc
-            scm-name: GCC
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-            clean:
-                before: true
-- scm:
-    name: glibc
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/glibc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro/2.23/master
-            basedir: glibc
-            scm-name: Glibc
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/glibc.git
-            clean:
-                before: true
-- scm:
-    name: binutils
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/binutils-gdb.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro-local/linaro_binutils-2_27-branch
-            basedir: binutils
-            scm-name: Binutils
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/binutils-gdb.git
-            clean:
-                before: true
-- job:
-    name: tcwg-trigger-gcc-linaro-6
-    project-type: multijob
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/linaro_binutils-2_27-branch gcc=gcc.git~linaro/gcc-6-branch glibc=glibc.git~release/2.23/master'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:logs
-            description: 'Log_Server'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/master
-            description: 'ABE revision to test'
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number or empty string to skip comparison'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: true
-    display-name: 'TCWG Trigger GCC Linaro 6'
-    scm:
-        - gcc
-        - glibc
-        - binutils
-    triggers:
-        - pollscm:
-            cron: 'H * * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            for i in gcc glibc binutils; do
-                pushd $i
-                comp_rev=$(git rev-parse HEAD)
-                comp_list="$i=$i.git@$comp_rev $comp_list"
-                popd
-            done
-
-            cat << EOF > buildfarm_parameters
-            override=$comp_list --extraconfigdir ../config/gcc6 $override
-            log_name=${JOB_NAME}-${BUILD_NUMBER}/\$builder_type.\$target
-            log_server=$log_server
-            abe_branch=$abe_branch
-            target_list=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build
-            runtests=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build
-            try_bootstrap=true
-            rebuild=false
-            dont_fail=false
-            host_x86_64_excludecheck=gdb
-            host_aarchXX_excludecheck=
-            displaytag=gcc-linaro-6-${BUILD_NUMBER}
-            EOF
-
-            if [ x"$ref_build" != x ] ; then
-                case "$ref_build" in
-                    lastSuccess)   ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber") ;;
-                    previous)      ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber") ;;
-                    [1-9]*([0-9])) ref_build_num="$ref_build" ;;
-                    *) echo "ERROR: Cannot handle ref_build: $ref_build"; exit 1 ;;
-                esac
-
-            # Scrambled indentation because of here-doc
-                cat << EOF > compare_results_parameters
-            ref_logs=${JOB_NAME}-$ref_build_num
-            new_logs=${JOB_NAME}-$BUILD_NUMBER
-            log_server=$log_server
-            abe_branch=$abe_branch
-            EOF
-            fi
-        - multijob:
-            name: 'Builds'
-            projects:
-              - name: tcwg-buildfarm
-                condition: COMPLETED
-                property-file: buildfarm_parameters
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: compare_results_parameters
-            steps:
-                - trigger-builds:
-                    - project: tcwg-compare-results
-                      property-file: compare_results_parameters
-                      block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-            recipients: 'tcwg-validation@linaro.org'
diff --git a/tcwg-trigger-gcc-linaro-7.yaml b/tcwg-trigger-gcc-linaro-7.yaml
deleted file mode 100644
index 1f3139944e..0000000000
--- a/tcwg-trigger-gcc-linaro-7.yaml
+++ /dev/null
@@ -1,162 +0,0 @@
-- scm:
-    name: gcc
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/gcc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/linaro/gcc-7-branch
-            basedir: gcc
-            scm-name: GCC
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/gcc.git
-            clean:
-                before: true
-- scm:
-    name: glibc
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/glibc.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/release/2.25/master
-            basedir: glibc
-            scm-name: Glibc
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/glibc.git
-            clean:
-                before: true
-- scm:
-    name: binutils
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/binutils-gdb.git
-            refspec: +refs/heads/*:refs/remotes/origin/*
-            branches:
-                - origin/binutils-2_28-branch
-            basedir: binutils
-            scm-name: Binutils
-            skip-tag: true
-            wipe-workspace: false
-            reference-repo: /home/tcwg-buildslave/snapshots-ref/binutils-gdb.git
-            clean:
-                before: true
-- job:
-    name: tcwg-trigger-gcc-linaro-7
-    project-type: multijob
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/binutils-2_28-branch gcc=gcc.git~linaro/gcc-7-branch glibc=glibc.git~release/2.25/master'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:logs
-            description: 'Log_Server'
-        - string:
-            name: abe_branch
-            default: refs/remotes/origin/master
-            description: 'ABE revision to test'
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number or empty string to skip comparison'
-    disabled: true
-    node: tcwg-coordinator
-    concurrent: true
-    display-name: 'TCWG Trigger GCC Linaro 7'
-    scm:
-        - gcc
-        - glibc
-        - binutils
-    triggers:
-        - pollscm:
-            cron: 'H * * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            for i in gcc glibc binutils; do
-                pushd $i
-                comp_rev=$(git rev-parse HEAD)
-                comp_list="$i=$i.git@$comp_rev $comp_list"
-                popd
-            done
-
-            cat << EOF > buildfarm_parameters
-            override=$comp_list --extraconfigdir ../config/gcc7 $override
-            log_name=${JOB_NAME}-${BUILD_NUMBER}/\$builder_type.\$target
-            log_server=$log_server
-            abe_branch=$abe_branch
-            target_list=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build
-            runtests=aarch64-linux-gnu armv8l-linux-gnueabihf arm-linux-gnueabi arm-linux-gnueabihf armeb-linux-gnueabihf aarch64-none-elf aarch64_be-none-elf tcwg-x86_64-build tcwg-x86_32-build
-            try_bootstrap=true
-            rebuild=false
-            dont_fail=false
-            host_x86_64_excludecheck=gdb
-            host_aarchXX_excludecheck=
-            displaytag=gcc-linaro-7-${BUILD_NUMBER}
-            EOF
-
-            if [ x"$ref_build" != x ] ; then
-                case "$ref_build" in
-                    lastSuccess)   ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber") ;;
-                    previous)      ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber") ;;
-                    [1-9]*([0-9])) ref_build_num="$ref_build" ;;
-                    *) echo "ERROR: Cannot handle ref_build: $ref_build"; exit 1 ;;
-                esac
-
-            # Scrambled indentation because of here-doc
-                cat << EOF > compare_results_parameters
-            ref_logs=${JOB_NAME}-$ref_build_num
-            new_logs=${JOB_NAME}-$BUILD_NUMBER
-            log_server=$log_server
-            abe_branch=$abe_branch
-            EOF
-            fi
-        - multijob:
-            name: 'Builds'
-            projects:
-              - name: tcwg-buildfarm
-                condition: COMPLETED
-                property-file: buildfarm_parameters
-        - conditional-step:
-            condition-kind: file-exists
-            condition-filename: compare_results_parameters
-            steps:
-                - trigger-builds:
-                    - project: tcwg-compare-results
-                      property-file: compare_results_parameters
-                      block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-             recipients: 'tcwg-validation@linaro.org'
diff --git a/tcwg-trigger-gcc-trunk-ubsan.yaml b/tcwg-trigger-gcc-trunk-ubsan.yaml
deleted file mode 100644
index b99643bca5..0000000000
--- a/tcwg-trigger-gcc-trunk-ubsan.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job:
-    name: tcwg-trigger-gcc-trunk-ubsan
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    concurrent: true
-    display-name: 'TCWG Trigger GCC trunk bootstrap with UBSAN'
-    triggers:
-        # Every Saturday at 20:00
-        - timed: '0 20 * * 6'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            cat << EOF > buildfarm_parameters
-            override=--set buildconfig=bootstrap-ubsan
-            log_name=${JOB_NAME}-${BUILD_NUMBER}/\$builder_type.\$target
-            abe_branch=refs/remotes/origin/master
-            runtests=
-            try_bootstrap=true
-            rebuild=yes
-            dont_fail=false
-            target_list=tcwg-x86_64-build tcwg-x86_32-build tcwg-tk1_32-build tcwg-apm_64-build tcwg-apm_32-build
-            displaytag=gcc-trunk-ubsan-${BUILD_NUMBER}
-            EOF
-        - trigger-builds:
-            - project: 'tcwg-buildfarm'
-              property-file: buildfarm_parameters
-              block: true
-    publishers:
-        - email:
-            recipients: 'tcwg-validation@linaro.org'
diff --git a/tcwg-update-bmk-containers.yaml b/tcwg-update-bmk-containers.yaml
new file mode 100644
index 0000000000..16606d73c2
--- /dev/null
+++ b/tcwg-update-bmk-containers.yaml
@@ -0,0 +1,225 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-containers.yaml.in and tcwg-update-containers/tcwg-update-bmk-containers.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-bmk-containers
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+    parameters:
+        - label:
+            name: nodes
+            default: tcwg-bmk-pool
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - string:
+            name: distro
+            default: 'default'
+            description: 'Distro version to use.'
+        - bool:
+            name: force
+            default: 'false'
+            description: 'Whether to force update even with no changes in image'
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG CCC Update bmk containers'
+    # We need to unshare workspace with $NODE_NAME in the path to
+    # correctly run on tcwg-bmk-* nodes.
+    workspace: workspace/tcwg-update-bmk-containers_$EXECUTOR_NUMBER/$NODE_NAME
+    scm:
+      - jenkins-scripts
+    triggers:
+        - timed: '@daily'
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'tcwg-benchmark'
+                # tcwg-buildslave user id
+                # ??? Do we need tcwg-buildslave's keys for BMK containers?
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            # See: LABEL_SED below
+            set -o pipefail
+
+            rm -rf artifacts
+            mkdir artifacts
+
+            echo "$BUILD_URL" > artifacts/mail-body.txt
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" > artifacts/mail-recipients.txt
+
+            declare -A pids
+            for lock in $(set +f; ls -tr $HOME/boards/$NODE_NAME-*.lock \
+                                         $HOME/boards/$NODE_NAME-*.bak*); do
+              (
+                flock -e 9
+                touch $lock
+                board=$(cat <&9)
+
+                # Start the jenkins container so that it can process
+                # all the queued cleanup and maintenance tasks.
+                node=$(basename "$board" .tcwglab)
+
+                ./jenkins-scripts/tcwg-update-bmk-containers.sh \
+                  --board "$board" \
+                  --distro "$distro" \
+                  --force "$force" \
+                  --node "$node" \
+                  --verbose "$verbose"
+
+                # Wait for jenkins container to become idle
+                while sleep 60; do
+                  n_busy=$(source jenkins-scripts/jenkins-helpers.sh
+                           print_number_of_busy_executors "$node")
+
+                  if [ "$n_busy" = "0" ]; then
+                    break
+                  fi
+                done
+
+                # Now stop the jenkins container so that it's not terminated
+                # midway some other build by a starting benchmarking job.
+                ssh -Snone $board docker stop "$node"
+              ) 9<$lock 2>&1 | sed -e "s/^/$(basename $lock): /" &
+
+              # LABEL_SED: We need pipefail to get correct result of sub-shell
+              # "( foo ) | sed" instead of always-succeeding "sed".
+              pids[$(basename "$lock")]=$!
+            done
+
+            n_good_boards=0
+            for lock in "${!pids[@]}"; do
+              res=0 && wait "${pids[$lock]}" || res=$?
+              case "$res:$lock" in
+                "0":*".lock")
+                  n_good_boards=$(($n_good_boards + 1))
+                  echo "$lock: SUCCESS" >> artifacts/mail-body.txt
+                  ;;
+                "0":*".bak")
+                  n_good_boards=$(($n_good_boards + 1))
+                  echo "$lock: UNEXPECTED SUCCESS" >> artifacts/mail-body.txt
+                  # Move boards with no STG ticket (e.g., no ".bak.STG-1234")
+                  # back into service.
+                  mv "$HOME/boards/$lock" "$HOME/boards/${lock%.bak}.lock"
+                  ;;
+                "0":*)
+                  # The board appears fine, but it has STG ticket assigned
+                  # to it (e.g., ".bak.STG-1234").
+                  echo "$lock: UNEXPECTED SUCCESS" >> artifacts/mail-body.txt
+                  ;;
+                *:*".lock")
+                  echo "$lock: UNEXPECTED FAILURE" >> artifacts/mail-body.txt
+                  # Move offline boards out of service.
+                  mv "$HOME/boards/$lock" "$HOME/boards/${lock%.lock}.bak"
+                  ;;
+                *:*)
+                  echo "$lock: EXPECTED FAILURE" >> artifacts/mail-body.txt
+                  ;;
+              esac
+            done
+
+            # tcwg-benchmark doesn't have ssh access to ci.linaro.org,
+            # so use tcwg-buildslave's credentials.
+            n_executors=$(ssh -p2222 -l tcwg-buildslave@linaro.org \
+                              ci.linaro.org get-node "$NODE_NAME" \
+                              | grep "numExecutors")
+            n_executors=$(echo "$n_executors" \
+                          | sed -e "s#.*<numExecutors>\([0-9]\+\)</numExecutors>.*#\1#")
+            if [ x"$n_executors" != x"$n_good_boards" ]; then
+              echo "UNEXPECTED: Updating number of executors on $NODE_NAME from $n_executors to $n_good_boards" \
+                >> artifacts/mail-body.txt
+              if [ "$n_good_boards" = "0" ]; then
+                # Setting executors to "0" will mightily confuse jenkins;
+                # the node with 0 executors will be stuck in limbo.
+                n_good_boards=1
+              fi
+              ssh -p2222 -l tcwg-buildslave@linaro.org \
+                  ci.linaro.org get-node "$NODE_NAME" \
+                | sed -e "s#<numExecutors>\([0-9]\+\)</numExecutors>#<numExecutors>$n_good_boards</numExecutors>#" \
+                | ssh -p2222 -l tcwg-buildslave@linaro.org \
+                      ci.linaro.org update-node "$NODE_NAME"
+            fi
+
+            if ! grep -q UNEXPECTED artifacts/mail-body.txt; then
+              exit 0
+            fi
+
+            exit 1
+    publishers:
+      - email-ext:
+          recipients: |
+            ${FILE,path="artifacts/mail-recipients.txt"}
+          content-type: text
+          body: |
+            ${FILE,path="artifacts/mail-body.txt"}
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+
+# checksum: 01bb3f2309f5a0ee5b87c5a82836419c
diff --git a/tcwg-update-bmk_ref.yaml b/tcwg-update-bmk_ref.yaml
new file mode 100644
index 0000000000..3a7dae4127
--- /dev/null
+++ b/tcwg-update-bmk_ref.yaml
@@ -0,0 +1,129 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-source-caches.yaml.in and tcwg-update-source-caches/tcwg-update-bmk_ref.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-bmk_ref
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - bool:
+            name: generate_abe
+            default: false
+            description: 'Generate ABE snapshots'
+        - bool:
+            name: generate_bmk
+            default: true
+            description: 'Generate benchmark source cache'
+        - bool:
+            name: generate_misc
+            default: false
+            description: 'Generate misc file'
+        - bool:
+            name: update_abe_git
+            default: true
+            description: 'Update Git repos'
+        - bool:
+            name: verbose
+            default: true
+            description: 'Enable verbose output'
+        - string:
+            name: scripts_branch
+            default: refs/remotes/origin/master
+            description: 'Scripts revision to use'
+        - string:
+            name: abe_branch
+            default: tested
+            description: 'Abe revision to use'
+        - string:
+            name: distro
+            default: default
+            description: 'Docker image tag to use'
+    disabled: false
+    concurrent: false
+    node: tcwg-bmk-bkp-01
+    display-name: 'TCWG CCC Update bmk_ref cache on TCWG machines'
+    triggers:
+        - timed: '@weekly'
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                - 'tcwg-benchmark'
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -ex
+
+            new_cache=$(mktemp -d)
+            trap "rm -rf $new_cache" EXIT
+            cache_dir=/home/shared/git
+            sudo mkdir -p $cache_dir
+            sudo chown -R $USER:tcwg-infra $cache_dir
+            # Use previous cache to speed up re-generation.
+            rsync -a --del $cache_dir/ $new_cache/
+            ./jenkins-scripts/tcwg-generate-source-cache.sh \
+              --cache_dir "$new_cache" \
+              --generate_abe "$generate_abe" \
+              --generate_bmk "$generate_bmk" \
+              --generate_misc "$generate_misc" \
+              --update_abe_git "$update_abe_git" \
+              --verbose "$verbose" \
+              --abe_branch "$abe_branch"
+            rsync -a --del $new_cache/ $cache_dir/
+        - trigger-builds:
+            - project: tcwg-buildslave-command
+              predefined-parameters: |
+                command=set -ex; cache_dir=/home/shared/git; sudo mkdir -p $cache_dir; sudo chown -R $USER:tcwg-infra $cache_dir; rsync -az --del bkp-01.tcwglab:$cache_dir/ $cache_dir/
+                displayname=bmk_ref
+              parameter-factories:
+                - factory: allnodesforlabel
+                  name: nodes
+                  node-label: tcwg-bmk-hw
+                  ignore-offline-nodes: false
+              block: false
+    publishers:
+        - email-ext:
+            recipients: tcwg-validation@linaro.org
+            aborted: true
+
+# checksum: 28560746cc5994c160359465c7c1b0cd
diff --git a/tcwg-update-buildkite-containers.yaml b/tcwg-update-buildkite-containers.yaml
new file mode 100644
index 0000000000..8259261fbd
--- /dev/null
+++ b/tcwg-update-buildkite-containers.yaml
@@ -0,0 +1,112 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-containers.yaml.in and tcwg-update-containers/tcwg-update-buildkite-containers.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-buildkite-containers
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+    parameters:
+        - label:
+            name: nodes
+            default: tcwg-llvmbot
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - string:
+            name: distro
+            default: 'lts_1'
+            description: 'Distro version to use.'
+        - bool:
+            name: force
+            default: 'false'
+            description: 'Whether to force update even with no changes in image'
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG CCC Update buildkite containers'
+    # We need to unshare workspace with $NODE_NAME in the path to
+    # correctly run on tcwg-bmk-* nodes.
+    workspace: workspace/tcwg-update-buildkite-containers_$EXECUTOR_NUMBER/$NODE_NAME
+    scm:
+      - jenkins-scripts
+    # No timer trigger for llvmbot and buildkite because we want the bot maintainer to be
+    # able to control the deployment time.
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: TCWG_BUILDKITE_TOKEN_LIBCXX
+                variable: TCWG_BUILDKITE_TOKEN_LIBCXX
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            ./jenkins-scripts/tcwg-update-llvmbot-containers.sh \
+            --NODE_NAME "$NODE_NAME" \
+            --distro "$distro" \
+            --master "buildkite" \
+            --password "$TCWG_BUILDKITE_TOKEN_LIBCXX" \
+            --force "$force" \
+            --verbose "$verbose"
+
+# checksum: 6a0f048d03b252117c16dd66f309b6fd
diff --git a/tcwg-update-containers.yaml.in b/tcwg-update-containers.yaml.in
new file mode 100644
index 0000000000..d748ce663c
--- /dev/null
+++ b/tcwg-update-containers.yaml.in
@@ -0,0 +1,443 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-#{CONTAINER}-containers
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+    parameters:
+        - label:
+            name: nodes
+#if CONTAINER_host
+            # Run on all real machines with exception of benchmarking boards.
+            # Host containers of benchmarking boards are handled by
+            # CONTAINER_bmk job.
+            default: tcwg && !tcwg-bmk-hw && !tcwg-secondary-node
+#elif CONTAINER_jenkins
+            # Run on all nodes with exception of benchmarking boards.
+            # Jenkins containers of benchmarking boards are handled by
+            # CONTAINER_bmk job.
+            default: tcwg && !tcwg-bmk-hw
+#elif CONTAINER_llvmbot || CONTAINER_buildkite
+            default: tcwg-llvmbot
+#elif CONTAINER_bmk
+            default: tcwg-bmk-pool
+#endif
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - string:
+            name: distro
+#if CONTAINER_llvmbot || CONTAINER_buildkite
+            default: 'lts_1'
+#else
+            default: 'default'
+#endif
+            description: 'Distro version to use.'
+#if CONTAINER_llvmbot
+        - string:
+            name: master
+            default: 'normal'
+            description: 'LLVM buildmaster to use: silent or normal'
+#endif
+        - bool:
+            name: force
+            default: 'false'
+            description: 'Whether to force update even with no changes in image'
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG CCC Update #{CONTAINER} containers'
+    # We need to unshare workspace with $NODE_NAME in the path to
+    # correctly run on tcwg-bmk-* nodes.
+    workspace: workspace/tcwg-update-#{CONTAINER}-containers_$EXECUTOR_NUMBER/$NODE_NAME
+    scm:
+      - jenkins-scripts
+#if !CONTAINER_llvmbot && !CONTAINER_buildkite
+    triggers:
+        - timed: '@daily'
+#else
+    # No timer trigger for llvmbot and buildkite because we want the bot maintainer to be
+    # able to control the deployment time.
+#endif
+    wrappers:
+        - timeout:
+#if CONTAINER_jenkins
+            # Wait at most 5 hours before giving up on updating jenkins
+            # client container.
+            timeout: 300
+#else
+            timeout: 600
+#endif
+        - timestamps
+#if CONTAINER_llvmbot
+        - credentials-binding:
+            - text:
+                credential-id: TCWG_LLVMBOT_PASSWORD
+                variable: TCWG_LLVMBOT_PASSWORD
+#elif CONTAINER_buildkite
+        - credentials-binding:
+            - text:
+                credential-id: TCWG_BUILDKITE_TOKEN_LIBCXX
+                variable: TCWG_BUILDKITE_TOKEN_LIBCXX
+#elif CONTAINER_bmk
+        - ssh-agent-credentials:
+            users:
+                - 'tcwg-benchmark'
+                # tcwg-buildslave user id
+                # ??? Do we need tcwg-buildslave's keys for BMK containers?
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#elif CONTAINER_jenkins
+        - ssh-agent-credentials:
+            users:
+                # tcwg-buildslave user id
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#endif
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+#if CONTAINER_host
+            case " $NODE_LABELS " in
+              *" tcwg-llvmbot "*) group=tcwg-llvm ;;
+              *) group=all ;;
+            esac
+            ./jenkins-scripts/tcwg-update-host-containers.sh \
+            --distro "$distro" \
+            --group "$group" \
+            --force "$force" \
+            --verbose "$verbose"
+#elif CONTAINER_jenkins
+            # Check if we need to update the image -- run with --dryrun true.
+            ./jenkins-scripts/tcwg-update-host-containers.sh \
+            --distro "$distro" \
+            --dryrun true \
+            --node "$NODE_NAME" \
+            --force "$force" \
+            --verbose "$verbose" &
+            res=0 && wait $! || res=$?
+
+            if [ $res = 0 ]; then
+              # Fast-path exit to avoid bringing the node offline.
+              echo "$NODE_NAME is up-to-date"
+              # Skip the rest and mark the build UNSTABLE (aka skipped).
+              exit 125
+            elif [ $res = 125 ]; then
+              echo "$NODE_NAME needs container update"
+            elif [ $res != 0 ]; then
+              echo "ERROR: container check failed"
+              exit $res
+            fi
+
+            # We are about to update the container that is running this.
+            # The plan is:
+            # 1. Prevent new builds from starting by putting the node into
+            #    offline mode.
+            # 2. Wait for current builds to finish.  We detect this by
+            #    checking for children process of the jenkins client.
+            # 3. Trigger a job on the master node to bring this node back
+            #    online.  Without this we would restart the jenkins container,
+            #    but the node would still be marked as "offline" and no new
+            #    builds will be scheduled to it.
+            # 4. Restart the container.
+
+            # Mark the node offline.
+            ssh -p2222 -l tcwg-buildslave@linaro.org ci.linaro.org \
+              offline-node "$NODE_NAME" \
+              -m "Updating_jenkins_container:$BUILD_URL"
+
+            start_date=$(date +%s)
+            rm -f timeout
+
+            # Wait for current builds to finish.
+            while true; do
+              n_busy=$(source jenkins-scripts/jenkins-helpers.sh
+                       print_number_of_busy_executors "$NODE_NAME")
+
+              if [ "$n_busy" = "1" ]; then
+                # We are the only build left.
+                break
+              fi
+
+              elapsed=$(($(date +%s) - $start_date))
+              elapsed=$(($elapsed / 60))
+              if [ "$elapsed" -gt "270" ]; then
+                # We'll timeout in 30 minutes; give up on the update and
+                # bring the node back online.
+                # We budget 30 minutes for tcwg-cleanup-stale-workspaces.sh
+                # below.
+                touch timeout
+                break
+              fi
+
+              # Wait for other builds to complete.
+              sleep 60
+            done
+          unstable-return: 125
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-builds:
+                - project: tcwg-update-jenkins-containers-online-node
+                  predefined-parameters: |
+                    node=$NODE_NAME
+                    build_num=$BUILD_NUMBER
+                  block: false
+            - shell:
+                command: |
+                  #!/bin/bash
+                  set -ex
+
+                  if [ -f timeout ]; then
+                    exit 125
+                  fi
+
+                  # Cleanup workspace directory while the node is idle.
+                  (
+                  set +e
+                  $WORKSPACE/jenkins-scripts/tcwg-cleanup-stale-workspaces.sh \
+                    --days 3 --workspace_top $HOME/workspace
+                  )
+
+                  ./jenkins-scripts/tcwg-update-host-containers.sh \
+                    --distro "$distro" \
+                    --dryrun false \
+                    --node "$NODE_NAME" \
+                    --force "$force" \
+                    --verbose "$verbose" || exit 125
+                unstable-return: 125
+#elif CONTAINER_llvmbot
+            ./jenkins-scripts/tcwg-update-llvmbot-containers.sh \
+            --NODE_NAME "$NODE_NAME" \
+            --distro "$distro" \
+            --master "$master" \
+            --password "$TCWG_LLVMBOT_PASSWORD" \
+            --force "$force" \
+            --verbose "$verbose"
+#elif CONTAINER_buildkite
+            ./jenkins-scripts/tcwg-update-llvmbot-containers.sh \
+            --NODE_NAME "$NODE_NAME" \
+            --distro "$distro" \
+            --master "buildkite" \
+            --password "$TCWG_BUILDKITE_TOKEN_LIBCXX" \
+            --force "$force" \
+            --verbose "$verbose"
+#elif CONTAINER_bmk
+            # See: LABEL_SED below
+            set -o pipefail
+
+            rm -rf artifacts
+            mkdir artifacts
+
+            echo "$BUILD_URL" > artifacts/mail-body.txt
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" > artifacts/mail-recipients.txt
+
+            declare -A pids
+            for lock in $(set +f; ls -tr $HOME/boards/$NODE_NAME-*.lock \
+                                         $HOME/boards/$NODE_NAME-*.bak*); do
+              (
+                flock -e 9
+                touch $lock
+                board=$(cat <&9)
+
+                # Start the jenkins container so that it can process
+                # all the queued cleanup and maintenance tasks.
+                node=$(basename "$board" .tcwglab)
+
+                ./jenkins-scripts/tcwg-update-bmk-containers.sh \
+                  --board "$board" \
+                  --distro "$distro" \
+                  --force "$force" \
+                  --node "$node" \
+                  --verbose "$verbose"
+
+                # Wait for jenkins container to become idle
+                while sleep 60; do
+                  n_busy=$(source jenkins-scripts/jenkins-helpers.sh
+                           print_number_of_busy_executors "$node")
+
+                  if [ "$n_busy" = "0" ]; then
+                    break
+                  fi
+                done
+
+                # Now stop the jenkins container so that it's not terminated
+                # midway some other build by a starting benchmarking job.
+                ssh -Snone $board docker stop "$node"
+              ) 9<$lock 2>&1 | sed -e "s/^/$(basename $lock): /" &
+
+              # LABEL_SED: We need pipefail to get correct result of sub-shell
+              # "( foo ) | sed" instead of always-succeeding "sed".
+              pids[$(basename "$lock")]=$!
+            done
+
+            n_good_boards=0
+            for lock in "${!pids[@]}"; do
+              res=0 && wait "${pids[$lock]}" || res=$?
+              case "$res:$lock" in
+                "0":*".lock")
+                  n_good_boards=$(($n_good_boards + 1))
+                  echo "$lock: SUCCESS" >> artifacts/mail-body.txt
+                  ;;
+                "0":*".bak")
+                  n_good_boards=$(($n_good_boards + 1))
+                  echo "$lock: UNEXPECTED SUCCESS" >> artifacts/mail-body.txt
+                  # Move boards with no STG ticket (e.g., no ".bak.STG-1234")
+                  # back into service.
+                  mv "$HOME/boards/$lock" "$HOME/boards/${lock%.bak}.lock"
+                  ;;
+                "0":*)
+                  # The board appears fine, but it has STG ticket assigned
+                  # to it (e.g., ".bak.STG-1234").
+                  echo "$lock: UNEXPECTED SUCCESS" >> artifacts/mail-body.txt
+                  ;;
+                *:*".lock")
+                  echo "$lock: UNEXPECTED FAILURE" >> artifacts/mail-body.txt
+                  # Move offline boards out of service.
+                  mv "$HOME/boards/$lock" "$HOME/boards/${lock%.lock}.bak"
+                  ;;
+                *:*)
+                  echo "$lock: EXPECTED FAILURE" >> artifacts/mail-body.txt
+                  ;;
+              esac
+            done
+
+            # tcwg-benchmark doesn't have ssh access to ci.linaro.org,
+            # so use tcwg-buildslave's credentials.
+            n_executors=$(ssh -p2222 -l tcwg-buildslave@linaro.org \
+                              ci.linaro.org get-node "$NODE_NAME" \
+                              | grep "numExecutors")
+            n_executors=$(echo "$n_executors" \
+                          | sed -e "s#.*<numExecutors>\([0-9]\+\)</numExecutors>.*#\1#")
+            if [ x"$n_executors" != x"$n_good_boards" ]; then
+              echo "UNEXPECTED: Updating number of executors on $NODE_NAME from $n_executors to $n_good_boards" \
+                >> artifacts/mail-body.txt
+              if [ "$n_good_boards" = "0" ]; then
+                # Setting executors to "0" will mightily confuse jenkins;
+                # the node with 0 executors will be stuck in limbo.
+                n_good_boards=1
+              fi
+              ssh -p2222 -l tcwg-buildslave@linaro.org \
+                  ci.linaro.org get-node "$NODE_NAME" \
+                | sed -e "s#<numExecutors>\([0-9]\+\)</numExecutors>#<numExecutors>$n_good_boards</numExecutors>#" \
+                | ssh -p2222 -l tcwg-buildslave@linaro.org \
+                      ci.linaro.org update-node "$NODE_NAME"
+            fi
+
+            if ! grep -q UNEXPECTED artifacts/mail-body.txt; then
+              exit 0
+            fi
+
+            exit 1
+    publishers:
+      - email-ext:
+          recipients: |
+            ${FILE,path="artifacts/mail-recipients.txt"}
+          content-type: text
+          body: |
+            ${FILE,path="artifacts/mail-body.txt"}
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#endif
+
+#if CONTAINER_jenkins
+- job:
+    name: tcwg-update-jenkins-containers-online-node
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+    parameters:
+        - string:
+            name: node
+            default: ''
+            description: 'NODE_NAME to bring online'
+        - string:
+            name: build_num
+            default: ''
+            description: 'BUILD_NUMBER to wait for to finish'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG CCC Update jenkins containers online-node'
+    wrappers:
+        - timeout:
+            timeout: 60
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                # tcwg-buildslave user id
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-#${build_num}-${node}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            # Below logic was adapted from jenkins-scripts/tcwg_bmk-build.sh:
+            # benchmark().
+
+            ssh_cmd=(ssh -p2222 -l tcwg-buildslave@linaro.org
+              -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null)
+
+            # ??? Below loop can fail for reasons I can't understand.
+            #     "|| true" should the subshell always exit with "0",
+            #     and I can't see how "| tee | sed" can fail.
+            # Bring the node back online as we exit due to any reason,
+            # and ignore shell errors so that we exit only when see
+            # "Finished: " line in the console.log.
+            trap "${ssh_cmd[*]} ci.linaro.org online-node $node" EXIT
+            set +e
+
+            while true; do
+              sleep 60
+
+              (timeout 1m \
+                "${ssh_cmd[@]}" ci.linaro.org console \
+                tcwg-update-jenkins-containers $build_num || true) \
+                | tee console.log | sed -e "s/^/$node: /"
+
+              build_status=$(tail -n 1 console.log)
+              case "$build_status" in
+                "Finished: "*) break ;;
+              esac
+            done
+#endif
diff --git a/tcwg-update-containers/tcwg-update-bmk-containers.def b/tcwg-update-containers/tcwg-update-bmk-containers.def
new file mode 100644
index 0000000000..beba688ac4
--- /dev/null
+++ b/tcwg-update-containers/tcwg-update-bmk-containers.def
@@ -0,0 +1 @@
+-v CONTAINER=bmk
diff --git a/tcwg-update-containers/tcwg-update-buildkite-containers.def b/tcwg-update-containers/tcwg-update-buildkite-containers.def
new file mode 100644
index 0000000000..d093f7cacb
--- /dev/null
+++ b/tcwg-update-containers/tcwg-update-buildkite-containers.def
@@ -0,0 +1 @@
+-v CONTAINER=buildkite
diff --git a/tcwg-update-containers/tcwg-update-host-containers.def b/tcwg-update-containers/tcwg-update-host-containers.def
new file mode 100644
index 0000000000..04c3b8041f
--- /dev/null
+++ b/tcwg-update-containers/tcwg-update-host-containers.def
@@ -0,0 +1 @@
+-v CONTAINER=host
diff --git a/tcwg-update-containers/tcwg-update-jenkins-containers.def b/tcwg-update-containers/tcwg-update-jenkins-containers.def
new file mode 100644
index 0000000000..0a9af37628
--- /dev/null
+++ b/tcwg-update-containers/tcwg-update-jenkins-containers.def
@@ -0,0 +1 @@
+-v CONTAINER=jenkins
diff --git a/tcwg-update-containers/tcwg-update-llvmbot-containers.def b/tcwg-update-containers/tcwg-update-llvmbot-containers.def
new file mode 100644
index 0000000000..6f64740565
--- /dev/null
+++ b/tcwg-update-containers/tcwg-update-llvmbot-containers.def
@@ -0,0 +1 @@
+-v CONTAINER=llvmbot
diff --git a/tcwg-update-host-containers.yaml b/tcwg-update-host-containers.yaml
new file mode 100644
index 0000000000..f4026ea9fa
--- /dev/null
+++ b/tcwg-update-host-containers.yaml
@@ -0,0 +1,113 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-containers.yaml.in and tcwg-update-containers/tcwg-update-host-containers.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-host-containers
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+    parameters:
+        - label:
+            name: nodes
+            # Run on all real machines with exception of benchmarking boards.
+            # Host containers of benchmarking boards are handled by
+            # CONTAINER_bmk job.
+            default: tcwg && !tcwg-bmk-hw && !tcwg-secondary-node
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - string:
+            name: distro
+            default: 'default'
+            description: 'Distro version to use.'
+        - bool:
+            name: force
+            default: 'false'
+            description: 'Whether to force update even with no changes in image'
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG CCC Update host containers'
+    # We need to unshare workspace with $NODE_NAME in the path to
+    # correctly run on tcwg-bmk-* nodes.
+    workspace: workspace/tcwg-update-host-containers_$EXECUTOR_NUMBER/$NODE_NAME
+    scm:
+      - jenkins-scripts
+    triggers:
+        - timed: '@daily'
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            case " $NODE_LABELS " in
+              *" tcwg-llvmbot "*) group=tcwg-llvm ;;
+              *) group=all ;;
+            esac
+            ./jenkins-scripts/tcwg-update-host-containers.sh \
+            --distro "$distro" \
+            --group "$group" \
+            --force "$force" \
+            --verbose "$verbose"
+
+# checksum: bd10503195b28a18e0c40567db2442a9
diff --git a/tcwg-update-jenkins-containers.yaml b/tcwg-update-jenkins-containers.yaml
new file mode 100644
index 0000000000..9abc9064bb
--- /dev/null
+++ b/tcwg-update-jenkins-containers.yaml
@@ -0,0 +1,279 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-containers.yaml.in and tcwg-update-containers/tcwg-update-jenkins-containers.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-jenkins-containers
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+    parameters:
+        - label:
+            name: nodes
+            # Run on all nodes with exception of benchmarking boards.
+            # Jenkins containers of benchmarking boards are handled by
+            # CONTAINER_bmk job.
+            default: tcwg && !tcwg-bmk-hw
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - string:
+            name: distro
+            default: 'default'
+            description: 'Distro version to use.'
+        - bool:
+            name: force
+            default: 'false'
+            description: 'Whether to force update even with no changes in image'
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG CCC Update jenkins containers'
+    # We need to unshare workspace with $NODE_NAME in the path to
+    # correctly run on tcwg-bmk-* nodes.
+    workspace: workspace/tcwg-update-jenkins-containers_$EXECUTOR_NUMBER/$NODE_NAME
+    scm:
+      - jenkins-scripts
+    triggers:
+        - timed: '@daily'
+    wrappers:
+        - timeout:
+            # Wait at most 5 hours before giving up on updating jenkins
+            # client container.
+            timeout: 300
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                # tcwg-buildslave user id
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            # Check if we need to update the image -- run with --dryrun true.
+            ./jenkins-scripts/tcwg-update-host-containers.sh \
+            --distro "$distro" \
+            --dryrun true \
+            --node "$NODE_NAME" \
+            --force "$force" \
+            --verbose "$verbose" &
+            res=0 && wait $! || res=$?
+
+            if [ $res = 0 ]; then
+              # Fast-path exit to avoid bringing the node offline.
+              echo "$NODE_NAME is up-to-date"
+              # Skip the rest and mark the build UNSTABLE (aka skipped).
+              exit 125
+            elif [ $res = 125 ]; then
+              echo "$NODE_NAME needs container update"
+            elif [ $res != 0 ]; then
+              echo "ERROR: container check failed"
+              exit $res
+            fi
+
+            # We are about to update the container that is running this.
+            # The plan is:
+            # 1. Prevent new builds from starting by putting the node into
+            #    offline mode.
+            # 2. Wait for current builds to finish.  We detect this by
+            #    checking for children process of the jenkins client.
+            # 3. Trigger a job on the master node to bring this node back
+            #    online.  Without this we would restart the jenkins container,
+            #    but the node would still be marked as "offline" and no new
+            #    builds will be scheduled to it.
+            # 4. Restart the container.
+
+            # Mark the node offline.
+            ssh -p2222 -l tcwg-buildslave@linaro.org ci.linaro.org \
+              offline-node "$NODE_NAME" \
+              -m "Updating_jenkins_container:$BUILD_URL"
+
+            start_date=$(date +%s)
+            rm -f timeout
+
+            # Wait for current builds to finish.
+            while true; do
+              n_busy=$(source jenkins-scripts/jenkins-helpers.sh
+                       print_number_of_busy_executors "$NODE_NAME")
+
+              if [ "$n_busy" = "1" ]; then
+                # We are the only build left.
+                break
+              fi
+
+              elapsed=$(($(date +%s) - $start_date))
+              elapsed=$(($elapsed / 60))
+              if [ "$elapsed" -gt "270" ]; then
+                # We'll timeout in 30 minutes; give up on the update and
+                # bring the node back online.
+                # We budget 30 minutes for tcwg-cleanup-stale-workspaces.sh
+                # below.
+                touch timeout
+                break
+              fi
+
+              # Wait for other builds to complete.
+              sleep 60
+            done
+          unstable-return: 125
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-builds:
+                - project: tcwg-update-jenkins-containers-online-node
+                  predefined-parameters: |
+                    node=$NODE_NAME
+                    build_num=$BUILD_NUMBER
+                  block: false
+            - shell:
+                command: |
+                  #!/bin/bash
+                  set -ex
+
+                  if [ -f timeout ]; then
+                    exit 125
+                  fi
+
+                  # Cleanup workspace directory while the node is idle.
+                  (
+                  set +e
+                  $WORKSPACE/jenkins-scripts/tcwg-cleanup-stale-workspaces.sh \
+                    --days 3 --workspace_top $HOME/workspace
+                  )
+
+                  ./jenkins-scripts/tcwg-update-host-containers.sh \
+                    --distro "$distro" \
+                    --dryrun false \
+                    --node "$NODE_NAME" \
+                    --force "$force" \
+                    --verbose "$verbose" || exit 125
+                unstable-return: 125
+
+- job:
+    name: tcwg-update-jenkins-containers-online-node
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+    parameters:
+        - string:
+            name: node
+            default: ''
+            description: 'NODE_NAME to bring online'
+        - string:
+            name: build_num
+            default: ''
+            description: 'BUILD_NUMBER to wait for to finish'
+    disabled: false
+    concurrent: true
+    display-name: 'TCWG CCC Update jenkins containers online-node'
+    wrappers:
+        - timeout:
+            timeout: 60
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+                # tcwg-buildslave user id
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-#${build_num}-${node}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            # Below logic was adapted from jenkins-scripts/tcwg_bmk-build.sh:
+            # benchmark().
+
+            ssh_cmd=(ssh -p2222 -l tcwg-buildslave@linaro.org
+              -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null)
+
+            # ??? Below loop can fail for reasons I can't understand.
+            #     "|| true" should the subshell always exit with "0",
+            #     and I can't see how "| tee | sed" can fail.
+            # Bring the node back online as we exit due to any reason,
+            # and ignore shell errors so that we exit only when see
+            # "Finished: " line in the console.log.
+            trap "${ssh_cmd[*]} ci.linaro.org online-node $node" EXIT
+            set +e
+
+            while true; do
+              sleep 60
+
+              (timeout 1m \
+                "${ssh_cmd[@]}" ci.linaro.org console \
+                tcwg-update-jenkins-containers $build_num || true) \
+                | tee console.log | sed -e "s/^/$node: /"
+
+              build_status=$(tail -n 1 console.log)
+              case "$build_status" in
+                "Finished: "*) break ;;
+              esac
+            done
+# checksum: 6ffc6ff4f71c52329c02ca6e6f932e10
diff --git a/tcwg-update-llvmbot-containers.yaml b/tcwg-update-llvmbot-containers.yaml
new file mode 100644
index 0000000000..969e334e4b
--- /dev/null
+++ b/tcwg-update-llvmbot-containers.yaml
@@ -0,0 +1,116 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-containers.yaml.in and tcwg-update-containers/tcwg-update-llvmbot-containers.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-llvmbot-containers
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 100
+        - throttle:
+            max-per-node: 1
+            option: project
+    parameters:
+        - label:
+            name: nodes
+            default: tcwg-llvmbot
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines to run on'
+        - string:
+            name: distro
+            default: 'lts_1'
+            description: 'Distro version to use.'
+        - string:
+            name: master
+            default: 'normal'
+            description: 'LLVM buildmaster to use: silent or normal'
+        - bool:
+            name: force
+            default: 'false'
+            description: 'Whether to force update even with no changes in image'
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG CCC Update llvmbot containers'
+    # We need to unshare workspace with $NODE_NAME in the path to
+    # correctly run on tcwg-bmk-* nodes.
+    workspace: workspace/tcwg-update-llvmbot-containers_$EXECUTOR_NUMBER/$NODE_NAME
+    scm:
+      - jenkins-scripts
+    # No timer trigger for llvmbot and buildkite because we want the bot maintainer to be
+    # able to control the deployment time.
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: TCWG_LLVMBOT_PASSWORD
+                variable: TCWG_LLVMBOT_PASSWORD
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME}'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            ./jenkins-scripts/tcwg-update-llvmbot-containers.sh \
+            --NODE_NAME "$NODE_NAME" \
+            --distro "$distro" \
+            --master "$master" \
+            --password "$TCWG_LLVMBOT_PASSWORD" \
+            --force "$force" \
+            --verbose "$verbose"
+
+# checksum: 3ba59156dac113e016f19e9152996ef6
diff --git a/tcwg-update-lnt-results.yaml b/tcwg-update-lnt-results.yaml
new file mode 100644
index 0000000000..5a38bc4744
--- /dev/null
+++ b/tcwg-update-lnt-results.yaml
@@ -0,0 +1,96 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-lnt-results.yaml.in and tcwg-update-lnt-results/tcwg-update-lnt-results.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-lnt-results
+    project-type: freestyle
+    defaults: global
+    properties:
+        - default-properties
+    parameters:
+        - label:
+            name: nodes
+            default: tcwg-lnt
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines or label to run on'
+        - string:
+            name: ci_project
+            default: 'default'
+            description: "CI project ID; used as namespace for git branches"
+        - string:
+            name: ci_config
+            default: 'default'
+            description: "CI configuration ID; used as name of git branches"
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG Update LNT results'
+    workspace: workspace/tcwg-update-lnt-results_${NODE_NAME}_${EXECUTOR_NUMBER}
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME} ($ci_project--$ci_config)'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            ./jenkins-scripts/tcwg-update-lnt-results.sh \
+               --lnt_config "$NODE_NAME" \
+               --ci_project "$ci_project" \
+               --ci_config "$ci_config" \
+               --verbose "$verbose"
+    publishers:
+      - email-ext:
+          recipients: 'laurent.alfonsi@linaro.org,maxim.kuvyrkov@linaro.org'
+# checksum: 89bc7c33eb74bc2db8c8c39e125ff9bb
diff --git a/tcwg-update-lnt-results.yaml.in b/tcwg-update-lnt-results.yaml.in
new file mode 100644
index 0000000000..3754dd6a8b
--- /dev/null
+++ b/tcwg-update-lnt-results.yaml.in
@@ -0,0 +1,62 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-lnt-results
+    project-type: freestyle
+    defaults: global
+    properties:
+        - default-properties
+    parameters:
+        - label:
+            name: nodes
+            default: tcwg-lnt
+            all-nodes: true
+            matching-label: 'allCases'
+            description: 'Machines or label to run on'
+        - string:
+            name: ci_project
+            default: 'default'
+            description: "CI project ID; used as namespace for git branches"
+        - string:
+            name: ci_config
+            default: 'default'
+            description: "CI configuration ID; used as name of git branches"
+        - bool:
+            name: verbose
+            default: 'true'
+            description: 'Whether to be verbose'
+        - string:
+            name: scripts_branch
+            default: master
+            description: 'Scripts revision to use'
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG Update LNT results'
+    workspace: workspace/tcwg-update-lnt-results_${NODE_NAME}_${EXECUTOR_NUMBER}
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - ssh-agent-credentials:
+            # tcwg-buildslave user id
+            users:
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+        - build-name:
+            name: '#${BUILD_NUMBER}-${NODE_NAME} ($ci_project--$ci_config)'
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+
+            ./jenkins-scripts/tcwg-update-lnt-results.sh \
+               --lnt_config "$NODE_NAME" \
+               --ci_project "$ci_project" \
+               --ci_config "$ci_config" \
+               --verbose "$verbose"
+    publishers:
+      - email-ext:
+          recipients: 'laurent.alfonsi@linaro.org,maxim.kuvyrkov@linaro.org'
diff --git a/tcwg-update-lnt-results/tcwg-update-lnt-results.def b/tcwg-update-lnt-results/tcwg-update-lnt-results.def
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tcwg-update-lnt-results/tcwg-update-lnt-results.def
diff --git a/tcwg-update-snapshots_ref.yaml b/tcwg-update-snapshots_ref.yaml
index f93939ac9d..5649d42a15 100644
--- a/tcwg-update-snapshots_ref.yaml
+++ b/tcwg-update-snapshots_ref.yaml
@@ -1,27 +1,53 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg-update-source-caches.yaml.in and tcwg-update-source-caches/tcwg-update-snapshots_ref.def. Do not edit.
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
 - job:
     name: tcwg-update-snapshots_ref
-    project-type: matrix
+    project-type: freestyle
     defaults: global
     properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
+      - default-properties
     parameters:
         - bool:
             name: generate_abe
             default: true
             description: 'Generate ABE snapshots'
         - bool:
-            name: generate_llvm
-            default: true
-            description: 'Generate LLVM repos'
+            name: generate_bmk
+            default: false
+            description: 'Generate benchmark source cache'
         - bool:
             name: generate_misc
             default: true
@@ -29,11 +55,7 @@
         - bool:
             name: update_abe_git
             default: true
-            description: 'Update ABE Git repos'
-        - bool:
-            name: update_llvm_git
-            default: true
-            description: 'Update LLVM Git repos'
+            description: 'Update Git repos'
         - bool:
             name: verbose
             default: true
@@ -46,62 +68,61 @@
             name: abe_branch
             default: tested
             description: 'Abe revision to use'
+        - string:
+            name: distro
+            default: default
+            description: 'Docker image tag to use'
     disabled: false
-    node: tcwg-coordinator
-    retry-count: 3
-    display-name: 'TCWG CCC Update reference ABE snapshots on TCWG machines'
+    concurrent: false
+    node: tcwg-x86_64-dev-01
+    display-name: 'TCWG CCC Update snapshots_ref cache on TCWG machines'
     triggers:
         - timed: '@weekly'
     scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/changes/*:refs/remotes/changes/*
-            branches:
-                - ${scripts_branch}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: true
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-dev-01
-    execution-strategy:
-        sequential: false
+      - jenkins-scripts
     wrappers:
         - timeout:
-            timeout: 60
+            timeout: 600
         - timestamps
         - ssh-agent-credentials:
-            # tcwg-buildslave user id
             users:
+                # tcwg-buildslave user id
                 - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
         - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+            name: '#${BUILD_NUMBER}'
     builders:
         - shell: |
             #!/bin/bash
+            set -ex
 
-            set -e
-            set -x
-
-            . jenkins-helpers.sh
-
-            case "$label" in
-              tcwg-x86_64-dev-01)
-                machines="ex40-01.tcwglab.linaro.org r1-a7.aus-colo"
-                nodes_list=($(print_nodes_in_labels tcwg-apm_64-build tcwg-tk1 tcwg-tx1 tcwg-x86_64-1-cam tcwg-x86_64-build tcwg-coordinator))
-                for node in "${nodes_list[@]}"; do
-                  machines="$machines $(print_host_for_node $node)"
-                done
-                ;;
-              *) echo "ERROR: Unknown host: $label"; exit 1 ;;
-            esac
-
-            ./tcwg-generate-source-cache.sh --dir-abe $HOME/snapshots-ref-new --dir-llvm $HOME/llvm-reference-new --generate-abe $generate_abe --generate-llvm $generate_llvm --generate-misc $generate_misc --update-abe-git $update_abe_git --update-llvm-git $update_llvm_git --verbose $verbose --abe-branch $abe_branch
-            ./tcwg-rsync-dir.sh --dir $HOME/snapshots-ref --verbose $verbose -- $machines
-            ./tcwg-rsync-dir.sh --dir $HOME/llvm-reference --verbose $verbose -- $machines
+            new_cache=$(mktemp -d)
+            trap "rm -rf $new_cache" EXIT
+            cache_dir=$HOME/snapshots-ref
+            # Use previous cache to speed up re-generation.
+            rsync -a --del $cache_dir/ $new_cache/
+            ./jenkins-scripts/tcwg-generate-source-cache.sh \
+              --cache_dir "$new_cache" \
+              --generate_abe "$generate_abe" \
+              --generate_bmk "$generate_bmk" \
+              --generate_misc "$generate_misc" \
+              --update_abe_git "$update_abe_git" \
+              --verbose "$verbose" \
+              --abe_branch "$abe_branch"
+            rsync -a --del $new_cache/ $cache_dir/
+        - trigger-builds:
+            - project: tcwg-buildslave-command
+              predefined-parameters: |
+                command=set -ex; cache_dir=/home/tcwg-buildslave/snapshots-ref; sudo mkdir -p $cache_dir; sudo chown -R $USER:tcwg-infra $cache_dir; rsync -az --del dev-01.tcwglab:$cache_dir/ $cache_dir/
+                displayname=snapshots_ref
+              parameter-factories:
+                - factory: allnodesforlabel
+                  name: nodes
+                  node-label: tcwg-build || tcwg-build_bmk || tcwg-dev
+                  ignore-offline-nodes: false
+              block: false
     publishers:
-        - email:
-            recipients: tcwg@linaro.org
+        - email-ext:
+            recipients: tcwg-validation@linaro.org
+            aborted: true
+
+# checksum: 131fc6fb2af6077ba58f8a0df52d8f90
diff --git a/tcwg-update-source-caches.yaml.in b/tcwg-update-source-caches.yaml.in
new file mode 100644
index 0000000000..e3ee8c7b3f
--- /dev/null
+++ b/tcwg-update-source-caches.yaml.in
@@ -0,0 +1,128 @@
+#include tcwg/default.yaml.inc
+
+- job:
+    name: tcwg-update-#{CACHE}
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+        - bool:
+            name: generate_abe
+#if CACHE_snapshots_ref
+            default: true
+#elif CACHE_bmk_ref
+            default: false
+#endif
+            description: 'Generate ABE snapshots'
+        - bool:
+            name: generate_bmk
+#if CACHE_snapshots_ref
+            default: false
+#elif CACHE_bmk_ref
+            default: true
+#endif
+            description: 'Generate benchmark source cache'
+        - bool:
+            name: generate_misc
+#if CACHE_snapshots_ref
+            default: true
+#elif CACHE_bmk_ref
+            default: false
+#endif
+            description: 'Generate misc file'
+        - bool:
+            name: update_abe_git
+            default: true
+            description: 'Update Git repos'
+        - bool:
+            name: verbose
+            default: true
+            description: 'Enable verbose output'
+        - string:
+            name: scripts_branch
+            default: refs/remotes/origin/master
+            description: 'Scripts revision to use'
+        - string:
+            name: abe_branch
+            default: tested
+            description: 'Abe revision to use'
+        - string:
+            name: distro
+            default: default
+            description: 'Docker image tag to use'
+    disabled: false
+    concurrent: false
+#if CACHE_snapshots_ref
+    node: tcwg-x86_64-dev-01
+#elif CACHE_bmk_ref
+    node: tcwg-bmk-bkp-01
+#endif
+    display-name: 'TCWG CCC Update #{CACHE} cache on TCWG machines'
+    triggers:
+        - timed: '@weekly'
+    scm:
+      - jenkins-scripts
+    wrappers:
+        - timeout:
+            timeout: 600
+        - timestamps
+        - ssh-agent-credentials:
+            users:
+#if CACHE_snapshots_ref
+                # tcwg-buildslave user id
+                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#elif CACHE_bmk_ref
+                - 'tcwg-benchmark'
+#endif
+        - build-name:
+            name: '#${BUILD_NUMBER}'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -ex
+
+            new_cache=$(mktemp -d)
+            trap "rm -rf $new_cache" EXIT
+#if CACHE_snapshots_ref
+            cache_dir=$HOME/snapshots-ref
+#elif CACHE_bmk_ref
+            cache_dir=/home/shared/git
+            sudo mkdir -p $cache_dir
+            sudo chown -R $USER:tcwg-infra $cache_dir
+#endif
+            # Use previous cache to speed up re-generation.
+            rsync -a --del $cache_dir/ $new_cache/
+            ./jenkins-scripts/tcwg-generate-source-cache.sh \
+              --cache_dir "$new_cache" \
+              --generate_abe "$generate_abe" \
+              --generate_bmk "$generate_bmk" \
+              --generate_misc "$generate_misc" \
+              --update_abe_git "$update_abe_git" \
+              --verbose "$verbose" \
+              --abe_branch "$abe_branch"
+            rsync -a --del $new_cache/ $cache_dir/
+        - trigger-builds:
+            - project: tcwg-buildslave-command
+              predefined-parameters: |
+#if CACHE_snapshots_ref
+                command=set -ex; cache_dir=/home/tcwg-buildslave/snapshots-ref; sudo mkdir -p $cache_dir; sudo chown -R $USER:tcwg-infra $cache_dir; rsync -az --del dev-01.tcwglab:$cache_dir/ $cache_dir/
+#elif CACHE_bmk_ref
+                command=set -ex; cache_dir=/home/shared/git; sudo mkdir -p $cache_dir; sudo chown -R $USER:tcwg-infra $cache_dir; rsync -az --del bkp-01.tcwglab:$cache_dir/ $cache_dir/
+#endif
+                displayname=#{CACHE}
+              parameter-factories:
+                - factory: allnodesforlabel
+                  name: nodes
+#if CACHE_snapshots_ref
+                  node-label: tcwg-build || tcwg-build_bmk || tcwg-dev
+#elif CACHE_bmk_ref
+                  node-label: tcwg-bmk-hw
+#endif
+                  ignore-offline-nodes: false
+              block: false
+    publishers:
+        - email-ext:
+            recipients: tcwg-validation@linaro.org
+            aborted: true
+
diff --git a/tcwg-update-source-caches/tcwg-update-bmk_ref.def b/tcwg-update-source-caches/tcwg-update-bmk_ref.def
new file mode 100644
index 0000000000..b9306f859f
--- /dev/null
+++ b/tcwg-update-source-caches/tcwg-update-bmk_ref.def
@@ -0,0 +1 @@
+-v CACHE=bmk_ref
diff --git a/tcwg-update-source-caches/tcwg-update-snapshots_ref.def b/tcwg-update-source-caches/tcwg-update-snapshots_ref.def
new file mode 100644
index 0000000000..c06792171e
--- /dev/null
+++ b/tcwg-update-source-caches/tcwg-update-snapshots_ref.def
@@ -0,0 +1 @@
+-v CACHE=snapshots_ref
diff --git a/tcwg-upstream-monitoring-go.yaml b/tcwg-upstream-monitoring-go.yaml
deleted file mode 100644
index 8005f0bca7..0000000000
--- a/tcwg-upstream-monitoring-go.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-- job:
-    name: tcwg-upstream-monitoring-go
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/linaro_binutils-2_25-branch gcc=gcc.git~linaro/gcc-5-branch glibc=glibc.git~release/2.21/master'
-        - string:
-            name: native_x86_64_languages
-            default: 'go'
-            description: 'Languages to build for x86_64 native toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: native_aarchXX_languages
-            default: 'go'
-            description: 'Languages to build for AArchXX native toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:logs
-            description: 'Log_Server'
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number'
-    disabled: false
-    node: tcwg-coordinator
-    child-workspace: $branch
-    concurrent: true
-    display-name: 'TCWG Upstream Monitoring GO language only'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - tcwg-x86_64-build
-        - axis:
-            type: user-defined
-            name: branch
-            values:
-                - gcc-master
-    triggers:
-        # Three times a week, Mon, Wed, Fri at 02:20
-        - timed: '20 2 * * 1,3,5'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '${branch} #${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            case "$branch" in
-                all-master)
-                    gcc_branch=master
-                    config=master ;;
-                gcc-master)
-                    gcc_branch=master
-                    config=latest-rel ;;
-                gcc-*-branch)
-                    gcc_branch=$branch
-                    config=latest-rel ;;
-                *) echo "ERROR: Unsupported branch: $branch"; exit 1 ;;
-            esac
-
-            cat <<EOF > buildfarm_parameters
-            override=gcc=gcc.git~$gcc_branch --extraconfigdir ../config/$config $override
-            log_name=tcwg-upstream-monitoring-go/${branch}-$BUILD_NUMBER/\$builder_type.\$target
-            runtests=tcwg-x86_64-build tcwg-x86_32-build tcwg-apm_64-build tcwg-apm_32-build
-            host_x86_64_excludecheck=gdb
-            host_aarchXX_excludecheck=gdb
-            host_x86_64_languages=$native_x86_64_languages
-            host_aarchXX_languages=$native_aarchXX_languages
-            target_list=tcwg-x86_64-build tcwg-x86_32-build tcwg-apm_64-build tcwg-apm_32-build
-            log_server=$log_server
-            abe_branch=refs/remotes/origin/master
-            displaytag=upstream-monitoring-go-$branch-${BUILD_NUMBER}
-            EOF
-        - trigger-builds:
-            - project: tcwg-buildfarm
-              property-file: buildfarm_parameters
-              block: true
-              block-thresholds:
-                  build-step-failure-threshold: 'never'
-                  unstable-threshold: 'never'
-                  failure-threshold: 'never'
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            case "$ref_build" in
-                lastSuccess)   ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber") ;;
-                previous)      ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber") ;;
-                [1-9]*([0-9])) ref_build_num="$ref_build" ;;
-                *) echo "ERROR: Cannot handle ref_build: $ref_build"; exit 1 ;;
-            esac
-
-            cat <<EOF > compare_results_parameters
-            ref_logs=tcwg-upstream-monitoring-go/${branch}-$ref_build_num
-            new_logs=tcwg-upstream-monitoring-go/${branch}-$BUILD_NUMBER
-            show_results=false
-            log_server=$log_server
-            EOF
-        - trigger-builds:
-            - project: tcwg-compare-results
-              property-file: compare_results_parameters
-              block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
diff --git a/tcwg-upstream-monitoring.yaml b/tcwg-upstream-monitoring.yaml
deleted file mode 100644
index 57799e290b..0000000000
--- a/tcwg-upstream-monitoring.yaml
+++ /dev/null
@@ -1,135 +0,0 @@
-- job:
-    name: tcwg-upstream-monitoring
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-        - throttle:
-            max-total: 2
-            option: project
-    parameters:
-        - string:
-            name: override
-            default: ''
-            description: 'Versions of components to build; e.g. binutils=binutils-gdb.git/linaro_binutils-2_25-branch gcc=gcc.git~linaro/gcc-5-branch glibc=glibc.git~release/2.21/master'
-        - string:
-            name: native_x86_64_languages
-            default: 'c,c++,fortran,lto,objc,obj-c++'
-            description: 'Languages to build for x86_64 native toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: native_aarchXX_languages
-            default: 'c,c++,fortran,lto,objc,obj-c++'
-            description: 'Languages to build for AArchXX native toolchains, e.g., "c,c++" or "all" or "default"'
-        - string:
-            name: log_server
-            default: dev-01.tcwglab:logs
-            description: 'Log_Server'
-        - string:
-            name: ref_build
-            default: 'previous'
-            description: 'Reference build for comparison, e.g., "lastSuccess" or "previous" or job number'
-    disabled: false
-    node: tcwg-coordinator
-    child-workspace: $branch
-    concurrent: true
-    display-name: 'TCWG Upstream Monitoring'
-    axes:
-        - axis:
-            type: user-defined
-            name: branch
-            values:
-                - gcc-master
-    triggers:
-        # Every 4 hours at 00:20, 04:20, 08:20, 12:20, 16:20, 20:20
-        - timed: '20 0,4,8,12,16,20 * * *'
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '${branch} #${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            case "$branch" in
-                all-master)
-                    gcc_branch=master
-                    config=master ;;
-                gcc-master)
-                    gcc_branch=master
-                    config=latest-rel ;;
-                gcc-*-branch)
-                    gcc_branch=$branch
-                    config=latest-rel ;;
-                *) echo "ERROR: Unsupported branch: $branch"; exit 1 ;;
-            esac
-
-            cat <<EOF > buildfarm_parameters
-            override=gcc=gcc.git~$gcc_branch --extraconfigdir ../config/$config $override
-            log_name=tcwg-upstream-monitoring/${branch}-$BUILD_NUMBER/\$builder_type.\$target
-            runtests=tcwg-x86_64-build tcwg-x86_32-build tcwg-apm_64-build tcwg-apm_32-build
-            host_x86_64_excludecheck=gdb
-            host_aarchXX_excludecheck=gdb
-            host_x86_64_languages=$native_x86_64_languages
-            host_aarchXX_languages=$native_aarchXX_languages
-            target_list=tcwg-x86_64-build tcwg-x86_32-build tcwg-apm_64-build tcwg-apm_32-build
-            log_server=$log_server
-            abe_branch=refs/remotes/origin/master
-            displaytag=upstream-monitoring-$branch-${BUILD_NUMBER}
-            EOF
-        - trigger-builds:
-            - project: tcwg-buildfarm
-              property-file: buildfarm_parameters
-              block: true
-              block-thresholds:
-                  build-step-failure-threshold: 'never'
-                  unstable-threshold: 'never'
-                  failure-threshold: 'never'
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            shopt -s extglob
-
-            case "$ref_build" in
-                lastSuccess)   ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastSuccessfulBuild/buildNumber") ;;
-                previous)      ref_build_num=$(wget -q --no-check-certificate -O - "${JOB_URL}lastCompletedBuild/buildNumber") ;;
-                [1-9]*([0-9])) ref_build_num="$ref_build" ;;
-                *) echo "ERROR: Cannot handle ref_build: $ref_build"; exit 1 ;;
-            esac
-
-            cat <<EOF > compare_results_parameters
-            ref_logs=tcwg-upstream-monitoring/${branch}-$ref_build_num
-            new_logs=tcwg-upstream-monitoring/${branch}-$BUILD_NUMBER
-            show_results=false
-            log_server=$log_server
-            EOF
-        - trigger-builds:
-            - project: tcwg-compare-results
-              property-file: compare_results_parameters
-              block: true
-    publishers:
-        - workspace-cleanup:
-             include:
-              - "*_parameters"
-        - email:
-            recipients: 'tcwg-validation@linaro.org'
diff --git a/tcwg-upstream2gerrit.yaml b/tcwg-upstream2gerrit.yaml
deleted file mode 100644
index aa59a92f18..0000000000
--- a/tcwg-upstream2gerrit.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- job:
-    name: tcwg-upstream2gerrit
-    project-type: freestyle
-    defaults: global
-    description: |
-      This job tracks gcc-patches@ mailing list and tests
-      interesting patches.
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: branch
-            default: 'master'
-            description: 'Project branch to apply patch to'
-        - string:
-            name: patches
-            default: 'last'
-            description: 'List of patchworks patch ids (numbers); special values: last'
-        - string:
-            name: project
-            default: 'gcc'
-            description: 'GCC branch to apply patch to'
-        - bool:
-            name: squash
-            default: 'false'
-            description: 'Whether to squash all patches into one commit/review'
-        - bool:
-            name: filter
-            default: 'false'
-            description: 'Use internal filter to decide whether to submit a patch for review and validation'
-        - string:
-            name: scripts_branch
-            default: 'master'
-            description: 'Branch to pull jenkins-script from'
-    disabled: false
-    node: tcwg-coordinator
-    concurrent: false
-    display-name: 'TCWG ZZZ Monitor Upstream Patches'
-    scm:
-        - git:
-            url: https://git-us.linaro.org/toolchain/jenkins-scripts.git
-            refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
-            name: origin
-            branches:
-                - ${scripts_branch}
-            basedir: jenkins-scripts
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timeout:
-            timeout: 600
-        - timestamps
-        - ssh-agent-credentials:
-            # tcwg-buildslave user id
-            users:
-                - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
-        - build-name:
-            name: '#${BUILD_NUMBER}'
-    builders:
-        - shell: |
-            #!/bin/bash
-            ./jenkins-scripts/docker-run.sh -- ./jenkins-scripts/tcwg-upstream2gerrit.sh --branch "$branch" --patches "$patches" --project "$project" --squash "$squash" --filter "$filter"
diff --git a/tcwg-validate-abetests.yaml b/tcwg-validate-abetests.yaml
index 281d2a3742..511f7e1efb 100644
--- a/tcwg-validate-abetests.yaml
+++ b/tcwg-validate-abetests.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-build
                 - job-cancel
         - build-discarder:
@@ -25,7 +25,7 @@
     display-name: 'TCWG BBB test for abe-tests.git'
     scm:
         - git:
-            url: https://git-us.linaro.org/toolchain/abe-tests.git
+            url: https://git.linaro.org/toolchain/abe-tests.git
             refspec: ${GERRIT_REFSPEC}
             branches:
                 - ${GERRIT_BRANCH}
@@ -82,9 +82,9 @@
 
             set -e
 
-            git clone -b $scripts_branch --depth 1 https://git-us.linaro.org/toolchain/jenkins-scripts
+            git clone -b $scripts_branch --depth 1 https://git.linaro.org/toolchain/jenkins-scripts
 
-            ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --distro trusty --task build --prefix build_ > build-container.sh
+            ./jenkins-scripts/start-container-docker.sh --label $label --node $NODE_NAME --task build --prefix build_ > build-container.sh
             . ./build-container.sh
             BUILD_SHELL="build_container_exec bash"
             $BUILD_SHELL -c "echo \"Build session is up; ulimit config:\"; ulimit -a"
diff --git a/tcwg.yaml b/tcwg.yaml
new file mode 100644
index 0000000000..89d88810f5
--- /dev/null
+++ b/tcwg.yaml
@@ -0,0 +1,67 @@
+# All tcwg views described here
+
+- view:
+    name: tcwg-all
+    view-type: list
+    regex: 'tcwg.*'
+
+- view:
+    name: tcwg-infra
+    view-type: list
+    regex: 'tcwg-.*'
+
+# All round-robin build jobs
+- view:
+    name: tcwg-build
+    view-type: list
+    regex: 'tcwg_.*-build'
+
+# tcwg_bmk
+- view:
+    name: tcwg_bmk
+    view-type: list
+    regex: 'tcwg_bmk-.*-build'
+- view:
+    name: tcwg_bmk-fujitsu
+    view-type: list
+    regex: 'tcwg_bmk-fujitsu.*-build'
+- view:
+    name: tcwg_bmk-vect
+    view-type: list
+    regex: 'tcwg_bmk-code_vect.*-build'
+- view:
+    name: tcwg_bmk-sve
+    view-type: list
+    regex: 'tcwg_bmk-code_sve.*-build'
+
+# tcwg_kernel
+- view:
+    name: tcwg_kernel-gnu
+    view-type: list
+    regex: 'tcwg_kernel--gnu.*-build'
+- view:
+    name: tcwg_kernel-llvm
+    view-type: list
+    regex: 'tcwg_kernel--llvm.*-build'
+
+# tcwg_gnu/tcwg_gcc
+- view:
+    name: tcwg_gnu
+    view-type: list
+    regex: 'tcwg_gnu.*-build'
+- view:
+    name: tcwg_gcc
+    view-type: list
+    regex: 'tcwg_gcc.*-build'
+
+# tcwg_aosp
+- view:
+    name: tcwg_aosp
+    view-type: list
+    regex: 'tcwg_aosp-.*-build'
+
+# And all bisect views
+- view:
+    name: tcwg-bisect
+    view-type: list
+    regex: 'tcwg_.*-bisect'
diff --git a/tcwg/cpp-script.sh b/tcwg/cpp-script.sh
new file mode 100755
index 0000000000..958e0203a8
--- /dev/null
+++ b/tcwg/cpp-script.sh
@@ -0,0 +1,84 @@
+#!/bin/bash
+
+# Clean: shellcheck -e 2001 ./cpp-script.sh
+
+# NOTE: THIS SCRIPT HAS COPIES IN THE FOLLOWING REPOS:
+# - CI/DOCKERFILES.GIT AND
+# - CI/JOB/CONFIGS.GIT
+# REMEMBER TO SYNCHRONIZE ALL COPIES ON CHANGES.
+
+set -eu -o pipefail
+
+input=""
+vars=()
+
+while [ $# -gt 0 ]; do
+    case $1 in
+	--input|-i) input="$2"; shift ;;
+	--var|-v) vars+=("$2"); shift ;;
+	*) echo "ERROR: Wrong option: $1"; usage ;;
+    esac
+    shift
+done
+
+if [ x"$input" = x"" ]; then
+    echo "ERROR: No --input parameter"
+    exit 1
+fi
+
+tmp_in=$(mktemp)
+tmp_out=$(mktemp)
+cp "$input" "$tmp_in"
+
+# Iteratively include files until there are no more #include directives.
+while grep -q "^#include .*\$" "$tmp_in"; do
+    include=$(grep "^#include .*\$" "$tmp_in" | head -n1)
+    inc_file=$(echo "$include" | sed -e "s/^#include \+//")
+    if [ ! -f "$inc_file" ]; then
+	echo "ERROR: #include file $inc_file does not exist" >&2
+	exit 1
+    fi
+    # Escape '/' in the path name
+    include=$(echo "$include" | sed -e "s#/#\\\\/#g")
+    # Instruct sed to read in the include and add extra '#' to #include line.
+    cat "$tmp_in" | sed -e "/^$include\$/ {
+i #BEGIN: $inc_file
+r $inc_file
+a #END:   $inc_file
+d
+}" > "$tmp_out"
+    cp "$tmp_out" "$tmp_in"
+done
+
+cpp_opts=()
+# Undef all macros.  Next loop will define the appropriate ones to "1".
+for macro in $(unifdef -s -k -t "$tmp_in"); do
+    cpp_opts+=("-U${macro}")
+done
+
+declare -Ag vars_values
+if [ ${#vars[@]} -gt 0 ]; then
+    for var in "${vars[@]}"; do
+	name=$(echo "$var" | cut -d= -f 1)
+	value=$(echo "$var" | cut -s -d= -f 2)
+
+	# Define requested macros to "1".
+	cpp_opts+=("-D${name}_${value}=1")
+
+	# Gather all values for $name in $vars_values[$name]
+	if [ x"${vars_values[$name]+set}" = x"set" ]; then
+            vars_values[$name]="${vars_values[$name]} $value"
+	else
+            vars_values[$name]="$value"
+	fi
+    done
+fi
+
+sed_opts=()
+for name in "${!vars_values[@]}"; do
+    # Substitute #{NAME} with VALUE.
+    sed_opts+=("-e" "s/#{${name}}/${vars_values[$name]}/g")
+done
+
+unifdef -k -t -x2 "${cpp_opts[@]}" "$tmp_in" \
+    | sed -e "s/^//" "${sed_opts[@]+"${sed_opts[@]}"}"
diff --git a/tcwg/default.yaml.inc b/tcwg/default.yaml.inc
new file mode 100644
index 0000000000..51981fff33
--- /dev/null
+++ b/tcwg/default.yaml.inc
@@ -0,0 +1,73 @@
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+#if TCWG_benchmark
+          # Allow users in tcwg-benchmark group (e.g., tcwg-buildslave)
+          # start and stop builds.  We use this in tcwg_bmk* CI loops.
+          tcwg-benchmark:
+            - job-build
+            - job-cancel
+#endif
+      - build-discarder:
+          days-to-keep: 30
+
+#if JENKINS_SCRIPTS_master
+- scm:
+    name: jenkins-scripts-master
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/master:refs/remotes/origin/master
+          branches:
+            - master
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#else
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#endif
+
+#if SCM_bmk_scripts
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#endif
diff --git a/tcwg/generate-yamlfiles.sh b/tcwg/generate-yamlfiles.sh
new file mode 100755
index 0000000000..7ade4fc5b9
--- /dev/null
+++ b/tcwg/generate-yamlfiles.sh
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+set -euf -o pipefail
+
+if [ $# = 0 ]; then
+    names=(-name "*.yaml.in")
+else
+    names=()
+    while [ $# != 0 ]; do
+	names+=(-name "$1")
+	shift
+    done
+fi
+
+top=$(git rev-parse --show-toplevel)
+
+generate_yamlfiles ()
+{
+    (
+    local yaml_in="$1"
+
+    local dir="${yaml_in%%.yaml.in}"
+    local yaml_file
+
+    local def_file
+
+    while IFS= read -r -d '' def_file; do
+	yaml_file="$(dirname "$dir")/$(basename "$def_file" .def).yaml"
+        echo "# Auto generated by $0 from ${yaml_in#$top/} and ${def_file#$top/}. Do not edit." > "$yaml_file"
+	$top/tcwg/cpp-script.sh $(cat "$def_file") -i "$yaml_in" \
+				     >> "$yaml_file"
+        $top/tcwg/validate-checksum.sh --generate true "$yaml_file"
+    done < <(find "$dir" -name "*.def" -print0)
+    )
+}
+
+while IFS= read -r -d '' i; do
+    generate_yamlfiles "$i"
+done < <(find "$top" "${names[@]}" -a ! -name ".*" -print0)
diff --git a/tcwg/round-robin.yaml.inc b/tcwg/round-robin.yaml.inc
new file mode 100644
index 0000000000..c40eec104a
--- /dev/null
+++ b/tcwg/round-robin.yaml.inc
@@ -0,0 +1,1416 @@
+# -*- mode: Yaml -*-
+
+#include tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+#if SCM_bmk_scripts
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+#endif
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+#if DYNAMIC_COMPONENT_LIST_yes
+      - string:
+          name: 'dynamic_components_list'
+          default: '*'
+          description: "Component list to update. '*' means all components"
+#endif
+#if COMPONENTS_aosp_superproject
+      - component-parameters:
+          component: aosp_superproject
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_binutils
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_gcc
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_gdb
+      - component-parameters:
+          component: gdb
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_glibc
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_mingw
+      - component-parameters:
+          component: mingw
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_newlib
+      - component-parameters:
+          component: newlib
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_linux
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_llvm
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_toolchain_superproject
+      - component-parameters:
+          component: toolchain_superproject
+          default_git: '{default_git}'
+#endif
+#if COMPONENTS_qemu
+      - component-parameters:
+          component: qemu
+          default_git: '{default_git}'
+#endif
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+#if PRECOMMIT_ENABLE_yes
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+#endif
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+#if PRECOMMIT_ENABLE_yes
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+#endif
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+#if RR_tcwg_bmk
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--#{TOOLCHAIN}-.*-bisect'
+#else
+            - '{ci_project}--.*-bisect'
+#endif
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+#if COMPONENTS_aosp_superproject
+      - component-scm:
+          component: aosp_superproject
+          url: '{aosp_superproject_url}'
+          branch: '{aosp_superproject_branch}'
+          reference: superproject.git
+#endif
+#if COMPONENTS_binutils
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+#endif
+#if COMPONENTS_gcc
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+#endif
+#if COMPONENTS_gdb
+      - component-scm:
+          component: gdb
+          url: '{gdb_url}'
+          branch: '{gdb_branch}'
+          reference: binutils-gdb.git
+#endif
+#if COMPONENTS_glibc
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+#endif
+#if COMPONENTS_linux
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+#endif
+#if COMPONENTS_llvm
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+#endif
+#if COMPONENTS_mingw
+      - component-scm:
+          component: mingw
+          url: '{mingw_url}'
+          branch: '{mingw_branch}'
+          reference: mingw-w64.git
+#endif
+#if COMPONENTS_newlib
+      - component-scm:
+          component: newlib
+          url: '{newlib_url}'
+          branch: '{newlib_branch}'
+          reference: newlib.git
+#endif
+#if COMPONENTS_toolchain_superproject
+      - component-scm:
+          component: toolchain_superproject
+          url: '{toolchain_superproject_url}'
+          branch: '{toolchain_superproject_branch}'
+          reference: superproject.git
+#endif
+#if COMPONENTS_qemu
+      - component-scm:
+          component: qemu
+          url: '{qemu_url}'
+          branch: '{qemu_branch}'
+          reference: qemu.git
+#endif
+#if SCM_bmk_scripts
+      - bmk-scripts
+#endif
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#if PRECOMMIT_ENABLE_yes
+#            - 'tcwg-build-20220725'
+#endif
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+#if PRECOMMIT_TRIGGER_yes
+          - text:
+              credential-id: TCWG_PW_TOKEN
+              variable: TCWG_PW_TOKEN
+#endif
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+#if SCM_bmk_scripts
+              echo "bmk_branch=$bmk_branch" >> $i
+#endif
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+#if RR_tcwg_bmk
+            __rewrite_num 30 \
+#else
+            __rewrite_num 100 \
+#endif
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+#if PRECOMMIT_TRIGGER_yes
+- builder:
+    name: trigger-precommit-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Trigger pre-commit builds if the jenkins queue for
+          # this job is empty.
+          #
+          # Skip triggering pre-commit builds if there are other post-commit
+          # or pre-commit builds in the queue.
+          # Re. post-commit builds -- we need to process all pending
+          # bisection-triggered builds before fetching a new batch of
+          # upstream changes.
+          # Re. pre-commit builds -- we need to wait for the previous batch
+          # to finish to avoid triggering duplicate builds for the queued
+          # patches.
+          for job_type in build precommit; do
+            url="${{JOB_URL%-build/}}-$job_type"
+            inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+              | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+            if [ "$inQueue" != "false" ]; then
+              echo "SKIPPING PRECOMMIT TRIGGER: $build_type QUEUE IS NOT EMPTY"
+              trap "" EXIT
+              exit 0
+            fi
+          done
+
+          # $update_baseline != ignore tells us that we have just
+          # updated the baseline and this means that we should be
+          # in great shape to apply pending patches.
+          # Most likely current baseline revision is master revision
+          # as of few hours ago.
+          if [ "$update_baseline" = "ignore" ]; then
+            echo "SKIPPING PRECOMMIT TRIGGER: DID NOT UPDATE BASELINE"
+            trap "" EXIT
+            exit 0
+          fi
+
+          for project in #{COMPONENTS}; do
+            # Note that we get here only when all previous pre-commit
+            # builds have finished and, presumably, updated ci_bot
+            # bundles at patchworks instance.  If this were not
+            # the case, there would be some builds queued and
+            # we would have exited above.
+            build_container_exec \
+              ./jenkins-scripts/pw-trigger.sh \
+                --ci_bot '{ci_project}--{ci_config}' --project "$project" \
+                --out_dir artifacts/jenkins \
+                &> artifacts/jenkins/pw-trigger.log
+
+            for i in artifacts/jenkins/trigger-precommit-*; do
+              if [ -f $i ]; then
+                echo "distro=$distro" >> $i
+                echo "scripts_branch=$scripts_branch" >> $i
+# if SCM_bmk_scripts
+                echo "bmk_branch=$bmk_branch" >> $i
+# endif
+              fi
+            done
+          done
+
+          trap "" EXIT
+#endif
+#if PRECOMMIT_ENABLE_yes
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+#endif
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+#if PRECOMMIT_ENABLE_yes
+              for job_type in build precommit; do
+#else
+              for job_type in build; do
+#endif
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+#if SET_DOCKER_ARCH_yes
+              --arch {docker_arch}
+              --node $NODE_NAME
+#endif
+#if SET_DOCKER_SECURITY_yes
+              --security '{docker_security}'
+#endif
+#if RR_tcwg_bmk
+              --ssh_info true
+#endif
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+#if SCM_bmk_scripts
+              --bmk_branch "$bmk_branch" \
+#endif
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+#if DYNAMIC_COMPONENT_LIST_yes
+              ==rr[dynamic_components_list] "$dynamic_components_list" \
+#endif
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+#if DYNAMIC_COMPONENT_LIST_yes
+
+            build_container_exec \
+              ./jenkins-scripts/update_components_revs.sh \
+              @@rr[top_artifacts] artifacts \
+              __dynamic_components_list "$dynamic_components_list"
+
+            # Might need to add adjustment of the $build_name (not critical)
+
+            # Might not need to add branch_opt : The build script doesn't need it.
+            build_name="$build_name-$dynamic_components_list"
+#else
+            for c in #{COMPONENTS}; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+#endif
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+#if SET_DOCKER_ARCH_yes
+                docker_arch: '{docker_arch}'
+#endif
+#if SET_DOCKER_SECURITY_yes
+                docker_security: '{docker_security}'
+#endif
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+#if PRECOMMIT_TRIGGER_yes
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-1:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+#endif
+#if PRECOMMIT_ENABLE_yes
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+#endif
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+#if PRECOMMIT_ENABLE_yes
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+# if RR_tcwg_bmk
+            precommit_container_rsync -az --del \
+              bmk-scripts/ :bmk-scripts/
+# endif
+
+            branch_opt=()
+            for c in #{COMPONENTS}; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+# if SET_DOCKER_ARCH_yes
+                docker_arch: '{docker_arch}'
+# endif
+# if SET_DOCKER_SECURITY_yes
+                docker_security: '{docker_security}'
+# endif
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+#endif
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+#if PUBLISH_EMAIL_RESULTS_yes
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-body.txt"}}
+          failure: false
+          success: true
+          aborted: false
+          send-to:
+            - recipients
+#endif
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+#if RR_tcwg_bmk
+              --ssh_info true \
+#endif
+#if SET_DOCKER_ARCH_yes
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+#endif
+#if SET_DOCKER_SECURITY_yes
+              --security '{docker_security}' \
+#endif
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+#if SCM_bmk_scripts
+              --bmk_branch "$bmk_branch" \
+#endif
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
diff --git a/tcwg/validate-checksum.sh b/tcwg/validate-checksum.sh
new file mode 100755
index 0000000000..09d0b8974c
--- /dev/null
+++ b/tcwg/validate-checksum.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+
+# NOTE: THIS SCRIPT HAS COPIES IN THE FOLLOWING REPOS:
+# - CI/DOCKERFILES.GIT AND
+# - CI/JOB/CONFIGS.GIT
+# REMEMBER TO SYNCHRONIZE ALL COPIES ON CHANGES.
+
+set -eu
+
+generate=false
+
+usage ()
+{
+    echo "Syntax: $0 [--generate true/false] <generated_file>" 1>&2
+    exit 1
+}
+
+while [ $# -gt 0 ]; do
+    case "$1" in
+	--generate) generate="$2"; shift ;;
+	--*) echo "ERROR: Wrong option: $1"; usage ;;
+	*) break ;;
+    esac
+    shift
+done
+
+if [ x"${1+set}" != x"set" ]; then
+    usage
+fi
+
+GENED_FILE="$1"
+
+if $generate; then
+    MD5=$(md5sum "$GENED_FILE" | awk '{ print $1; }')
+    echo "# checksum: $MD5" >> "$GENED_FILE"
+else
+    EXPECTED_MD5=$(tail -n1 "$GENED_FILE" | awk '{ print $3; }')
+    ACTUAL_MD5=$(head -n -1 "$GENED_FILE" | md5sum | awk '{ print $1; }')
+
+    if [ "$EXPECTED_MD5" != "$ACTUAL_MD5" ]; then
+	echo "ERROR: $GENED_FILE has been modified since it was auto-generated."
+	echo "Note: Current dir is $(pwd)"
+	exit 1
+    fi
+fi
diff --git a/tcwg_aosp-build.yaml b/tcwg_aosp-build.yaml
new file mode 100644
index 0000000000..e6186e38dd
--- /dev/null
+++ b/tcwg_aosp-build.yaml
@@ -0,0 +1,935 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_aosp.yaml.in and tcwg_aosp/tcwg_aosp-build.def. Do not edit.
+- project:
+    name: tcwg_aosp-build
+    aosp_modules:
+      - aosp:
+          build_timeout: 600
+          bisect_timeout: 6000
+    build_timeout: 300
+    bisect_timeout: 3000
+    aosp_target:
+      - oriole
+    aosp_ver:
+      - master
+    jobs:
+      - 'tcwg_aosp-build-{aosp_modules}--{aosp_target}-{aosp_ver}-build'
+      - 'tcwg_aosp-build-{aosp_modules}--{aosp_target}-{aosp_ver}-bisect'
+    ci_project: 'tcwg_aosp-build-{aosp_modules}'
+    ci_config: '{aosp_target}-{aosp_ver}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: aosp_superproject
+          default_git: '{default_git}'
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+      - component-parameters:
+          component: toolchain_superproject
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: aosp_superproject
+          url: '{aosp_superproject_url}'
+          branch: '{aosp_superproject_branch}'
+          reference: superproject.git
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - component-scm:
+          component: toolchain_superproject
+          url: '{toolchain_superproject_url}'
+          branch: '{toolchain_superproject_branch}'
+          reference: superproject.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in aosp_superproject llvm toolchain_superproject; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: 'tcwg_aosp-build-{aosp_modules}--{aosp_target}-{aosp_ver}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: 'default'
+    disabled: false
+    node: tcwg-x86_64 && tcwg-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_aosp_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          aosp_superproject_url: 'https://android.googlesource.com/platform/superproject/main.git'
+          aosp_superproject_branch: 'refs/heads/main'
+          llvm_url: 'https://github.com/llvm/llvm-project.git'
+          llvm_branch: 'refs/heads/main'
+          # Toolchain_superproject_url doesn't have .git at the end to make it
+          # different from aosp_superproject_url -- to workaround a bug in
+          # git-scm.
+          # When cloning 2 branches of same repository both GIT_COMMIT_n and
+          # GIT_COMMIT_m get set to the sha1 value of the second branch.
+          # I'm guessing git-scm plugin is indexing repos by URL, so sha1 of
+          # the first branch gets overwritten.
+          toolchain_superproject_url: 'https://android.googlesource.com/platform/superproject'
+          toolchain_superproject_branch: 'refs/heads/llvm-toolchain'
+    triggers:
+      - pollscm:
+          cron: 'H H * * *'
+    wrappers:
+      - build-wrappers:
+          timeout: '{build_timeout}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_aosp-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: 'tcwg_aosp-build-{aosp_modules}--{aosp_target}-{aosp_ver}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: 'default'
+    disabled: false
+    node: tcwg-x86_64 && tcwg-build && tcwg-fast-disk
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_aosp_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: '{bisect_timeout}'
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_aosp-build.sh'
+    publishers:
+      - bisect-publishers
+# checksum: 21516399e1945e36f82d961bae2bfa90
diff --git a/tcwg_aosp-code_size.yaml b/tcwg_aosp-code_size.yaml
new file mode 100644
index 0000000000..4b2dbed150
--- /dev/null
+++ b/tcwg_aosp-code_size.yaml
@@ -0,0 +1,938 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_aosp.yaml.in and tcwg_aosp/tcwg_aosp-code_size.def. Do not edit.
+- project:
+    name: tcwg_aosp-code_size
+    aosp_modules:
+      - aosp:
+          build_timeout: 600
+          bisect_timeout: 6000
+      - dalvikvm
+      - dex2oat
+      - surfaceflinger
+    build_timeout: 300
+    bisect_timeout: 3000
+    aosp_target:
+      - oriole
+    aosp_ver:
+      - master
+    jobs:
+      - 'tcwg_aosp-code_size-{aosp_modules}--{aosp_target}-{aosp_ver}-build'
+      - 'tcwg_aosp-code_size-{aosp_modules}--{aosp_target}-{aosp_ver}-bisect'
+    ci_project: 'tcwg_aosp-code_size-{aosp_modules}'
+    ci_config: '{aosp_target}-{aosp_ver}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: aosp_superproject
+          default_git: '{default_git}'
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+      - component-parameters:
+          component: toolchain_superproject
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: aosp_superproject
+          url: '{aosp_superproject_url}'
+          branch: '{aosp_superproject_branch}'
+          reference: superproject.git
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - component-scm:
+          component: toolchain_superproject
+          url: '{toolchain_superproject_url}'
+          branch: '{toolchain_superproject_branch}'
+          reference: superproject.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in aosp_superproject llvm toolchain_superproject; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: 'tcwg_aosp-code_size-{aosp_modules}--{aosp_target}-{aosp_ver}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: 'default'
+    disabled: false
+    node: tcwg-x86_64 && tcwg-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_aosp_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          aosp_superproject_url: 'https://android.googlesource.com/platform/superproject/main.git'
+          aosp_superproject_branch: 'refs/heads/main'
+          llvm_url: 'https://github.com/llvm/llvm-project.git'
+          llvm_branch: 'refs/heads/main'
+          # Toolchain_superproject_url doesn't have .git at the end to make it
+          # different from aosp_superproject_url -- to workaround a bug in
+          # git-scm.
+          # When cloning 2 branches of same repository both GIT_COMMIT_n and
+          # GIT_COMMIT_m get set to the sha1 value of the second branch.
+          # I'm guessing git-scm plugin is indexing repos by URL, so sha1 of
+          # the first branch gets overwritten.
+          toolchain_superproject_url: 'https://android.googlesource.com/platform/superproject'
+          toolchain_superproject_branch: 'refs/heads/llvm-toolchain'
+    triggers:
+      - pollscm:
+          cron: 'H H * * *'
+    wrappers:
+      - build-wrappers:
+          timeout: '{build_timeout}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_aosp-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: 'tcwg_aosp-code_size-{aosp_modules}--{aosp_target}-{aosp_ver}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: 'default'
+    disabled: false
+    node: tcwg-x86_64 && tcwg-build && tcwg-fast-disk
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_aosp_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: '{bisect_timeout}'
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_aosp-build.sh'
+    publishers:
+      - bisect-publishers
+# checksum: 8f6d78e2597a7153c7c1924e66057b0c
diff --git a/tcwg_aosp.yaml.in b/tcwg_aosp.yaml.in
new file mode 100644
index 0000000000..21f2c2f324
--- /dev/null
+++ b/tcwg_aosp.yaml.in
@@ -0,0 +1,101 @@
+- project:
+    name: #{RR}-#{RR_PROJECT}
+    aosp_modules:
+      - aosp:
+          build_timeout: 600
+          bisect_timeout: 6000
+#if RR_PROJECT_code_size
+      - dalvikvm
+      - dex2oat
+      - surfaceflinger
+#endif
+    build_timeout: 300
+    bisect_timeout: 3000
+    aosp_target:
+      - oriole
+    aosp_ver:
+      - master
+    jobs:
+      - '#{RR}-#{RR_PROJECT}-{aosp_modules}--{aosp_target}-{aosp_ver}-build'
+      - '#{RR}-#{RR_PROJECT}-{aosp_modules}--{aosp_target}-{aosp_ver}-bisect'
+    ci_project: '#{RR}-#{RR_PROJECT}-{aosp_modules}'
+    ci_config: '{aosp_target}-{aosp_ver}'
+
+#include tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '#{RR}-#{RR_PROJECT}-{aosp_modules}--{aosp_target}-{aosp_ver}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: 'default'
+    disabled: false
+    node: tcwg-x86_64 && tcwg-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/#{RR}_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          aosp_superproject_url: 'https://android.googlesource.com/platform/superproject/main.git'
+          aosp_superproject_branch: 'refs/heads/main'
+          llvm_url: 'https://github.com/llvm/llvm-project.git'
+          llvm_branch: 'refs/heads/main'
+          # Toolchain_superproject_url doesn't have .git at the end to make it
+          # different from aosp_superproject_url -- to workaround a bug in
+          # git-scm.
+          # When cloning 2 branches of same repository both GIT_COMMIT_n and
+          # GIT_COMMIT_m get set to the sha1 value of the second branch.
+          # I'm guessing git-scm plugin is indexing repos by URL, so sha1 of
+          # the first branch gets overwritten.
+          toolchain_superproject_url: 'https://android.googlesource.com/platform/superproject'
+          toolchain_superproject_branch: 'refs/heads/llvm-toolchain'
+    triggers:
+      - pollscm:
+          cron: 'H H * * *'
+    wrappers:
+      - build-wrappers:
+          timeout: '{build_timeout}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: '#{RR}-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '#{RR}-#{RR_PROJECT}-{aosp_modules}--{aosp_target}-{aosp_ver}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: 'default'
+    disabled: false
+    node: tcwg-x86_64 && tcwg-build && tcwg-fast-disk
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/#{RR}_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: '{bisect_timeout}'
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: '#{RR}-build.sh'
+    publishers:
+      - bisect-publishers
diff --git a/tcwg_aosp/tcwg_aosp-build.def b/tcwg_aosp/tcwg_aosp-build.def
new file mode 100644
index 0000000000..4055cdf5fa
--- /dev/null
+++ b/tcwg_aosp/tcwg_aosp-build.def
@@ -0,0 +1,7 @@
+-v RR=tcwg_aosp
+-v RR_PROJECT=build
+-v COMPONENTS=aosp_superproject
+-v COMPONENTS=llvm
+-v COMPONENTS=toolchain_superproject
+-v SCM=bmk_scripts
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_aosp/tcwg_aosp-code_size.def b/tcwg_aosp/tcwg_aosp-code_size.def
new file mode 100644
index 0000000000..a1842ec04a
--- /dev/null
+++ b/tcwg_aosp/tcwg_aosp-code_size.def
@@ -0,0 +1,7 @@
+-v RR=tcwg_aosp
+-v RR_PROJECT=code_size
+-v COMPONENTS=aosp_superproject
+-v COMPONENTS=llvm
+-v COMPONENTS=toolchain_superproject
+-v SCM=bmk_scripts
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_binutils.yaml b/tcwg_binutils.yaml
new file mode 100644
index 0000000000..0cb4f99641
--- /dev/null
+++ b/tcwg_binutils.yaml
@@ -0,0 +1,1345 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_binutils.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_binutils
+    type_of_test: ""
+    timeout_build: 1000
+    # Trigger configuration that have precommit testing every 6 hours
+    # to test incoming patches in a timely manner.
+    cron_master: 'H H/6 * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_binutils_build
+      - tcwg_binutils_check
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    target:
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+    jobs:
+      - tcwg_binutils-master
+
+- job-group:
+    name: tcwg_binutils-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    binutils_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+          - text:
+              credential-id: TCWG_PW_TOKEN
+              variable: TCWG_PW_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+- builder:
+    name: trigger-precommit-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Trigger pre-commit builds if the jenkins queue for
+          # this job is empty.
+          #
+          # Skip triggering pre-commit builds if there are other post-commit
+          # or pre-commit builds in the queue.
+          # Re. post-commit builds -- we need to process all pending
+          # bisection-triggered builds before fetching a new batch of
+          # upstream changes.
+          # Re. pre-commit builds -- we need to wait for the previous batch
+          # to finish to avoid triggering duplicate builds for the queued
+          # patches.
+          for job_type in build precommit; do
+            url="${{JOB_URL%-build/}}-$job_type"
+            inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+              | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+            if [ "$inQueue" != "false" ]; then
+              echo "SKIPPING PRECOMMIT TRIGGER: $build_type QUEUE IS NOT EMPTY"
+              trap "" EXIT
+              exit 0
+            fi
+          done
+
+          # $update_baseline != ignore tells us that we have just
+          # updated the baseline and this means that we should be
+          # in great shape to apply pending patches.
+          # Most likely current baseline revision is master revision
+          # as of few hours ago.
+          if [ "$update_baseline" = "ignore" ]; then
+            echo "SKIPPING PRECOMMIT TRIGGER: DID NOT UPDATE BASELINE"
+            trap "" EXIT
+            exit 0
+          fi
+
+          for project in binutils; do
+            # Note that we get here only when all previous pre-commit
+            # builds have finished and, presumably, updated ci_bot
+            # bundles at patchworks instance.  If this were not
+            # the case, there would be some builds queued and
+            # we would have exited above.
+            build_container_exec \
+              ./jenkins-scripts/pw-trigger.sh \
+                --ci_bot '{ci_project}--{ci_config}' --project "$project" \
+                --out_dir artifacts/jenkins \
+                &> artifacts/jenkins/pw-trigger.log
+
+            for i in artifacts/jenkins/trigger-precommit-*; do
+              if [ -f $i ]; then
+                echo "distro=$distro" >> $i
+                echo "scripts_branch=$scripts_branch" >> $i
+              fi
+            done
+          done
+
+          trap "" EXIT
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-1:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in binutils; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+    triggers:
+      - timed: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: 938f69fbc673155f814a89b7211f8b4a
diff --git a/tcwg_bmk-code_size-coremark--gnu_eabi.yaml b/tcwg_bmk-code_size-coremark--gnu_eabi.yaml
new file mode 100644
index 0000000000..33d890edfb
--- /dev/null
+++ b/tcwg_bmk-code_size-coremark--gnu_eabi.yaml
@@ -0,0 +1,957 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-coremark--gnu_eabi.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-coremark-gnu_eabi
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    newlib_url: git://sourceware.org/git/newlib-cygwin.git
+
+    toolchain_name: gnu_eabi
+
+    # BMK defined in def files
+    bmk:
+      - coremark
+
+    target:
+      - arm_eabi
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - Os
+      - Os_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu_eabi-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu_eabi-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    newlib_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-coremark'
+    ci_config: 'gnu_eabi-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: newlib
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu_eabi-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: newlib
+          url: '{newlib_url}'
+          branch: '{newlib_branch}'
+          reference: newlib.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc newlib; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          newlib_url: '{newlib_url}'
+          newlib_branch: '{newlib_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: c262dffa244123f39f578e6c21be2129
diff --git a/tcwg_bmk-code_size-cpu2017fast--gnu.yaml b/tcwg_bmk-code_size-cpu2017fast--gnu.yaml
new file mode 100644
index 0000000000..a0dfd62691
--- /dev/null
+++ b/tcwg_bmk-code_size-cpu2017fast--gnu.yaml
@@ -0,0 +1,969 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-cpu2017fast-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017fast
+
+    target:
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - Os
+      - Os_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-cpu2017fast'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 83306fe53fc148358cc74e5101a7f6c8
diff --git a/tcwg_bmk-code_size-cpu2017fast--llvm.yaml b/tcwg_bmk-code_size-cpu2017fast--llvm.yaml
new file mode 100644
index 0000000000..b37a2395ef
--- /dev/null
+++ b/tcwg_bmk-code_size-cpu2017fast--llvm.yaml
@@ -0,0 +1,941 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-cpu2017fast-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017fast
+
+    target:
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - Os
+      - Os_LTO
+      - Oz
+      - Oz_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-cpu2017fast'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 5f3e3366e9ba0c463bef40edfa80c284
diff --git a/tcwg_bmk-code_size-cpu2017rate--gnu.yaml b/tcwg_bmk-code_size-cpu2017rate--gnu.yaml
new file mode 100644
index 0000000000..dd9e9b2657
--- /dev/null
+++ b/tcwg_bmk-code_size-cpu2017rate--gnu.yaml
@@ -0,0 +1,969 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-cpu2017rate-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - arm
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - Os
+      - Os_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-cpu2017rate'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: fc2fefacffed61f66dca37fc6885b4fd
diff --git a/tcwg_bmk-code_size-cpu2017rate--llvm.yaml b/tcwg_bmk-code_size-cpu2017rate--llvm.yaml
new file mode 100644
index 0000000000..27662e95d3
--- /dev/null
+++ b/tcwg_bmk-code_size-cpu2017rate--llvm.yaml
@@ -0,0 +1,941 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-cpu2017rate-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - arm:
+          docker_arch: armhf
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - Os
+      - Os_LTO
+      - Oz
+      - Oz_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-cpu2017rate'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 1b82855a88ee2f7d0aaceb44583d7b46
diff --git a/tcwg_bmk-code_size-spec2k6--gnu.yaml b/tcwg_bmk-code_size-spec2k6--gnu.yaml
new file mode 100644
index 0000000000..c74ca9c8c3
--- /dev/null
+++ b/tcwg_bmk-code_size-spec2k6--gnu.yaml
@@ -0,0 +1,970 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-spec2k6--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-spec2k6-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - spec2k6
+
+    target:
+      - arm
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - Os
+      - Os_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-spec2k6'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 29c17c765fecab2fa56df5aede0fdd4f
diff --git a/tcwg_bmk-code_size-spec2k6--llvm.yaml b/tcwg_bmk-code_size-spec2k6--llvm.yaml
new file mode 100644
index 0000000000..db34506bb5
--- /dev/null
+++ b/tcwg_bmk-code_size-spec2k6--llvm.yaml
@@ -0,0 +1,943 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_size-spec2k6--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_size-spec2k6-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - spec2k6
+
+    target:
+      - arm:
+          docker_arch: armhf
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - Os
+      - Os_LTO
+      - Oz
+      - Oz_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_size-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_size-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_size-spec2k6'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_size-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_size-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 620c47c627be02c51d2b0ade2166a849
diff --git a/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml b/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml
new file mode 100644
index 0000000000..755a0ccddd
--- /dev/null
+++ b/tcwg_bmk-code_speed-coremark--gnu_eabi.yaml
@@ -0,0 +1,957 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-coremark--gnu_eabi.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-coremark-gnu_eabi
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    newlib_url: git://sourceware.org/git/newlib-cygwin.git
+
+    toolchain_name: gnu_eabi
+
+    # BMK defined in def files
+    bmk:
+      - coremark
+
+    target:
+      - arm_eabi
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu_eabi-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu_eabi-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    newlib_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-coremark'
+    ci_config: 'gnu_eabi-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: newlib
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu_eabi-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: newlib
+          url: '{newlib_url}'
+          branch: '{newlib_branch}'
+          reference: newlib.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc newlib; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          newlib_url: '{newlib_url}'
+          newlib_branch: '{newlib_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-coremark--gnu_eabi-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 0d76f6c2e88c4f1dcd0cbecbd7dec91b
diff --git a/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml b/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml
new file mode 100644
index 0000000000..d9f7c302bb
--- /dev/null
+++ b/tcwg_bmk-code_speed-cpu2017rate--gnu.yaml
@@ -0,0 +1,970 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-cpu2017rate-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - arm
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-cpu2017rate'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: efa3ef7eb1bfb4f5aac926c29cc09c23
diff --git a/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml b/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml
new file mode 100644
index 0000000000..464e9f708f
--- /dev/null
+++ b/tcwg_bmk-code_speed-cpu2017rate--llvm.yaml
@@ -0,0 +1,943 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-cpu2017rate-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - arm:
+          docker_arch: armhf
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-cpu2017rate'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 426e98f647692fe10f362170adc9b159
diff --git a/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml b/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml
new file mode 100644
index 0000000000..6f5875287e
--- /dev/null
+++ b/tcwg_bmk-code_speed-cpu2017speed--gnu.yaml
@@ -0,0 +1,972 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-cpu2017speed-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017speed
+
+    target:
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-cpu2017speed'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    # We are waiting for tcwg-bmk-apm-* machines to get PDU control,
+    # so that we can recover from crashes.
+    # See https://linaro.atlassian.net/browse/STG-4212 .
+    disabled: true
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: f637a2efc59e81c332f58d660e376bb4
diff --git a/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml b/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml
new file mode 100644
index 0000000000..54fbceb7d1
--- /dev/null
+++ b/tcwg_bmk-code_speed-cpu2017speed--llvm.yaml
@@ -0,0 +1,944 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-cpu2017speed-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017speed
+
+    target:
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-cpu2017speed'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    # We are waiting for tcwg-bmk-apm-* machines to get PDU control,
+    # so that we can recover from crashes.
+    # See https://linaro.atlassian.net/browse/STG-4212 .
+    disabled: true
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 3fe9db4092f4ad13a2af2ebadf6f159b
diff --git a/tcwg_bmk-code_speed-spec2k6--gnu.yaml b/tcwg_bmk-code_speed-spec2k6--gnu.yaml
new file mode 100644
index 0000000000..e5852e659d
--- /dev/null
+++ b/tcwg_bmk-code_speed-spec2k6--gnu.yaml
@@ -0,0 +1,970 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-spec2k6--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-spec2k6-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - spec2k6
+
+    target:
+      - arm
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-spec2k6'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 9f2511de04180b6fdfd797144a67bfc5
diff --git a/tcwg_bmk-code_speed-spec2k6--llvm.yaml b/tcwg_bmk-code_speed-spec2k6--llvm.yaml
new file mode 100644
index 0000000000..b8c8f4d3bf
--- /dev/null
+++ b/tcwg_bmk-code_speed-spec2k6--llvm.yaml
@@ -0,0 +1,943 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_speed-spec2k6--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_speed-spec2k6-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - spec2k6
+
+    target:
+      - arm:
+          docker_arch: armhf
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O2_LTO
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_speed-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_speed-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_speed-spec2k6'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_speed-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_speed-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 800b998d8b50be282b391b91ae6e74a7
diff --git a/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml b/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml
new file mode 100644
index 0000000000..c74214d253
--- /dev/null
+++ b/tcwg_bmk-code_sve-cpu2017fast--gnu.yaml
@@ -0,0 +1,967 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_sve-cpu2017fast--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_sve-cpu2017fast-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017fast
+
+    target:
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_sve-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_sve-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_sve-cpu2017fast'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_sve-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_sve-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 0116ecd201945277a511f44cb2a1de94
diff --git a/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml b/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml
new file mode 100644
index 0000000000..3d216fc6c1
--- /dev/null
+++ b/tcwg_bmk-code_vect-cpu2017fast--gnu.yaml
@@ -0,0 +1,967 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_vect-cpu2017fast-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017fast
+
+    target:
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_vect-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_vect-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_vect-cpu2017fast'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017fast--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 2e659bcd43a905257e0c757605a61bc2
diff --git a/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml b/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml
new file mode 100644
index 0000000000..94ebb4d968
--- /dev/null
+++ b/tcwg_bmk-code_vect-cpu2017fast--llvm.yaml
@@ -0,0 +1,939 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_vect-cpu2017fast-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017fast
+
+    target:
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_vect-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_vect-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_vect-cpu2017fast'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017fast--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 9ee4444b3fb7d500c1df8884c69900ff
diff --git a/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml b/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml
new file mode 100644
index 0000000000..0e7145ad8d
--- /dev/null
+++ b/tcwg_bmk-code_vect-cpu2017rate--gnu.yaml
@@ -0,0 +1,967 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_vect-cpu2017rate-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - arm
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_vect-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_vect-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_vect-cpu2017rate'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 5a041a010a86540ad8fac1143cc4e6ba
diff --git a/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml b/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml
new file mode 100644
index 0000000000..56540f723d
--- /dev/null
+++ b/tcwg_bmk-code_vect-cpu2017rate--llvm.yaml
@@ -0,0 +1,939 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_vect-cpu2017rate-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - arm:
+          docker_arch: armhf
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_vect-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_vect-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_vect-cpu2017rate'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_vect-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 04b121460ef516f55e4fd5ed0798c3da
diff --git a/tcwg_bmk-code_vect-spec2k6--gnu.yaml b/tcwg_bmk-code_vect-spec2k6--gnu.yaml
new file mode 100644
index 0000000000..267a68e4aa
--- /dev/null
+++ b/tcwg_bmk-code_vect-spec2k6--gnu.yaml
@@ -0,0 +1,968 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_vect-spec2k6--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_vect-spec2k6-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - spec2k6
+
+    target:
+      - arm
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_vect-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_vect-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_vect-spec2k6'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_vect-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_vect-spec2k6--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 42e4210bf237e683d1190541c853c2a0
diff --git a/tcwg_bmk-code_vect-spec2k6--llvm.yaml b/tcwg_bmk-code_vect-spec2k6--llvm.yaml
new file mode 100644
index 0000000000..116eeeaf62
--- /dev/null
+++ b/tcwg_bmk-code_vect-spec2k6--llvm.yaml
@@ -0,0 +1,941 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-code_vect-spec2k6--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-code_vect-spec2k6-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - spec2k6
+
+    target:
+      - arm:
+          docker_arch: armhf
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+      - O3_LTO
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-code_vect-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-code_vect-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-code_vect-spec2k6'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-code_vect-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-code_vect-spec2k6--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: bae6aefe54131b01e8044382fa2a7c39
diff --git a/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml b/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml
new file mode 100644
index 0000000000..0be9ae23eb
--- /dev/null
+++ b/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.yaml
@@ -0,0 +1,967 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-fujitsu_speed-cpu2017speed-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017speed
+
+    target:
+      - aarch64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O3
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-fujitsu_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-fujitsu_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-fujitsu_speed-cpu2017speed'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-fujitsu_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 1200
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-fujitsu_speed-cpu2017speed--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: 4e84cd643d677793010c42e57deb21a2
diff --git a/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml b/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml
new file mode 100644
index 0000000000..c1682c0011
--- /dev/null
+++ b/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.yaml
@@ -0,0 +1,940 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-fujitsu_speed-cpu2017speed-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017speed
+
+    target:
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O2
+      - O3
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    # Schedule for Fujitsu and Qualcomm configurations are increased for llvm toolchain only
+    cron_schedule: 'H H * * *'
+    jobs:
+      - 'tcwg_bmk-fujitsu_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-fujitsu_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-fujitsu_speed-cpu2017speed'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-fujitsu_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 1200
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-fujitsu_speed-cpu2017speed--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 20666677984f04f5bf00217cb34d33fc
diff --git a/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml b/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml
new file mode 100644
index 0000000000..19fba77987
--- /dev/null
+++ b/tcwg_bmk-qc_speed-cpu2017rate--gnu.yaml
@@ -0,0 +1,974 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-qc_speed-cpu2017rate-gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+
+    toolchain_name: gnu
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+
+    jobs:
+      - 'tcwg_bmk-gnu-master'
+
+
+- job-group:
+    name: tcwg_bmk-gnu-master
+    toolchain_ver: master
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_bmk-qc_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-qc_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-qc_speed-cpu2017rate'
+    ci_config: 'gnu-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--gnu-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-qc_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-qc_speed-cpu2017rate--gnu-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-x86_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: d0aa5e98e9da2e0142c0d260fc3fc4e1
diff --git a/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml b/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml
new file mode 100644
index 0000000000..7c106aae37
--- /dev/null
+++ b/tcwg_bmk-qc_speed-cpu2017rate--llvm.yaml
@@ -0,0 +1,939 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_bmk.yaml.in and tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-qc_speed-cpu2017rate-llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+
+    toolchain_name: llvm
+
+    # BMK defined in def files
+    bmk:
+      - cpu2017rate
+
+    target:
+      - aarch64:
+          docker_arch: arm64
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+      - O3
+
+    jobs:
+      - 'tcwg_bmk-llvm-master'
+
+
+- job-group:
+    name: tcwg_bmk-llvm-master
+    toolchain_ver: master
+    llvm_branch: refs/heads/main
+    distro: default
+    # Schedule for Fujitsu and Qualcomm configurations are increased for llvm toolchain only
+    cron_schedule: 'H H * * *'
+    jobs:
+      - 'tcwg_bmk-qc_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-qc_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-qc_speed-cpu2017rate'
+    ci_config: 'llvm-{target}-{toolchain_ver}-{cflags}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+- scm:
+    name: bmk-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/bmk-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $bmk_branch
+          basedir: bmk-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/bmk-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: bmk_branch
+          default: master
+          description: 'Benchmark scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            # We can't have same regressions between GNU and LLVM toolchains,
+            # do allow parallel bisections of those.
+            - '{ci_project}--llvm-.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - bmk-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+              echo "bmk_branch=$bmk_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 30 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --ssh_info true
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in llvm; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --ssh_info true \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --bmk_branch "$bmk_branch" \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-qc_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-qc_speed-cpu2017rate--llvm-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-build_bmk && tcwg-armv8_64
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+          docker_arch: '{docker_arch}'
+    publishers:
+        - bisect-publishers
+# checksum: 1a85162a7b4398793e9444c27e441967
diff --git a/tcwg_bmk.yaml.in b/tcwg_bmk.yaml.in
new file mode 100644
index 0000000000..fcc9bbbb3b
--- /dev/null
+++ b/tcwg_bmk.yaml.in
@@ -0,0 +1,230 @@
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bmk-#{PROFILE_NAME}-#{BMK}-#{TOOLCHAIN}
+#if TOOLCHAIN_gnu || TOOLCHAIN_gnu_eabi
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+# if TOOLCHAIN_gnu
+    linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+    linux_branch: refs/heads/linux-rolling-stable
+    glibc_url: git://sourceware.org/git/glibc.git
+# elif TOOLCHAIN_gnu_eabi
+    newlib_url: git://sourceware.org/git/newlib-cygwin.git
+# endif
+#elif TOOLCHAIN_llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+#endif
+
+    toolchain_name: #{TOOLCHAIN}
+
+    # BMK defined in def files
+    bmk:
+#if BMK_coremark
+      - coremark
+#endif
+#if BMK_spec2k6
+      - spec2k6
+#endif
+#if BMK_cpu2017fast
+      - cpu2017fast
+#endif
+#if BMK_cpu2017speed
+      - cpu2017speed
+#endif
+#if BMK_cpu2017rate
+      - cpu2017rate
+#endif
+
+    target:
+#if TARGET_arm
+#if SET_DOCKER_ARCH_yes
+      - arm:
+          docker_arch: armhf
+#else
+      - arm
+#endif
+#endif
+#if TARGET_arm_eabi
+      - arm_eabi
+#endif
+#if TARGET_aarch64
+#if SET_DOCKER_ARCH_yes
+      - aarch64:
+          docker_arch: arm64
+#else
+      - aarch64
+#endif
+#endif
+
+
+    # PROFILE_NAME defined in def files
+    cflags:
+#if (PROFILE_NAME_code_size && ! TOOLCHAIN_llvm) || PROFILE_NAME_code_speed || PROFILE_NAME_fujitsu_speed
+      - O2
+#endif
+#if (PROFILE_NAME_code_size && ! TOOLCHAIN_llvm) || PROFILE_NAME_code_speed
+      - O2_LTO
+#endif
+#if ! PROFILE_NAME_code_size
+      - O3
+#endif
+#if ! PROFILE_NAME_code_size && ! PROFILE_NAME_fujitsu_speed && ! PROFILE_NAME_qc_speed
+      - O3_LTO
+#endif
+#if PROFILE_NAME_code_size
+      - Os
+      - Os_LTO
+# if TOOLCHAIN_llvm
+      - Oz
+      - Oz_LTO
+# endif
+#endif
+
+    jobs:
+#if BRANCH_master
+      - 'tcwg_bmk-#{TOOLCHAIN}-master'
+#endif
+
+
+#if BRANCH_master
+- job-group:
+    name: tcwg_bmk-#{TOOLCHAIN}-master
+    toolchain_ver: master
+#if TOOLCHAIN_gnu || TOOLCHAIN_gnu_eabi
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+# if TOOLCHAIN_gnu
+    glibc_branch: refs/heads/master
+# elif TOOLCHAIN_gnu_eabi
+    newlib_branch: refs/heads/master
+# endif
+#elif TOOLCHAIN_llvm
+    llvm_branch: refs/heads/main
+#endif
+    distro: default
+#if (PROFILE_NAME_fujitsu_speed || PROFILE_NAME_qc_speed) && TOOLCHAIN_llvm
+    # Schedule for Fujitsu and Qualcomm configurations are increased for llvm toolchain only
+    cron_schedule: 'H H * * *'
+#else
+    cron_schedule: 'H H H/3 * *'
+#endif
+    jobs:
+      - 'tcwg_bmk-#{PROFILE_NAME}-#{BMK}--#{TOOLCHAIN}-{target}-{toolchain_ver}-{cflags}-build'
+      - 'tcwg_bmk-#{PROFILE_NAME}-#{BMK}--#{TOOLCHAIN}-{target}-{toolchain_ver}-{cflags}-bisect'
+    ci_project: 'tcwg_bmk-#{PROFILE_NAME}-#{BMK}'
+    ci_config: '#{TOOLCHAIN}-{target}-{toolchain_ver}-{cflags}'
+#endif
+
+#include tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_bmk-#{PROFILE_NAME}-#{BMK}--#{TOOLCHAIN}-{target}-{toolchain_ver}-{cflags}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+#if PROFILE_NAME_code_speed && BMK_cpu2017speed
+    # We are waiting for tcwg-bmk-apm-* machines to get PDU control,
+    # so that we can recover from crashes.
+    # See https://linaro.atlassian.net/browse/STG-4212 .
+    disabled: true
+#else
+    disabled: false
+#endif
+#if TOOLCHAIN_gnu_eabi
+    node: tcwg-x86_64-build
+#elif TOOLCHAIN_llvm
+    node: tcwg-build_bmk && tcwg-armv8_64
+#elif TOOLCHAIN_gnu
+    node: tcwg-build_bmk && tcwg-x86_64
+#endif
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+#if TOOLCHAIN_gnu || TOOLCHAIN_gnu_eabi
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+# if TOOLCHAIN_gnu
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+# elif TOOLCHAIN_gnu_eabi
+          newlib_url: '{newlib_url}'
+          newlib_branch: '{newlib_branch}'
+# endif
+#elif TOOLCHAIN_llvm
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+#endif
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+#if PROFILE_NAME_fujitsu_speed
+          timeout: 1200
+#else
+          timeout: 600
+#endif
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+#if SET_DOCKER_ARCH_yes
+          docker_arch: '{docker_arch}'
+#endif
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_bmk-#{PROFILE_NAME}-#{BMK}--#{TOOLCHAIN}-{target}-{toolchain_ver}-{cflags}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+#if TOOLCHAIN_gnu_eabi
+    node: tcwg-x86_64-build
+#elif TOOLCHAIN_llvm
+    node: tcwg-build_bmk && tcwg-armv8_64
+#elif TOOLCHAIN_gnu
+    node: tcwg-build_bmk && tcwg-x86_64
+#endif
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_bmk_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+      - bmk-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_bmk-build.sh'
+#if SET_DOCKER_ARCH_yes
+          docker_arch: '{docker_arch}'
+#endif
+    publishers:
+        - bisect-publishers
diff --git a/tcwg_bmk/tcwg_bmk-code_size-coremark--gnu_eabi.def b/tcwg_bmk/tcwg_bmk-code_size-coremark--gnu_eabi.def
new file mode 100644
index 0000000000..ab2c1e4b2b
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-coremark--gnu_eabi.def
@@ -0,0 +1,16 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=newlib
+-v SCM=bmk_scripts
+
+-v BMK=coremark
+
+-v TOOLCHAIN=gnu_eabi
+-v BRANCH=master
+
+-v TARGET=arm_eabi
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--gnu.def b/tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--gnu.def
new file mode 100644
index 0000000000..b9111a1332
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017fast
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--llvm.def b/tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--llvm.def
new file mode 100644
index 0000000000..45793b5e07
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-cpu2017fast--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017fast
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--gnu.def b/tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--gnu.def
new file mode 100644
index 0000000000..3bc247d85d
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=arm
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--llvm.def b/tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--llvm.def
new file mode 100644
index 0000000000..f49bbe1377
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-cpu2017rate--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=arm
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_size-spec2k6--gnu.def b/tcwg_bmk/tcwg_bmk-code_size-spec2k6--gnu.def
new file mode 100644
index 0000000000..aeea06dbad
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-spec2k6--gnu.def
@@ -0,0 +1,18 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=spec2k6
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=arm
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_size-spec2k6--llvm.def b/tcwg_bmk/tcwg_bmk-code_size-spec2k6--llvm.def
new file mode 100644
index 0000000000..97e034baf6
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_size-spec2k6--llvm.def
@@ -0,0 +1,16 @@
+-v PROFILE_NAME=code_size
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=spec2k6
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=arm
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-coremark--gnu_eabi.def b/tcwg_bmk/tcwg_bmk-code_speed-coremark--gnu_eabi.def
new file mode 100644
index 0000000000..806e566edb
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-coremark--gnu_eabi.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=newlib
+-v SCM=bmk_scripts
+
+-v TOOLCHAIN=gnu_eabi
+-v BRANCH=master
+
+-v TARGET=arm_eabi
+
+-v RR=tcwg_bmk
+-v BMK=coremark
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--gnu.def b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--gnu.def
new file mode 100644
index 0000000000..ed130cd0e2
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--gnu.def
@@ -0,0 +1,18 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=arm
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--llvm.def b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--llvm.def
new file mode 100644
index 0000000000..c1d229cb58
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017rate--llvm.def
@@ -0,0 +1,16 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=arm
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--gnu.def b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--gnu.def
new file mode 100644
index 0000000000..d9eec018c4
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017speed
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--llvm.def b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--llvm.def
new file mode 100644
index 0000000000..9a640031fc
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-cpu2017speed--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017speed
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-spec2k6--gnu.def b/tcwg_bmk/tcwg_bmk-code_speed-spec2k6--gnu.def
new file mode 100644
index 0000000000..51a3e973d6
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-spec2k6--gnu.def
@@ -0,0 +1,18 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=spec2k6
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=arm
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_speed-spec2k6--llvm.def b/tcwg_bmk/tcwg_bmk-code_speed-spec2k6--llvm.def
new file mode 100644
index 0000000000..a2c72807f0
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_speed-spec2k6--llvm.def
@@ -0,0 +1,16 @@
+-v PROFILE_NAME=code_speed
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=spec2k6
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=arm
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_sve-cpu2017fast--gnu.def b/tcwg_bmk/tcwg_bmk-code_sve-cpu2017fast--gnu.def
new file mode 100644
index 0000000000..ac77f588bf
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_sve-cpu2017fast--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=code_sve
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017fast
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--gnu.def b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--gnu.def
new file mode 100644
index 0000000000..96e7a9cb0c
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=code_vect
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017fast
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--llvm.def b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--llvm.def
new file mode 100644
index 0000000000..63b40db4a8
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017fast--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=code_vect
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017fast
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--gnu.def b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--gnu.def
new file mode 100644
index 0000000000..64c314b7d6
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=code_vect
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=arm
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--llvm.def b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--llvm.def
new file mode 100644
index 0000000000..29b93166d3
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_vect-cpu2017rate--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=code_vect
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=arm
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_vect-spec2k6--gnu.def b/tcwg_bmk/tcwg_bmk-code_vect-spec2k6--gnu.def
new file mode 100644
index 0000000000..639cb39569
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_vect-spec2k6--gnu.def
@@ -0,0 +1,18 @@
+-v PROFILE_NAME=code_vect
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=spec2k6
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+-v TARGET=arm
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-code_vect-spec2k6--llvm.def b/tcwg_bmk/tcwg_bmk-code_vect-spec2k6--llvm.def
new file mode 100644
index 0000000000..ca64613d75
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-code_vect-spec2k6--llvm.def
@@ -0,0 +1,16 @@
+-v PROFILE_NAME=code_vect
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=spec2k6
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=aarch64
+-v TARGET=arm
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.def b/tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.def
new file mode 100644
index 0000000000..b0a75dbbed
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--gnu.def
@@ -0,0 +1,17 @@
+-v PROFILE_NAME=fujitsu_speed
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017speed
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SQUAD_GRP=fujitsu
diff --git a/tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.def b/tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.def
new file mode 100644
index 0000000000..33eebab32d
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-fujitsu_speed-cpu2017speed--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=fujitsu_speed
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017speed
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=fujitsu
diff --git a/tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--gnu.def b/tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--gnu.def
new file mode 100644
index 0000000000..90d4595caa
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--gnu.def
@@ -0,0 +1,18 @@
+-v PROFILE_NAME=qc_speed
+
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=gnu
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--llvm.def b/tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--llvm.def
new file mode 100644
index 0000000000..ddf83c9cfd
--- /dev/null
+++ b/tcwg_bmk/tcwg_bmk-qc_speed-cpu2017rate--llvm.def
@@ -0,0 +1,15 @@
+-v PROFILE_NAME=qc_speed
+
+-v COMPONENTS=llvm
+-v SCM=bmk_scripts
+
+-v BMK=cpu2017rate
+
+-v TOOLCHAIN=llvm
+-v BRANCH=master
+
+-v TARGET=aarch64
+
+-v RR=tcwg_bmk
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=tcwg
diff --git a/tcwg_bootstrap.yaml b/tcwg_bootstrap.yaml
new file mode 100644
index 0000000000..85318dc980
--- /dev/null
+++ b/tcwg_bootstrap.yaml
@@ -0,0 +1,1299 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_bootstrap.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_bootstrap
+    type_of_test: ""
+    timeout_build: 1000
+    # By default, run each CI loop daily.
+    cron_master: 'H H * * *'
+    docker_security: ''
+# We put tcwg_bootstrap_* jobs separately from tcwg_gcc_* jobs to avoid
+# slowing down [quick] tcwg_gcc_* when bisecting bootstrap regressions.
+# If a bootstrap job catches a regression first, it will block bisects
+# of all configurations in the same ci_project.  This would prevent
+# tcwg_gcc_* jobs from bisecting same regression much quicker.
+    ci_project:
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_lto
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_O1
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_O3
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_debug
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_profiled
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_profiled_lto
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_profiled_lto_lean
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_ubsan
+      - tcwg_bootstrap_check:
+          type_of_test: -check_bootstrap
+      - tcwg_bootstrap_check:
+          type_of_test: -check_bootstrap_lto
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    target:
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+    jobs:
+      - tcwg_bootstrap-master
+
+- job-group:
+    name: tcwg_bootstrap-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    gcc_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in gcc; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in gcc; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: 4abffee2a2ef58cedb542e9675b24848
diff --git a/tcwg_chromium--master.yaml b/tcwg_chromium--master.yaml
new file mode 100644
index 0000000000..8344abab4b
--- /dev/null
+++ b/tcwg_chromium--master.yaml
@@ -0,0 +1,868 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_chromium.yaml.in and tcwg_chromium/tcwg_chromium--master.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_chromium--master
+    chromium_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git
+    jobs:
+      - 'tcwg_chromium--master'
+
+- job-group:
+    name: tcwg_chromium--master
+    chromium_branch: master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_chromium--master-build'
+      - 'tcwg_chromium--master-bisect'
+    ci_project: 'tcwg_chromium'
+    ci_config: 'master'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - string:
+          name: 'dynamic_components_list'
+          default: '*'
+          description: "Component list to update. '*' means all components"
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              ==rr[dynamic_components_list] "$dynamic_components_list" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+
+            build_container_exec \
+              ./jenkins-scripts/update_components_revs.sh \
+              @@rr[top_artifacts] artifacts \
+              __dynamic_components_list "$dynamic_components_list"
+
+            # Might need to add adjustment of the $build_name (not critical)
+
+            # Might not need to add branch_opt : The build script doesn't need it.
+            build_name="$build_name-$dynamic_components_list"
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_chromium--master-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_chromium_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_chromium-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_chromium--master-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_chromium_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_chromium-build.sh'
+    publishers:
+        - bisect-publishers
+# checksum: ea1ed456a86c3606d39afe5df3b824e2
diff --git a/tcwg_chromium.yaml.in b/tcwg_chromium.yaml.in
new file mode 100644
index 0000000000..294a952e28
--- /dev/null
+++ b/tcwg_chromium.yaml.in
@@ -0,0 +1,83 @@
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_chromium--master
+    chromium_url: https://chromium.googlesource.com/chromium/tools/depot_tools.git
+    jobs:
+      - 'tcwg_chromium--master'
+
+- job-group:
+    name: tcwg_chromium--master
+    chromium_branch: master
+    distro: default
+    cron_schedule: 'H H H/3 * *'
+    jobs:
+      - 'tcwg_chromium--master-build'
+      - 'tcwg_chromium--master-bisect'
+    ci_project: 'tcwg_chromium'
+    ci_config: 'master'
+
+#include tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_chromium--master-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_chromium_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    triggers:
+      - pollscm:
+          cron: '{cron_schedule}'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_chromium-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_chromium--master-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}--{ci_config}'
+    workspace: workspace/tcwg_chromium_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 2880
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_chromium-build.sh'
+    publishers:
+        - bisect-publishers
diff --git a/tcwg_chromium/tcwg_chromium--master.def b/tcwg_chromium/tcwg_chromium--master.def
new file mode 100644
index 0000000000..40ddafdd82
--- /dev/null
+++ b/tcwg_chromium/tcwg_chromium--master.def
@@ -0,0 +1,2 @@
+-v RR=tcwg_chromium
+-v DYNAMIC_COMPONENT_LIST=yes
diff --git a/tcwg_gcc.yaml b/tcwg_gcc.yaml
new file mode 100644
index 0000000000..1ce4845b46
--- /dev/null
+++ b/tcwg_gcc.yaml
@@ -0,0 +1,1359 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_gcc.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_gcc
+    type_of_test: ""
+    timeout_build: 1000
+    # Trigger configuration that have precommit testing every 6 hours
+    # to test incoming patches in a timely manner.
+    cron_master: 'H H/6 * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_gcc_build
+      - tcwg_gcc_check
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    target:
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+    jobs:
+      - tcwg_gcc-master
+
+- job-group:
+    name: tcwg_gcc-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    gcc_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+          - text:
+              credential-id: TCWG_PW_TOKEN
+              variable: TCWG_PW_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+- builder:
+    name: trigger-precommit-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Trigger pre-commit builds if the jenkins queue for
+          # this job is empty.
+          #
+          # Skip triggering pre-commit builds if there are other post-commit
+          # or pre-commit builds in the queue.
+          # Re. post-commit builds -- we need to process all pending
+          # bisection-triggered builds before fetching a new batch of
+          # upstream changes.
+          # Re. pre-commit builds -- we need to wait for the previous batch
+          # to finish to avoid triggering duplicate builds for the queued
+          # patches.
+          for job_type in build precommit; do
+            url="${{JOB_URL%-build/}}-$job_type"
+            inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+              | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+            if [ "$inQueue" != "false" ]; then
+              echo "SKIPPING PRECOMMIT TRIGGER: $build_type QUEUE IS NOT EMPTY"
+              trap "" EXIT
+              exit 0
+            fi
+          done
+
+          # $update_baseline != ignore tells us that we have just
+          # updated the baseline and this means that we should be
+          # in great shape to apply pending patches.
+          # Most likely current baseline revision is master revision
+          # as of few hours ago.
+          if [ "$update_baseline" = "ignore" ]; then
+            echo "SKIPPING PRECOMMIT TRIGGER: DID NOT UPDATE BASELINE"
+            trap "" EXIT
+            exit 0
+          fi
+
+          for project in gcc; do
+            # Note that we get here only when all previous pre-commit
+            # builds have finished and, presumably, updated ci_bot
+            # bundles at patchworks instance.  If this were not
+            # the case, there would be some builds queued and
+            # we would have exited above.
+            build_container_exec \
+              ./jenkins-scripts/pw-trigger.sh \
+                --ci_bot '{ci_project}--{ci_config}' --project "$project" \
+                --out_dir artifacts/jenkins \
+                &> artifacts/jenkins/pw-trigger.log
+
+            for i in artifacts/jenkins/trigger-precommit-*; do
+              if [ -f $i ]; then
+                echo "distro=$distro" >> $i
+                echo "scripts_branch=$scripts_branch" >> $i
+              fi
+            done
+          done
+
+          trap "" EXIT
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in gcc; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-1:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in gcc; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-body.txt"}}
+          failure: false
+          success: true
+          aborted: false
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+    triggers:
+      - timed: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: 17b776797f6ce06b3c873525340ea41d
diff --git a/tcwg_gdb.yaml b/tcwg_gdb.yaml
new file mode 100644
index 0000000000..ef4e04a561
--- /dev/null
+++ b/tcwg_gdb.yaml
@@ -0,0 +1,1346 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_gdb.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_gdb
+    type_of_test: ""
+    timeout_build: 1000
+    # Trigger configuration that have precommit testing every 6 hours
+    # to test incoming patches in a timely manner.
+    cron_master: 'H H/6 * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_gdb_build
+      - tcwg_gdb_check:
+          timeout_build: 2000
+    gdb_url: git://sourceware.org/git/binutils-gdb.git
+    target:
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+    jobs:
+      - tcwg_gdb-master
+
+- job-group:
+    name: tcwg_gdb-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    gdb_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: gdb
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: gdb
+          url: '{gdb_url}'
+          branch: '{gdb_branch}'
+          reference: binutils-gdb.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+          - text:
+              credential-id: TCWG_PW_TOKEN
+              variable: TCWG_PW_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+- builder:
+    name: trigger-precommit-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Trigger pre-commit builds if the jenkins queue for
+          # this job is empty.
+          #
+          # Skip triggering pre-commit builds if there are other post-commit
+          # or pre-commit builds in the queue.
+          # Re. post-commit builds -- we need to process all pending
+          # bisection-triggered builds before fetching a new batch of
+          # upstream changes.
+          # Re. pre-commit builds -- we need to wait for the previous batch
+          # to finish to avoid triggering duplicate builds for the queued
+          # patches.
+          for job_type in build precommit; do
+            url="${{JOB_URL%-build/}}-$job_type"
+            inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+              | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+            if [ "$inQueue" != "false" ]; then
+              echo "SKIPPING PRECOMMIT TRIGGER: $build_type QUEUE IS NOT EMPTY"
+              trap "" EXIT
+              exit 0
+            fi
+          done
+
+          # $update_baseline != ignore tells us that we have just
+          # updated the baseline and this means that we should be
+          # in great shape to apply pending patches.
+          # Most likely current baseline revision is master revision
+          # as of few hours ago.
+          if [ "$update_baseline" = "ignore" ]; then
+            echo "SKIPPING PRECOMMIT TRIGGER: DID NOT UPDATE BASELINE"
+            trap "" EXIT
+            exit 0
+          fi
+
+          for project in gdb; do
+            # Note that we get here only when all previous pre-commit
+            # builds have finished and, presumably, updated ci_bot
+            # bundles at patchworks instance.  If this were not
+            # the case, there would be some builds queued and
+            # we would have exited above.
+            build_container_exec \
+              ./jenkins-scripts/pw-trigger.sh \
+                --ci_bot '{ci_project}--{ci_config}' --project "$project" \
+                --out_dir artifacts/jenkins \
+                &> artifacts/jenkins/pw-trigger.log
+
+            for i in artifacts/jenkins/trigger-precommit-*; do
+              if [ -f $i ]; then
+                echo "distro=$distro" >> $i
+                echo "scripts_branch=$scripts_branch" >> $i
+              fi
+            done
+          done
+
+          trap "" EXIT
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in gdb; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-1:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in gdb; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          gdb_url: '{gdb_url}'
+          gdb_branch: '{gdb_branch}'
+    triggers:
+      - timed: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: 3b80934da6225a79833bed7335eaa3aa
diff --git a/tcwg_glibc.yaml b/tcwg_glibc.yaml
new file mode 100644
index 0000000000..639f8504cf
--- /dev/null
+++ b/tcwg_glibc.yaml
@@ -0,0 +1,1353 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_glibc.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_glibc
+    type_of_test: ""
+    timeout_build: 1000
+    # Trigger configuration that have precommit testing every 6 hours
+    # to test incoming patches in a timely manner.
+    cron_master: 'H H/6 * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_glibc_build
+      - tcwg_glibc_check:
+          # The SYS_ADMIN is required to allow the glibc container tests use mount, chroot, and ptrace syscalls.
+          # Also, docker default apprmor filter disables the mount sycall, so disable it as well.
+          # See https://linaro.atlassian.net/browse/GNU-836 for more details.
+          docker_security: '--cap-add=SYS_ADMIN --security-opt apparmor=unconfined'
+    glibc_url: git://sourceware.org/git/glibc.git
+    target:
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+    jobs:
+      - tcwg_glibc-master
+
+- job-group:
+    name: tcwg_glibc-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    glibc_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+          - text:
+              credential-id: TCWG_PW_TOKEN
+              variable: TCWG_PW_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+- builder:
+    name: trigger-precommit-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Trigger pre-commit builds if the jenkins queue for
+          # this job is empty.
+          #
+          # Skip triggering pre-commit builds if there are other post-commit
+          # or pre-commit builds in the queue.
+          # Re. post-commit builds -- we need to process all pending
+          # bisection-triggered builds before fetching a new batch of
+          # upstream changes.
+          # Re. pre-commit builds -- we need to wait for the previous batch
+          # to finish to avoid triggering duplicate builds for the queued
+          # patches.
+          for job_type in build precommit; do
+            url="${{JOB_URL%-build/}}-$job_type"
+            inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+              | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+            if [ "$inQueue" != "false" ]; then
+              echo "SKIPPING PRECOMMIT TRIGGER: $build_type QUEUE IS NOT EMPTY"
+              trap "" EXIT
+              exit 0
+            fi
+          done
+
+          # $update_baseline != ignore tells us that we have just
+          # updated the baseline and this means that we should be
+          # in great shape to apply pending patches.
+          # Most likely current baseline revision is master revision
+          # as of few hours ago.
+          if [ "$update_baseline" = "ignore" ]; then
+            echo "SKIPPING PRECOMMIT TRIGGER: DID NOT UPDATE BASELINE"
+            trap "" EXIT
+            exit 0
+          fi
+
+          for project in glibc; do
+            # Note that we get here only when all previous pre-commit
+            # builds have finished and, presumably, updated ci_bot
+            # bundles at patchworks instance.  If this were not
+            # the case, there would be some builds queued and
+            # we would have exited above.
+            build_container_exec \
+              ./jenkins-scripts/pw-trigger.sh \
+                --ci_bot '{ci_project}--{ci_config}' --project "$project" \
+                --out_dir artifacts/jenkins \
+                &> artifacts/jenkins/pw-trigger.log
+
+            for i in artifacts/jenkins/trigger-precommit-*; do
+              if [ -f $i ]; then
+                echo "distro=$distro" >> $i
+                echo "scripts_branch=$scripts_branch" >> $i
+              fi
+            done
+          done
+
+          trap "" EXIT
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --security '{docker_security}'
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in glibc; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+                docker_security: '{docker_security}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-1:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in glibc; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+                docker_security: '{docker_security}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              --security '{docker_security}' \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+    triggers:
+      - timed: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: fa2d6053055f6f56a6826a9f86776204
diff --git a/tcwg_gnu.yaml.in b/tcwg_gnu.yaml.in
new file mode 100644
index 0000000000..b5b39d9078
--- /dev/null
+++ b/tcwg_gnu.yaml.in
@@ -0,0 +1,346 @@
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: #{RR}
+    type_of_test: ""
+    timeout_build: 1000
+#if PRECOMMIT_TRIGGER_yes
+    # Trigger configuration that have precommit testing every 6 hours
+    # to test incoming patches in a timely manner.
+    cron_master: 'H H/6 * * *'
+#elif RR_tcwg_gnu_embed
+    # We have 9 ci_configs for tcwg_gnu_embed_* projects, so trigger these
+    # once in 3 days.
+    cron_master: 'H H H/3 * *'
+#else
+    # By default, run each CI loop daily.
+    cron_master: 'H H * * *'
+#endif
+    docker_security: ''
+#if RR_tcwg_gcc
+    ci_project:
+      - tcwg_gcc_build
+      - tcwg_gcc_check
+#elif RR_tcwg_bootstrap
+# We put tcwg_bootstrap_* jobs separately from tcwg_gcc_* jobs to avoid
+# slowing down [quick] tcwg_gcc_* when bisecting bootstrap regressions.
+# If a bootstrap job catches a regression first, it will block bisects
+# of all configurations in the same ci_project.  This would prevent
+# tcwg_gcc_* jobs from bisecting same regression much quicker.
+    ci_project:
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_lto
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_O1
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_O3
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_debug
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_profiled
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_profiled_lto
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_profiled_lto_lean
+      - tcwg_bootstrap_build:
+          type_of_test: -bootstrap_ubsan
+      - tcwg_bootstrap_check:
+          type_of_test: -check_bootstrap
+      - tcwg_bootstrap_check:
+          type_of_test: -check_bootstrap_lto
+#elif RR_tcwg_binutils
+    ci_project:
+      - tcwg_binutils_build
+      - tcwg_binutils_check
+#elif RR_tcwg_glibc
+    ci_project:
+      - tcwg_glibc_build
+      - tcwg_glibc_check:
+          # The SYS_ADMIN is required to allow the glibc container tests use mount, chroot, and ptrace syscalls.
+          # Also, docker default apprmor filter disables the mount sycall, so disable it as well.
+          # See https://linaro.atlassian.net/browse/GNU-836 for more details.
+          docker_security: '--cap-add=SYS_ADMIN --security-opt apparmor=unconfined'
+#elif RR_tcwg_gdb
+    ci_project:
+      - tcwg_gdb_build
+      - tcwg_gdb_check:
+          timeout_build: 2000
+#elif RR_tcwg_gnu_cross
+    ci_project:
+      - tcwg_gnu_cross_build
+      - tcwg_gnu_cross_check_binutils
+      - tcwg_gnu_cross_check_gcc
+#elif RR_tcwg_gnu_embed
+    ci_project:
+      - tcwg_gnu_embed_build
+      - tcwg_gnu_embed_check_binutils
+      - tcwg_gnu_embed_check_gcc
+#elif RR_tcwg_gnu_mingw
+    ci_project:
+      - tcwg_gnu_mingw_build
+      - tcwg_gnu_mingw_check_binutils
+      - tcwg_gnu_mingw_check_gcc
+#elif RR_tcwg_gnu_native
+    ci_project:
+      - tcwg_gnu_native_build
+      - tcwg_gnu_native_check_binutils
+      - tcwg_gnu_native_check_gcc
+      - tcwg_gnu_native_check_glibc:
+          # See tcwg_glibc_check above.
+          docker_security: '--cap-add=SYS_ADMIN --security-opt apparmor=unconfined'
+      - tcwg_gnu_native_check_gdb:
+          timeout_build: 2000
+      - tcwg_gnu_native_fast_check_gcc
+      - tcwg_gnu_native_fast_check_gdb
+#endif
+#if COMPONENTS_binutils
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+#endif
+#if COMPONENTS_gcc
+# if RR_tcwg_gnu_mingw
+    gcc_url: https://github.com/Windows-on-ARM-Experiments/gcc-woarm64.git
+# else
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+# endif
+#endif
+#if COMPONENTS_glibc
+    glibc_url: git://sourceware.org/git/glibc.git
+#endif
+#if COMPONENTS_gdb
+    gdb_url: git://sourceware.org/git/binutils-gdb.git
+#endif
+#if COMPONENTS_mingw
+    mingw_url: https://git.code.sf.net/p/mingw-w64/mingw-w64.git
+#endif
+#if COMPONENTS_newlib
+    newlib_url: git://sourceware.org/git/newlib-cygwin.git
+#endif
+#if COMPONENTS_qemu
+    qemu_url: https://gitlab.com/qemu-project/qemu.git
+#endif
+    target:
+#if RR_tcwg_gnu_cross || RR_tcwg_gnu_embed
+# if RR_tcwg_gnu_cross
+      - aarch64
+      - arm
+# elif RR_tcwg_gnu_embed
+      - arm_eabi
+      - arm_v7a_softfp_eabi
+      - thumb_v8a_hard_eabi
+      - thumb_m0_eabi
+      - thumb_m0_soft_eabi
+      - thumb_m3_eabi
+      - thumb_m3_softfp_eabi
+      - thumb_m7_eabi
+      - thumb_m7_hard_eabi
+      - thumb_m23_eabi
+      - thumb_m23_soft_eabi
+      - thumb_m33_eabi
+      - thumb_m33_hard_eabi
+      - thumb_m55_hard_eabi
+# endif
+    node: tcwg-build && tcwg-x86_64
+#elif RR_tcwg_gnu_mingw
+      - woa64:
+          node: tcwg-wsl
+#else
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+#endif
+    jobs:
+      - #{RR}-master
+
+- job-group:
+    name: #{RR}-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+#if COMPONENTS_binutils
+    binutils_branch: refs/heads/master
+#endif
+#if COMPONENTS_gcc
+# if RR_tcwg_gnu_mingw
+    gcc_branch: refs/heads/aarch64-mingw32-baseline
+# else
+    gcc_branch: refs/heads/master
+# endif
+#endif
+#if COMPONENTS_linux
+    linux_url: https://git.linaro.org/kernel-org/linux.git
+    linux_branch: refs/heads/master
+#endif
+#if COMPONENTS_glibc
+    glibc_branch: refs/heads/master
+#endif
+#if COMPONENTS_gdb
+    gdb_branch: refs/heads/master
+#endif
+#if COMPONENTS_mingw
+    mingw_branch: refs/heads/master
+#endif
+#if COMPONENTS_newlib
+    newlib_branch: refs/heads/master
+#endif
+#if COMPONENTS_qemu
+    qemu_branch: refs/heads/master
+#endif
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+#if PRECOMMIT_ENABLE_yes
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+#endif
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#include tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+#if COMPONENTS_binutils
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+#endif
+#if COMPONENTS_gcc
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+#endif
+#if COMPONENTS_linux
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+#endif
+#if COMPONENTS_glibc
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+#endif
+#if COMPONENTS_gdb
+          gdb_url: '{gdb_url}'
+          gdb_branch: '{gdb_branch}'
+#endif
+#if COMPONENTS_mingw
+          mingw_url: '{mingw_url}'
+          mingw_branch: '{mingw_branch}'
+#endif
+#if COMPONENTS_newlib
+          newlib_url: '{newlib_url}'
+          newlib_branch: '{newlib_branch}'
+#endif
+#if COMPONENTS_qemu
+          qemu_url: '{qemu_url}'
+          qemu_branch: '{qemu_branch}'
+#endif
+    triggers:
+#if PRECOMMIT_TRIGGER_yes
+      - timed: '{cron}'
+#else
+      - pollscm:
+          cron: '{cron}'
+#endif
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+#if RR_tcwg_gnu_native || RR_tcwg_gcc || RR_tcwg_bootstrap || RR_tcwg_binutils || RR_tcwg_glibc || RR_tcwg_gdb
+          docker_arch: '{docker_arch}'
+#endif
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+#if PRECOMMIT_ENABLE_yes
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+#if RR_tcwg_gnu_native || RR_tcwg_gcc || RR_tcwg_bootstrap || RR_tcwg_binutils || RR_tcwg_glibc || RR_tcwg_gdb
+          docker_arch: '{docker_arch}'
+#endif
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+#endif
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+#if RR_tcwg_gnu_native || RR_tcwg_gcc || RR_tcwg_bootstrap || RR_tcwg_binutils || RR_tcwg_glibc || RR_tcwg_gdb
+          docker_arch: '{docker_arch}'
+#endif
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
diff --git a/tcwg_gnu/tcwg_binutils.def b/tcwg_gnu/tcwg_binutils.def
new file mode 100644
index 0000000000..0c3764cbaa
--- /dev/null
+++ b/tcwg_gnu/tcwg_binutils.def
@@ -0,0 +1,6 @@
+-v COMPONENTS=binutils
+-v PRECOMMIT_ENABLE=yes
+-v PRECOMMIT_TRIGGER=yes
+-v RR=tcwg_binutils
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=
diff --git a/tcwg_gnu/tcwg_bootstrap.def b/tcwg_gnu/tcwg_bootstrap.def
new file mode 100644
index 0000000000..30143ed3e1
--- /dev/null
+++ b/tcwg_gnu/tcwg_bootstrap.def
@@ -0,0 +1,5 @@
+-v COMPONENTS=gcc
+-v PRECOMMIT_ENABLE=yes
+-v RR=tcwg_bootstrap
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=
diff --git a/tcwg_gnu/tcwg_gcc.def b/tcwg_gnu/tcwg_gcc.def
new file mode 100644
index 0000000000..b23963795e
--- /dev/null
+++ b/tcwg_gnu/tcwg_gcc.def
@@ -0,0 +1,7 @@
+-v COMPONENTS=gcc
+-v PRECOMMIT_ENABLE=yes
+-v PRECOMMIT_TRIGGER=yes
+-v RR=tcwg_gcc
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=
+-v PUBLISH_EMAIL_RESULTS=yes
\ No newline at end of file
diff --git a/tcwg_gnu/tcwg_gdb.def b/tcwg_gnu/tcwg_gdb.def
new file mode 100644
index 0000000000..665bdbba1a
--- /dev/null
+++ b/tcwg_gnu/tcwg_gdb.def
@@ -0,0 +1,6 @@
+-v COMPONENTS=gdb
+-v PRECOMMIT_ENABLE=yes
+-v PRECOMMIT_TRIGGER=yes
+-v RR=tcwg_gdb
+-v SET_DOCKER_ARCH=yes
+-v SQUAD_GRP=
diff --git a/tcwg_gnu/tcwg_glibc.def b/tcwg_gnu/tcwg_glibc.def
new file mode 100644
index 0000000000..752d98f018
--- /dev/null
+++ b/tcwg_gnu/tcwg_glibc.def
@@ -0,0 +1,7 @@
+-v COMPONENTS=glibc
+-v PRECOMMIT_ENABLE=yes
+-v PRECOMMIT_TRIGGER=yes
+-v RR=tcwg_glibc
+-v SET_DOCKER_ARCH=yes
+-v SET_DOCKER_SECURITY=yes
+-v SQUAD_GRP=
diff --git a/tcwg_gnu/tcwg_gnu_cross.def b/tcwg_gnu/tcwg_gnu_cross.def
new file mode 100644
index 0000000000..79fc64a4aa
--- /dev/null
+++ b/tcwg_gnu/tcwg_gnu_cross.def
@@ -0,0 +1,10 @@
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=gdb
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v COMPONENTS=qemu
+-v PRECOMMIT_ENABLE=yes
+-v RR=tcwg_gnu_cross
+-v SQUAD_GRP=
+-v PUBLISH_EMAIL_RESULTS=yes
diff --git a/tcwg_gnu/tcwg_gnu_embed.def b/tcwg_gnu/tcwg_gnu_embed.def
new file mode 100644
index 0000000000..feb52e334b
--- /dev/null
+++ b/tcwg_gnu/tcwg_gnu_embed.def
@@ -0,0 +1,9 @@
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=gdb
+-v COMPONENTS=newlib
+-v COMPONENTS=qemu
+-v PRECOMMIT_ENABLE=yes
+-v RR=tcwg_gnu_embed
+-v SQUAD_GRP=
+-v PUBLISH_EMAIL_RESULTS=yes
diff --git a/tcwg_gnu/tcwg_gnu_mingw.def b/tcwg_gnu/tcwg_gnu_mingw.def
new file mode 100644
index 0000000000..1a62876c9f
--- /dev/null
+++ b/tcwg_gnu/tcwg_gnu_mingw.def
@@ -0,0 +1,6 @@
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=mingw
+-v PRECOMMIT_ENABLE=yes
+-v RR=tcwg_gnu_mingw
+-v SQUAD_GRP=
diff --git a/tcwg_gnu/tcwg_gnu_native.def b/tcwg_gnu/tcwg_gnu_native.def
new file mode 100644
index 0000000000..df63f65823
--- /dev/null
+++ b/tcwg_gnu/tcwg_gnu_native.def
@@ -0,0 +1,11 @@
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=gdb
+-v COMPONENTS=glibc
+-v COMPONENTS=linux
+-v PRECOMMIT_ENABLE=yes
+-v RR=tcwg_gnu_native
+-v SET_DOCKER_ARCH=yes
+-v SET_DOCKER_SECURITY=yes
+-v SQUAD_GRP=
+-v PUBLISH_EMAIL_RESULTS=yes
\ No newline at end of file
diff --git a/tcwg_gnu_cross.yaml b/tcwg_gnu_cross.yaml
new file mode 100644
index 0000000000..1b471bf1e5
--- /dev/null
+++ b/tcwg_gnu_cross.yaml
@@ -0,0 +1,1337 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_gnu_cross.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_gnu_cross
+    type_of_test: ""
+    timeout_build: 1000
+    # By default, run each CI loop daily.
+    cron_master: 'H H * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_gnu_cross_build
+      - tcwg_gnu_cross_check_binutils
+      - tcwg_gnu_cross_check_gcc
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    glibc_url: git://sourceware.org/git/glibc.git
+    gdb_url: git://sourceware.org/git/binutils-gdb.git
+    qemu_url: https://gitlab.com/qemu-project/qemu.git
+    target:
+      - aarch64
+      - arm
+    node: tcwg-build && tcwg-x86_64
+    jobs:
+      - tcwg_gnu_cross-master
+
+- job-group:
+    name: tcwg_gnu_cross-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    linux_url: https://git.linaro.org/kernel-org/linux.git
+    linux_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    gdb_branch: refs/heads/master
+    qemu_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gdb
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+      - component-parameters:
+          component: qemu
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: gdb
+          url: '{gdb_url}'
+          branch: '{gdb_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - component-scm:
+          component: qemu
+          url: '{qemu_url}'
+          branch: '{qemu_branch}'
+          reference: qemu.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc gdb glibc linux qemu; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in binutils gcc gdb glibc linux qemu; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-body.txt"}}
+          failure: false
+          success: true
+          aborted: false
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+          gdb_url: '{gdb_url}'
+          gdb_branch: '{gdb_branch}'
+          qemu_url: '{qemu_url}'
+          qemu_branch: '{qemu_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: d14385df4c3c263979bd9dcb76911112
diff --git a/tcwg_gnu_embed.yaml b/tcwg_gnu_embed.yaml
new file mode 100644
index 0000000000..10c6a0af4b
--- /dev/null
+++ b/tcwg_gnu_embed.yaml
@@ -0,0 +1,1338 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_gnu_embed.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_gnu_embed
+    type_of_test: ""
+    timeout_build: 1000
+    # We have 9 ci_configs for tcwg_gnu_embed_* projects, so trigger these
+    # once in 3 days.
+    cron_master: 'H H H/3 * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_gnu_embed_build
+      - tcwg_gnu_embed_check_binutils
+      - tcwg_gnu_embed_check_gcc
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    gdb_url: git://sourceware.org/git/binutils-gdb.git
+    newlib_url: git://sourceware.org/git/newlib-cygwin.git
+    qemu_url: https://gitlab.com/qemu-project/qemu.git
+    target:
+      - arm_eabi
+      - arm_v7a_softfp_eabi
+      - thumb_v8a_hard_eabi
+      - thumb_m0_eabi
+      - thumb_m0_soft_eabi
+      - thumb_m3_eabi
+      - thumb_m3_softfp_eabi
+      - thumb_m7_eabi
+      - thumb_m7_hard_eabi
+      - thumb_m23_eabi
+      - thumb_m23_soft_eabi
+      - thumb_m33_eabi
+      - thumb_m33_hard_eabi
+      - thumb_m55_hard_eabi
+    node: tcwg-build && tcwg-x86_64
+    jobs:
+      - tcwg_gnu_embed-master
+
+- job-group:
+    name: tcwg_gnu_embed-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    gdb_branch: refs/heads/master
+    newlib_branch: refs/heads/master
+    qemu_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gdb
+          default_git: '{default_git}'
+      - component-parameters:
+          component: newlib
+          default_git: '{default_git}'
+      - component-parameters:
+          component: qemu
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: gdb
+          url: '{gdb_url}'
+          branch: '{gdb_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: newlib
+          url: '{newlib_url}'
+          branch: '{newlib_branch}'
+          reference: newlib.git
+      - component-scm:
+          component: qemu
+          url: '{qemu_url}'
+          branch: '{qemu_branch}'
+          reference: qemu.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc gdb newlib qemu; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in binutils gcc gdb newlib qemu; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-body.txt"}}
+          failure: false
+          success: true
+          aborted: false
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          gdb_url: '{gdb_url}'
+          gdb_branch: '{gdb_branch}'
+          newlib_url: '{newlib_url}'
+          newlib_branch: '{newlib_branch}'
+          qemu_url: '{qemu_url}'
+          qemu_branch: '{qemu_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: bb8daaecf839b3e291a1d62662c380a6
diff --git a/tcwg_gnu_mingw.yaml b/tcwg_gnu_mingw.yaml
new file mode 100644
index 0000000000..02123e6834
--- /dev/null
+++ b/tcwg_gnu_mingw.yaml
@@ -0,0 +1,1286 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_gnu_mingw.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_gnu_mingw
+    type_of_test: ""
+    timeout_build: 1000
+    # By default, run each CI loop daily.
+    cron_master: 'H H * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_gnu_mingw_build
+      - tcwg_gnu_mingw_check_binutils
+      - tcwg_gnu_mingw_check_gcc
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/Windows-on-ARM-Experiments/gcc-woarm64.git
+    mingw_url: https://git.code.sf.net/p/mingw-w64/mingw-w64.git
+    target:
+      - woa64:
+          node: tcwg-wsl
+    jobs:
+      - tcwg_gnu_mingw-master
+
+- job-group:
+    name: tcwg_gnu_mingw-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/aarch64-mingw32-baseline
+    mingw_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: mingw
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: mingw
+          url: '{mingw_url}'
+          branch: '{mingw_branch}'
+          reference: mingw-w64.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc mingw; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in binutils gcc mingw; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          mingw_url: '{mingw_url}'
+          mingw_branch: '{mingw_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: e07bb9927f285663c7b34a2ec4fde54c
diff --git a/tcwg_gnu_native.yaml b/tcwg_gnu_native.yaml
new file mode 100644
index 0000000000..14bdd7ee8f
--- /dev/null
+++ b/tcwg_gnu_native.yaml
@@ -0,0 +1,1348 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_gnu.yaml.in and tcwg_gnu/tcwg_gnu_native.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_gnu_native
+    type_of_test: ""
+    timeout_build: 1000
+    # By default, run each CI loop daily.
+    cron_master: 'H H * * *'
+    docker_security: ''
+    ci_project:
+      - tcwg_gnu_native_build
+      - tcwg_gnu_native_check_binutils
+      - tcwg_gnu_native_check_gcc
+      - tcwg_gnu_native_check_glibc:
+          # See tcwg_glibc_check above.
+          docker_security: '--cap-add=SYS_ADMIN --security-opt apparmor=unconfined'
+      - tcwg_gnu_native_check_gdb:
+          timeout_build: 2000
+      - tcwg_gnu_native_fast_check_gcc
+      - tcwg_gnu_native_fast_check_gdb
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    glibc_url: git://sourceware.org/git/glibc.git
+    gdb_url: git://sourceware.org/git/binutils-gdb.git
+    target:
+      - aarch64:
+          node: tcwg-build && tcwg-armv8_64
+          docker_arch: arm64
+      - arm:
+          node: tcwg-build && tcwg-armv8_32
+          docker_arch: armhf
+    jobs:
+      - tcwg_gnu_native-master
+
+- job-group:
+    name: tcwg_gnu_native-master
+    toolchain_ver: master
+    cron: '{cron_master}'
+    binutils_branch: refs/heads/master
+    gcc_branch: refs/heads/master
+    linux_url: https://git.linaro.org/kernel-org/linux.git
+    linux_branch: refs/heads/master
+    glibc_branch: refs/heads/master
+    gdb_branch: refs/heads/master
+    distro: default
+    jobs:
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+      - '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    ci_config: '{toolchain_ver}-{target}{type_of_test}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gdb
+          default_git: '{default_git}'
+      - component-parameters:
+          component: glibc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+# Precommit parameters ...
+# - allow only "ignore" value for update_baseline parameter;
+# - allow string (which should be an email) for notify parameter.
+- parameter:
+    name: precommit-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - string:
+          name: notify
+          default: 'precommit'
+          description: "Email to send failure notifications to"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+- property:
+    name: precommit-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-build'
+          queue-scanning: 'BUILDABLE'
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: gdb
+          url: '{gdb_url}'
+          branch: '{gdb_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: glibc
+          url: '{glibc_url}'
+          branch: '{glibc_branch}'
+          reference: glibc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+#            - 'tcwg-build-20220725'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+# We place trigger-precommit-builds-2 outside of PRECOMMIT_TRIGGER_yes
+# #ifdef to get an upstream/downstream links between build/precommit jobs
+# in jenkins UI.
+- builder:
+    name: trigger-precommit-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-precommit'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/jenkins/trigger-precommit-*
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build precommit; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+              --arch {docker_arch}
+              --node $NODE_NAME
+              --security '{docker_security}'
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc gdb glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+                docker_security: '{docker_security}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-precommit-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- builder:
+    name: run-precommit-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            ./jenkins-scripts/start-container-docker.sh --prefix precommit_ \
+              --task precommit --secondary true "${{docker_opts[@]}}" \
+              > precommit_container.sh
+            source precommit_container.sh
+
+            precommit_container_rsync -az --del \
+              jenkins-scripts/ :jenkins-scripts/
+
+            branch_opt=()
+            for c in binutils gcc gdb glibc linux; do
+              eval "g=\$$$${{c}}_git"
+              case "$g" in
+                "pw://"*|"ssh://"*)
+                  # Handle pre-commit testing
+                  case "$g" in
+                    "pw://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/pw-apply.sh \
+                      --ci_bot '{ci_project}--{ci_config}' \
+                      --project "$c" --pw_url "$g" __pw_token "$TCWG_PW_TOKEN" \
+                      --build_url "$BUILD_URL" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/pw-apply.log &
+                      ;;
+                    "ssh://"*)
+                      build_container_exec \
+                      ./jenkins-scripts/precommit-ssh-apply.sh \
+                      --project "$c" --pw_url "$g" \
+                      --build_url "$BUILD_URL" \
+                      --patch_submitter "$notify" \
+                      --pw_dir artifacts/jenkins/pw \
+                      &> artifacts/jenkins/precommit-ssh-apply.log &
+                      ;;
+                  esac
+                  res=0 && wait $! || res=$?
+
+                  if [ "$res" != "0" ]; then
+                    build_name="$build_name-$g-$c-apply-fail"
+                    echo "$build_name" > artifacts/jenkins/build-name
+
+                    # Notify developer of failure to apply.
+                    for f in mail-body.txt mail-subject.txt \
+                      mail-recipients.txt; do
+                      # copy the file if exists, and not emtpy.
+                      # this is important for mail-recipient.txt, which may
+                      # be empty.
+                      if [ -s artifacts/jenkins/pw/$f ]; then
+                        cp artifacts/jenkins/pw/$f artifacts/jenkins/$f
+                      fi
+                    done
+
+                    case "$g" in
+                      "ssh://"*)
+                        # Build was triggered manually, so failure-to-apply
+                        # is a real failure.
+                        exit 1
+                        ;;
+                    esac
+
+                    # Skip the build
+                    exit 125
+                  fi
+
+                  patch_id=$(declare -A pw
+                             source "artifacts/jenkins/pw/$c"
+                             echo "${{pw[${{c}}_patch_id]}}")
+                  build_name="$build_name-$g/$patch_id"
+                  g=HEAD
+                  precommit_container_rsync -az --del \
+                    "$c/" ":$c/"
+                ;;
+              esac
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            # Now that artifacts/ include all necessary data (including
+            # artifacts/jenkins/pw/ directory -- rsync them into precommit
+            # container.
+            precommit_container_rsync -az --del \
+              artifacts/ :artifacts/
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            source precommit_container.sh
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            precommit_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            precommit_container_rsync -az --del \
+              :artifacts/ artifacts/artifacts.precommit/
+            find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+              -print0 | xargs -0 -P0 -i@ xz -T0 @
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                pw_result=pass
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                pw_result=fail
+                ;;
+              *)
+                res=125
+                pw_result=ignore
+                ;;
+            esac
+
+            # pw-report.sh does not use artifacts/artifacts.precommit,
+            # so it is OK to use unsafe container.
+            build_container_exec \
+              ./jenkins-scripts/pw-report.sh --pw_dir "artifacts/jenkins/pw" \
+              --check test --result "$pw_result"
+              &> artifacts/jenkins/pw-report.log &
+            if ! wait $!; then
+              res=125
+            fi
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-precommit-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          precommit_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            --pw_dir artifacts/jenkins/pw __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify failed"
+            exit 1
+          fi
+
+          precommit_container_rsync -az --del \
+            :artifacts/ artifacts/artifacts.precommit/
+          # Compress big files in artifacts.precommit/ to save disk space
+          # on ci.linaro.org.  We keep all pre-commit builds for a month,
+          # which can result in many stored builds.
+          find artifacts/artifacts.precommit -size +1M ! -name "*.xz" \
+            ! -path "artifacts/artifacts.precommit/notify/*" \
+            ! -path "artifacts/artifacts.precommit/jenkins/*" -print0 \
+            | xargs -0 -P0 -i@ xz -T0 @
+
+          for f in mail-body.txt mail-subject.txt mail-recipients.txt; do
+            # copy the file if exists, and not emtpy.
+            # this is important for mail-recipient.txt, which may be empty.
+            if [ -s artifacts/artifacts.precommit/jenkins/$f ]; then
+              cp artifacts/artifacts.precommit/jenkins/$f artifacts/jenkins/$f
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: run-precommit
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: true
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+                docker_arch: '{docker_arch}'
+                docker_security: '{docker_security}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-process-params:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-precommit-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/testresults-mail-body.txt"}}
+          failure: false
+          success: true
+          aborted: false
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              --arch {docker_arch} \
+              --node $NODE_NAME \
+              --security '{docker_security}' \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-build'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+          glibc_url: '{glibc_url}'
+          glibc_branch: '{glibc_branch}'
+          gdb_url: '{gdb_url}'
+          gdb_branch: '{gdb_branch}'
+    triggers:
+      - pollscm:
+          cron: '{cron}'
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout_build}'
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-precommit'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - precommit-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - precommit-parameters:
+          default_git: 'baseline'
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: true
+    display-name: 'TCWG Precommit {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - build-wrappers:
+          timeout: 300
+    builders:
+      - run-precommit:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - build-publishers:
+          email_on_failure: true
+          email_on_success: false
+
+- job-template:
+    name: '{ci_project}--{toolchain_ver}-{target}{type_of_test}-bisect'
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: '{node}'
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_gnu_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 6000
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_gnu-build.sh'
+          docker_arch: '{docker_arch}'
+          docker_security: '{docker_security}'
+    publishers:
+      - bisect-publishers
+# checksum: e545f47182dcab8853b91d75a62b9a53
diff --git a/tcwg_kernel--gnu.yaml b/tcwg_kernel--gnu.yaml
new file mode 100644
index 0000000000..f1818142c0
--- /dev/null
+++ b/tcwg_kernel--gnu.yaml
@@ -0,0 +1,937 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_kernel.yaml.in and tcwg_kernel/tcwg_kernel--gnu.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_kernel-gnu
+    toolchain_name: gnu
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+    qemu_url: https://gitlab.com/qemu-project/qemu.git
+    toolchain_ver:
+      - master:
+          binutils_branch: refs/heads/master
+          gcc_branch: refs/heads/master
+          qemu_branch: refs/heads/master
+          distro: default
+    target:
+      - aarch64
+      - arm
+    linux:
+      - next:
+          linux_url: https://git.linaro.org/kernel-org/linux-next.git
+          linux_branch: refs/heads/master
+      - mainline:
+          linux_url: https://git.linaro.org/kernel-org/linux.git
+          linux_branch: refs/heads/master
+      - stable:
+          linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+          linux_branch: refs/heads/linux-rolling-stable
+      - lts:
+          linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+          linux_branch: refs/heads/linux-rolling-lts
+    linux_config:
+      - defconfig
+      - allmodconfig
+      - allyesconfig
+      - allnoconfig
+    jobs:
+      - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build'
+      - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect'
+    ci_project: 'tcwg_kernel'
+    ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: gcc
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+      - component-parameters:
+          component: qemu
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: gcc
+          url: '{gcc_url}'
+          branch: '{gcc_branch}'
+          reference: gcc.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - component-scm:
+          component: qemu
+          url: '{qemu_url}'
+          branch: '{qemu_branch}'
+          reference: qemu.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils gcc linux qemu; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+          qemu_url: '{qemu_url}'
+          qemu_branch: '{qemu_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+    triggers:
+      - pollscm:
+          cron: 'H H H/4 * *'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_kernel-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 1440
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_kernel-build.sh'
+    publishers:
+      - bisect-publishers
+# checksum: 182e9e2002dd3d453caecabb2bd675e9
diff --git a/tcwg_kernel--llvm.yaml b/tcwg_kernel--llvm.yaml
new file mode 100644
index 0000000000..5197dd6044
--- /dev/null
+++ b/tcwg_kernel--llvm.yaml
@@ -0,0 +1,937 @@
+# Auto generated by ./tcwg/generate-yamlfiles.sh from tcwg_kernel.yaml.in and tcwg_kernel/tcwg_kernel--llvm.def. Do not edit.
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_kernel-llvm
+    toolchain_name: llvm
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+    llvm_url: https://github.com/llvm/llvm-project.git
+    qemu_url: https://gitlab.com/qemu-project/qemu.git
+    toolchain_ver:
+      - master:
+          binutils_branch: refs/heads/master
+          llvm_branch: refs/heads/main
+          qemu_branch: refs/heads/master
+          distro: default
+    target:
+      - aarch64
+      - arm
+    linux:
+      - next:
+          linux_url: https://git.linaro.org/kernel-org/linux-next.git
+          linux_branch: refs/heads/master
+      - mainline:
+          linux_url: https://git.linaro.org/kernel-org/linux.git
+          linux_branch: refs/heads/master
+      - stable:
+          linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+          linux_branch: refs/heads/linux-rolling-stable
+      - lts:
+          linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+          linux_branch: refs/heads/linux-rolling-lts
+    linux_config:
+      - defconfig
+      - allmodconfig
+      - allyesconfig
+      - allnoconfig
+    jobs:
+      - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build'
+      - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect'
+    ci_project: 'tcwg_kernel'
+    ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+
+#BEGIN: tcwg/round-robin.yaml.inc
+# -*- mode: Yaml -*-
+
+#BEGIN: tcwg/default.yaml.inc
+# -*- mode: Yaml -*-
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+            - job-extended-read
+          everyone-flat:
+            - job-build
+            - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+
+- scm:
+    name: jenkins-scripts
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/jenkins-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          basedir: jenkins-scripts
+          skip-tag: true
+          reference-repo: /home/tcwg-buildslave/snapshots-ref/jenkins-scripts.git
+          wipe-workspace: false
+          clean:
+            before: true
+          prune: true
+
+#END:   tcwg/default.yaml.inc
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: extra_build_params
+          default: ""
+          description: "Extra parameters to pass to the build script; can be used to override settings extracted from ci_project/ci_config"
+      - string:
+          name: distro
+          default: '{distro}'
+          description: 'Distro image to use'
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+
+- parameter:
+    name: component-parameters
+    parameters:
+      - string:
+          name: '{component}_git'
+          default: '{default_git}'
+          description: "{component} git_url#branch/sha1 to build, or 'default', 'baseline' or 'jenkins-scm', or pw://series/<id> to build with patches from patchwork ('precommit' mode, use 'pw://series/<id>/retrigger/' to force a rebuild)"
+
+- parameter:
+    name: all-component-parameters
+    parameters:
+      - component-parameters:
+          component: binutils
+          default_git: '{default_git}'
+      - component-parameters:
+          component: linux
+          default_git: '{default_git}'
+      - component-parameters:
+          component: llvm
+          default_git: '{default_git}'
+      - component-parameters:
+          component: qemu
+          default_git: '{default_git}'
+
+- parameter:
+    name: build-parameters
+    parameters:
+      - all-component-parameters:
+          default_git: '{default_git}'
+      - choice:
+          name: update_baseline
+          choices:
+            - onsuccess
+            - force
+            - init
+            - ignore
+          description: "What to do with baseline in this build"
+      - choice:
+          name: notify
+          choices:
+            - ignore
+            - onregression
+            - precommit
+          description: "Whether to notify developers about the result of this build"
+      - default-parameters:
+          distro: '{distro}'
+
+- property:
+    name: build-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          blocking-jobs:
+            - '{ci_project}--{ci_config}-bisect'
+          queue-scanning: 'ALL'
+
+
+- property:
+    name: bisect-properties
+    properties:
+      - default-properties
+      - build-blocker:
+          # Run at most 1 bisect job for all configurations.
+          # Bisect jobs can easily run for 5+ hours, and a few of them
+          # can hog the entire TCWG build farm for a long time.  Since
+          # same regression tends to appear in multiple configurations,
+          # run bisections for all configurations in-order.
+          blocking-jobs:
+            - '{ci_project}--.*-bisect'
+          queue-scanning: 'BUILDABLE'
+
+# Beware: git branch names need the 'refs/heads/' prefix while tags
+# need 'refs/tags/'.
+- scm:
+    name: component-scm
+    scm:
+        - git:
+            url: '{url}'
+            branches:
+              - '{branch}'
+            basedir: '{component}'
+            skip-tag: true
+            reference-repo: '/home/tcwg-buildslave/snapshots-ref/{reference}'
+            wipe-workspace: false
+            clean:
+              before: true
+            prune: true
+
+# SCMs must start with jenkins-scripts and then be ordered alphabetically.
+# Same alphabetical order must be followed in .def files.  The reason behind
+# this is that jenkins sets $GIT_COMMIT to sha1 of jenkins-scripts, and then
+# sets $GIT_COMMIT_1, $GIT_COMMIT_2, etc. to sha1s of component SCM /in the
+# order that they are declared here/.
+- scm:
+    name: build-scms
+    scm:
+      - jenkins-scripts
+      - component-scm:
+          component: binutils
+          url: '{binutils_url}'
+          branch: '{binutils_branch}'
+          reference: binutils-gdb.git
+      - component-scm:
+          component: linux
+          url: '{linux_url}'
+          branch: '{linux_branch}'
+          reference: linux.git
+      - component-scm:
+          component: llvm
+          url: '{llvm_url}'
+          branch: '{llvm_branch}'
+          reference: llvm-project.git
+      - component-scm:
+          component: qemu
+          url: '{qemu_url}'
+          branch: '{qemu_branch}'
+          reference: qemu.git
+
+- wrapper:
+    name: build-wrappers
+    wrappers:
+      - timeout:
+          timeout: '{timeout}'
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - credentials-binding:
+          - text:
+              credential-id: TCWG_JIRA_TOKEN
+              variable: TCWG_JIRA_TOKEN
+
+- builder:
+    name: trigger-followup-builds-1
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          for i in artifacts/trigger-build-* artifacts/trigger-bisect; do
+            if [ -f $i ]; then
+              echo "distro=$distro" >> $i
+              echo "scripts_branch=$scripts_branch" >> $i
+            fi
+          done
+
+          trap "" EXIT
+
+- builder:
+    name: trigger-followup-builds-2
+    builders:
+      - trigger-builds:
+          - project: '{ci_project}--{ci_config}-build'
+            parameter-factories:
+              - factory: filebuild
+                file-pattern: artifacts/trigger-build-*
+          - project: '{ci_project}--{ci_config}-bisect'
+            property-file: artifacts/trigger-bisect
+
+- builder:
+    name: run-build-notify
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Only send notifications for forced successful
+            # (aka "onregression") builds; never for failed builds.
+            echo "Build failed. Using option notify=ignore."
+            notify=ignore
+          fi
+
+          # Basic notification -- create entry in interesting-commits.
+          # Note that we add --notify to the manifest -- we will need this
+          # later in round-robin-baseline.sh when re-writing history
+          # to update notifications files in interesting-commits and jira.
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts --notify "$notify" \
+            __stage init __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-init.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-init failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-init failed"
+            exit 1
+          fi
+
+          # Full notification
+          echo "NOTE: Notify developers about this build"
+          if [ -f $HOME/.jipdate.yml ]; then
+            (
+              # BE CAREFUL WITH TCWG_JIRA_TOKEN
+              set +x
+              build_container_exec \
+                sed -i -e "s/#TCWG_JIRA_TOKEN#/$TCWG_JIRA_TOKEN/" \
+                "$HOME/.jipdate.yml"
+            )
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-notify.sh \
+            @@rr[top_artifacts] artifacts __stage full __verbose true \
+            __build_script {build_script} \
+            &> ./artifacts/jenkins/notify-full.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: notify-full failed\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: notify-full failed"
+          fi
+
+          # Failsafe for avoid spamming developers.
+          if [ "$notify" = "ignore" ] \
+            && [ -f artifacts/jenkins/mail-recipients.txt ]; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: tried to unexpectedly notify developers\n" \
+              >> artifacts/jenkins/error-mail-body.txt
+            mv artifacts/jenkins/mail-recipients.txt \
+            artifacts/jenkins/mail-recipients.bak
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-exit-on-failure
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          if [ -f artifacts/failed ]; then
+            # Mark failed build as FAILURE; no further steps will run.
+            exit $(cat artifacts/failed)
+          fi
+          # Only successful builds run beyond this point.
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-baseline
+    builders:
+      - shell: |
+          #!/bin/bash
+          source artifacts/jenkins/run-build.env
+          set -ex
+
+          # Update baseline branch of base-artifacts.
+          # If we made it this far, then the build is successful
+          # (possibly because it was forced to be declared successful).
+          if [ "$update_baseline" = "ignore" ]; then
+            trap "" EXIT
+            exit 0
+          fi
+
+          build_container_exec \
+            ./jenkins-scripts/round-robin-baseline.sh \
+            @@rr[top_artifacts] artifacts \
+            __build_script {build_script} \
+            __push_base_artifacts true \
+            __rewrite_base_artifacts true \
+            __rewrite_num 100 \
+            &> ./artifacts/jenkins/rewrite.log &
+
+          if ! wait $!; then
+            echo "maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org" \
+              > artifacts/jenkins/error-mail-recipients.txt
+            echo -e "$BUILD_URL\nERROR: round-robin-baseline.sh failed" \
+              >> artifacts/jenkins/error-mail-body.txt
+            echo "ERROR: round-robin-baseline.sh failed"
+            # We have failed to update the baseline, so let's fail and
+            # not notify developers.
+            exit 1
+          fi
+
+          trap "" EXIT
+
+- builder:
+    name: run-push-lnt-results
+    builders:
+     - trigger-builds:
+        - project: tcwg-update-lnt-results
+          predefined-parameters: |
+            ci_project={ci_project}
+            ci_config={ci_config}
+
+
+- builder:
+    name: run-build-init
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+
+            build_name="#$BUILD_NUMBER"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            if [ "{precommit}" = "True" ]; then
+              cat >> artifacts/jenkins/run-build.env <<EOF
+            update_baseline=ignore
+            EOF
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+          unstable-return: 125
+
+- builder:
+    name: run-build-skip-if-queue
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Skip SCM-triggered builds if there are other builds in
+            # the queue.  We need to process all pending bisection-triggered
+            # builds before fetching a new batch of upstream changes.
+            # Re. skipping post-commit build if pre-commit queue is
+            # not empty -- it's just a favor to pre-commit builds.
+            if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+              || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+              for job_type in build; do
+                url="${{JOB_URL%-build/}}-$job_type"
+                inQueue=$(curl -s "$url/api/xml?tree=inQueue" \
+                  | sed -e "s#.*<inQueue>\(.*\)</inQueue>.*#\1#")
+                if [ "$inQueue" != "false" ]; then
+                  echo "SKIP SCM BUILD"
+                  touch artifacts/jenkins/skip-scm-build
+                  build_name="$build_name-skip-scm-build"
+                  echo "$build_name" > artifacts/jenkins/build-name
+
+                  # Mark build unstable aka a skipped build
+                  exit 125
+                fi
+              done
+            fi
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-start-manifest
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            docker_opts=(
+              --distro $distro
+            )
+
+            ./jenkins-scripts/start-container-docker.sh --prefix build_ \
+              "${{docker_opts[@]}}" > build_container.sh
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+
+            # Run the build script to fetch base-artifacts/, which are
+            # required to fetch baseline sources to apply patches to in
+            # pw-apply.sh below.  This also initializes the build manifest
+            # with all below settings; we then import this manifest below.
+            #
+            # The parameter __finish_after makes the build script stop
+            # after fetching the baseline and "__" avoids saving this parameter
+            # in the manifest, so that we don't see this option in the main
+            # run of the build script below.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              %%rr[top_artifacts] artifacts \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" \
+              ==rr[mode] "build" \
+              ==rr[update_baseline] "$update_baseline" \
+              --BUILD_URL "$BUILD_URL" \
+              __finish_at reset_artifacts
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            docker_opts=(${{docker_opts[@]+$(printf "%q$IFS" "${{docker_opts[@]}}")}})
+            source build_container.sh
+            trap "cleanup_all_containers" EXIT
+            EOF
+
+            # Now that we have "trap cleanup_all_containers EXIT" in
+            # run-build.env we need to reset the trap at the end of every
+            # step to preserve container[s] for the next step.
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-process-params
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            branch_opt=()
+            # 1 to skip jenkins-scripts
+            i=1
+            for c in binutils linux llvm qemu; do
+              eval "g=\$$$${{c}}_git"
+              if [ x"$g" = x"default" ]; then
+                if [ x"${{BUILD_CAUSE_SCMTRIGGER-false}}" = x"true" ] \
+                  || [ x"${{BUILD_CAUSE_TIMERTRIGGER-false}}" = x"true" ]; then
+                  g="jenkins-scm"
+                else
+                  g="baseline"
+                fi
+              fi
+              if [ x"$g" = x"jenkins-scm" ]; then
+                eval "gb=\$GIT_BRANCH_$i"
+                gb=$(echo $gb | sed 's+origin/++')
+                eval "g=\$GIT_URL_$i#$gb"
+              fi
+              i=$(($i+1))
+
+              if [ x"$g" != x"baseline" ]; then
+                build_name="$build_name-$c"
+                branch_opt+=("==rr[${{c}}_git]" "$g")
+              fi
+            done
+
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            branch_opt=(${{branch_opt[@]+$(printf "%q$IFS" "${{branch_opt[@]}}")}})
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-main
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+
+            # Run the build script to from the manifest created above.
+            #
+            # The parameter __start_at makes the build script start right
+            # where the above run finished.  This allows us to use read-only
+            # bind-mount for base-artifacts/, which, otherwise, may require
+            # multi-gig rsync.
+            build_container_exec \
+              ./jenkins-scripts/{build_script} \
+              @@rr[top_artifacts] artifacts \
+              "${{branch_opt[@]}}" \
+              __start_at reset_artifacts+ &
+            res=0 && wait $! || res=$?
+
+            # Update build_name
+            if [ -f artifacts/results ]; then
+              build_name="$build_name-R$(tail -n1 artifacts/results)"
+            fi
+            if [ "$update_baseline" != "onsuccess" ]; then
+              build_name="$build_name-$update_baseline"
+            fi
+
+            if [ -f artifacts/trigger-bisect ]; then
+              build_name="$build_name-trigger-bisect"
+            fi
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            # Everything but 0 and $INTERNAL_FAILURE is an unexpected exit code,
+            # so stop here and do nothing else.  From jenkins point of view ...
+            # - if $res==0: build is successful, so proceed with all
+            #   followup steps -- notify, push, trigger precommit.
+            # - if $res==123: build has a regression, so proceed with triggering
+            #   followup builds and sending precommit notifications; but stop
+            #   before run-push-baseline by checking artifacts/failed.
+            # - if $res is anything else: build has an unexpected failure, so
+            #   skip the rest of the steps by setting UNSTABLE build status.
+            #   This will cause all followup conditional-steps to skip due to
+            #   "current-status" condition.
+            #
+            # See comment before round-robin.sh:check_regression() for details.
+            case $res in
+              0)
+                ;;
+              123)
+                echo 123 > artifacts/failed
+                ;;
+              *)
+                res=125
+                ;;
+            esac
+
+            if [ $res = 125 ]; then
+              # We had unexpected failure in the build scripts, so can't
+              # proceed with triggers and notifications.  Mark this build
+              # as UNSTABLE, which will skip all following conditional-steps.
+              exit 125
+            fi
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            trap "" EXIT
+          unstable-return: 125
+
+- builder:
+    name: run-build-fini
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            source artifacts/jenkins/run-build.env
+            set -ex
+            # The "trap cleanup_all_containers EXIT" statement in
+            # artifacts/jenkins/run-build.env will remove build and precommit
+            # containers.
+
+- builder:
+    name: run-build
+    builders:
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-init:
+                precommit: false
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-skip-if-queue:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-start-manifest:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-process-params:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-main:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-notify:
+                build_script: '{build_script}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-exit-on-failure:
+                dummy: dummy
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-baseline:
+                build_script: '{build_script}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-push-lnt-results:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - run-build-fini:
+                dummy: dummy
+
+
+- publisher:
+    name: build-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - html-publisher:
+          name: 'HTML Report'
+          dir: 'artifacts/jenkins'
+          files: 'status.html'
+          keep-all: true
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/mail-recipients.txt"}}
+          reply-to: linaro-toolchain@lists.linaro.org
+          subject: |
+            ${{FILE,path="artifacts/jenkins/mail-subject.txt"}}
+          content-type: text
+          body: |
+            ${{FILE,path="artifacts/jenkins/mail-body.txt"}}
+          failure: {email_on_failure}
+          success: {email_on_success}
+          aborted: false
+          send-to:
+            - recipients
+      - email-ext:
+          recipients: |
+            ${{FILE,path="artifacts/jenkins/error-mail-recipients.txt"}}
+          body: |
+            ${{FILE,path="artifacts/jenkins/error-mail-body.txt"}}
+          failure: true
+          success: true
+          aborted: true
+          send-to:
+            - recipients
+
+- parameter:
+    name: bisect-parameters
+    parameters:
+      - string:
+          name: current_project
+          default: ""
+          description: "Project to bisect"
+      - string:
+          name: bad_git
+          default: ""
+          description: "Bad git_url#branch/SHA1"
+      - file:
+          name: jenkins-scripts/replay_log
+          description: "Replay part of bisect using provided bisect log"
+      - default-parameters:
+          distro: '{distro}'
+
+- wrapper:
+    name: bisect-wrappers
+    wrappers:
+      - build-wrappers:
+          timeout: '{timeout}'
+
+- builder:
+    name: run-bisect
+    builders:
+      - shell:
+          command: |
+            #!/bin/bash
+            set -ex
+            # Delete artifacts now to avoid re-using stale artifacts if
+            # below docker-run.sh fails to start up a container.
+            rm -rf artifacts/
+            mkdir -p artifacts/jenkins
+            build_name="#$BUILD_NUMBER-$current_project"
+            echo "$build_name" > artifacts/jenkins/build-name
+
+            cat >> artifacts/jenkins/run-build.env <<EOF
+            build_name="$build_name"
+            EOF
+
+            ./jenkins-scripts/docker-run.sh \
+              --distro $distro \
+              -- \
+              ./jenkins-scripts/round-robin-bisect.sh \
+              %%rel_artifacts artifacts \
+              --BUILD_URL "$BUILD_URL" \
+              --current_project "$current_project" \
+              --bad_git "$bad_git" \
+              --replay_log "$(pwd)/jenkins-scripts/replay_log" \
+              --build_script "./jenkins-scripts/{build_script}" \
+              -- \
+              ==rr[ci_project] '{ci_project}' \
+              ==rr[ci_config] '{ci_config}' \
+              $extra_build_params \
+              --scripts_branch "$scripts_branch" &
+            res=0 && wait $! || res=$?
+
+            if [ $res != 0 ]; then
+              echo $res > artifacts/failed
+            fi
+          unstable-return: 125
+      - build-name-setter:
+          name: 'artifacts/jenkins/build-name'
+          file: true
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - trigger-followup-builds-1:
+                dummy: dummy
+            - trigger-followup-builds-2:
+                ci_project: '{ci_project}'
+                ci_config: '{ci_config}'
+      - conditional-step:
+          condition-kind: current-status
+          steps:
+            - shell: |
+                #!/bin/bash
+                set -ex
+
+                if [ -f artifacts/failed ]; then
+                  # Mark failed build as FAILURE; no further steps will run.
+                  exit $(cat artifacts/failed)
+                fi
+
+- publisher:
+    name: bisect-publishers
+    publishers:
+      - archive:
+          artifacts: 'artifacts/**'
+          latest-only: false
+      - email-ext:
+          recipients: |
+            maxim.kuvyrkov@linaro.org, laurent.alfonsi@linaro.org
+          failure: true
+          success: false
+          aborted: true
+          send-to:
+            - recipients
+#END:   tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+          qemu_url: '{qemu_url}'
+          qemu_branch: '{qemu_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+    triggers:
+      - pollscm:
+          cron: 'H H H/4 * *'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_kernel-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 1440
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_kernel-build.sh'
+    publishers:
+      - bisect-publishers
+# checksum: 0fc851daa1cab80bd34c582d722aab24
diff --git a/tcwg_kernel.yaml.in b/tcwg_kernel.yaml.in
new file mode 100644
index 0000000000..2a0a09e015
--- /dev/null
+++ b/tcwg_kernel.yaml.in
@@ -0,0 +1,126 @@
+# Beware: git branch names need the 'refs/heads/' prefix, while tags need 'refs/tags/'
+- project:
+    name: tcwg_kernel-#{TOOLCHAIN}
+    toolchain_name: #{TOOLCHAIN}
+    binutils_url: git://sourceware.org/git/binutils-gdb.git
+#if TOOLCHAIN_gnu
+    gcc_url: https://github.com/gcc-mirror/gcc.git
+#elif TOOLCHAIN_llvm
+    llvm_url: https://github.com/llvm/llvm-project.git
+#endif
+    qemu_url: https://gitlab.com/qemu-project/qemu.git
+    toolchain_ver:
+      - master:
+          binutils_branch: refs/heads/master
+#if TOOLCHAIN_gnu
+          gcc_branch: refs/heads/master
+#elif TOOLCHAIN_llvm
+          llvm_branch: refs/heads/main
+#endif
+          qemu_branch: refs/heads/master
+          distro: default
+    target:
+      - aarch64
+      - arm
+    linux:
+      - next:
+          linux_url: https://git.linaro.org/kernel-org/linux-next.git
+          linux_branch: refs/heads/master
+      - mainline:
+          linux_url: https://git.linaro.org/kernel-org/linux.git
+          linux_branch: refs/heads/master
+      - stable:
+          linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+          linux_branch: refs/heads/linux-rolling-stable
+      - lts:
+          linux_url: https://git.linaro.org/kernel-org/linux-stable.git
+          linux_branch: refs/heads/linux-rolling-lts
+    linux_config:
+      - defconfig
+      - allmodconfig
+      - allyesconfig
+      - allnoconfig
+    jobs:
+      - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build'
+      - 'tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect'
+    ci_project: 'tcwg_kernel'
+    ci_config: '{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}'
+
+#include tcwg/round-robin.yaml.inc
+
+- job-template:
+    name: tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-build
+    project-type: freestyle
+    defaults: global
+    properties:
+      - build-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - build-parameters:
+          default_git: 'default'
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Build {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
+    scm:
+      - build-scms:
+          binutils_url: '{binutils_url}'
+          binutils_branch: '{binutils_branch}'
+#if TOOLCHAIN_gnu
+          gcc_url: '{gcc_url}'
+          gcc_branch: '{gcc_branch}'
+#elif TOOLCHAIN_llvm
+          llvm_url: '{llvm_url}'
+          llvm_branch: '{llvm_branch}'
+#endif
+          qemu_url: '{qemu_url}'
+          qemu_branch: '{qemu_branch}'
+          linux_url: '{linux_url}'
+          linux_branch: '{linux_branch}'
+    triggers:
+      - pollscm:
+          cron: 'H H H/4 * *'
+    wrappers:
+      - build-wrappers:
+          timeout: 600
+    builders:
+      - run-build:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_kernel-build.sh'
+    publishers:
+      - build-publishers:
+          email_on_failure: false
+          email_on_success: true
+
+- job-template:
+    name: tcwg_kernel--{toolchain_name}-{toolchain_ver}-{target}-{linux}-{linux_config}-bisect
+    project-type: freestyle
+    defaults: global
+    properties:
+      - bisect-properties:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+    parameters:
+      - bisect-parameters:
+          distro: '{distro}'
+    disabled: false
+    node: tcwg-x86_64-build
+    concurrent: false
+    display-name: 'TCWG Bisect {ci_project}/{ci_config}'
+    workspace: workspace/tcwg_kernel_$EXECUTOR_NUMBER
+    scm:
+      - jenkins-scripts
+    wrappers:
+      - bisect-wrappers:
+          timeout: 1440
+    builders:
+      - run-bisect:
+          ci_project: '{ci_project}'
+          ci_config: '{ci_config}'
+          build_script: 'tcwg_kernel-build.sh'
+    publishers:
+      - bisect-publishers
diff --git a/tcwg_kernel/tcwg_kernel--gnu.def b/tcwg_kernel/tcwg_kernel--gnu.def
new file mode 100644
index 0000000000..443032583c
--- /dev/null
+++ b/tcwg_kernel/tcwg_kernel--gnu.def
@@ -0,0 +1,7 @@
+-v COMPONENTS=binutils
+-v COMPONENTS=gcc
+-v COMPONENTS=linux
+-v COMPONENTS=qemu
+-v RR=tcwg_kernel
+-v TOOLCHAIN=gnu
+-v SQUAD_GRP=
diff --git a/tcwg_kernel/tcwg_kernel--llvm.def b/tcwg_kernel/tcwg_kernel--llvm.def
new file mode 100644
index 0000000000..836e8f221f
--- /dev/null
+++ b/tcwg_kernel/tcwg_kernel--llvm.def
@@ -0,0 +1,7 @@
+-v COMPONENTS=binutils
+-v COMPONENTS=linux
+-v COMPONENTS=llvm
+-v COMPONENTS=qemu
+-v RR=tcwg_kernel
+-v TOOLCHAIN=llvm
+-v SQUAD_GRP=
diff --git a/tcwg_monitoring_disk_users.yaml b/tcwg_monitoring_disk_users.yaml
new file mode 100644
index 0000000000..e75440d6fd
--- /dev/null
+++ b/tcwg_monitoring_disk_users.yaml
@@ -0,0 +1,106 @@
+- project:
+    name: tcwg_monitoring_disk_users
+    slave_name:
+      - dev-01.tcwglab
+      - tcwg-ex42-01
+      - tcwg-tk1-10.tcwglab
+    jobs:
+      - 'tcwg_monitoring_disk_users_{slave_name}'
+
+- view:
+    name: tcwg_monitoring
+    view-type: list
+    regex: 'tcwg_monitoring_.*'
+
+- property:
+    name: default-properties
+    properties:
+      - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+      - build-discarder:
+          days-to-keep: 30
+          num-to-keep: 300
+
+- parameter:
+    name: default-parameters
+    parameters:
+      - string:
+          name: scripts_branch
+          default: master
+          description: 'Scripts revision to use'
+      - string:
+          name: TIMEOUT
+          default: 0
+          description: 'Timeout to use when computing disk usage'
+      - bool:
+          name: verbose
+          default: false
+          description: 'Whether to be verbose'
+      - bool:
+          name: sendmail
+          default: true
+          description: 'Whether send a mail'
+
+- scm:
+    name: jenkins
+    scm:
+      - git:
+          url: https://git.linaro.org/toolchain/monitoring-scripts.git
+          refspec: +refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*
+          branches:
+            - $scripts_branch
+          skip-tag: true
+          wipe-workspace: true
+
+- job-template:
+    name: tcwg_monitoring_disk_users_{slave_name}
+    project-type: freestyle
+    defaults: global
+    properties:
+      - default-properties
+    parameters:
+      - default-parameters
+    disabled: false
+    node: tcwg-coordinator
+    concurrent: true
+    display-name: 'TCWG Monitoring top disk users {slave_name}'
+    scm:
+      - jenkins
+    triggers:
+        - timed: '@daily'
+    wrappers:
+      - timeout:
+          timeout: 600
+      - timestamps
+      - ssh-agent-credentials:
+          # tcwg-buildslave user id
+          users:
+            - 'e0958a95-204f-4c14-a66c-5e2be6c5d50a'
+      - build-name:
+          name: '#$BUILD_NUMBER-{slave_name}'
+    builders:
+        - shell: |
+            #!/bin/bash
+            set -ex -o pipefail
+            slave_name={slave_name}
+            if $verbose; then
+              export DEBUG=true
+            fi
+            ./top-disk-one-slave.sh $slave_name | tee mail-body.txt
+            # We normally send an email upon failure only, so exit
+            #  with 0 if we don't want to send a mail
+            if ! $sendmail; then
+              exit 0
+            fi
+    publishers:
+        - email-ext:
+            recipients: tcwg@linaro.org
+            content-type: text
+            body: |
+              ${{FILE,path="mail-body.txt"}}
+            aborted: true
diff --git a/tensorflow-asv/thunderx-asv.sh b/tensorflow-asv/thunderx-asv.sh
new file mode 100644
index 0000000000..223d66ae63
--- /dev/null
+++ b/tensorflow-asv/thunderx-asv.sh
@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+sudo apt-get -q update
+sudo apt-get install -y ipmitool
+
+ipmitool -C3 -I lanplus -H 172.27.64.54 -I lanplus -U root -P Huawei12#$ sol activate
+cd /root/asv-test
+git pull
+./gen_commit_list.sh
+./get_commit_list.sh
+./gen_asv_commit_list.sh
+asv run HASHFILE:asv_commit_list
+asv publish --html-dir tensorflow-manylinux-nightly-asv-bench
+
+scp -r tensorflow-manylinux-nightly-asv-bench theodore.grey@people.linaro.org:~/public_html/
\ No newline at end of file
diff --git a/test-definitions-validation.yaml b/test-definitions-validation.yaml
new file mode 100644
index 0000000000..37b80f50e7
--- /dev/null
+++ b/test-definitions-validation.yaml
@@ -0,0 +1,42 @@
+- job:
+    name: test-definitions-validation
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 60
+        numToKeep: 60
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: QEMU_TESTS
+            default: 'stress'
+        - string:
+            name: QEMU_REFERENCE_IMAGES
+            default: ''
+    disabled: false
+    node: docker-xenial-aosp
+    display-name: 'Submits lava jobs with all tests part of test-definitions'
+    concurrent: true
+    triggers:
+        - timed : '@weekly'
+    wrappers:
+        - timestamps
+        - timeout:
+            timeout: 800
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: test-definitions-validation/builders.sh
+    publishers:
+        - email:
+            recipients: 'vishal.bhoj@linaro.org milosz.wasilewski@linaro.org'
diff --git a/test-definitions-validation/builders.sh b/test-definitions-validation/builders.sh
new file mode 100644
index 0000000000..5bd2636f9d
--- /dev/null
+++ b/test-definitions-validation/builders.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+sudo apt-get update
+sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python-pip
+pip install ruamel.yaml jinja2
+git clone git://git.linaro.org/ci/job/configs
+python2 configs/openembedded-lkft/submit_for_testing.py \
+        --device-type db845c \
+        --build-number ${BUILD_NUMBER} \
+        --lava-server https://validation.linaro.org \
+        --qa-server https://qa-reports.linaro.org \
+        --qa-server-team qa \
+        --qa-server-project test-definitions-validation \
+	--git-commit ${BUILD_NUMBER} \
+        --testplan-path configs/test-definitions-validation/ \
+        --test-plan test-db845c-1.yaml test-db845c-2.yaml test-db845c-3.yaml
+
+python2 configs/openembedded-lkft/submit_for_testing.py \
+        --device-type db410c \
+        --build-number ${BUILD_NUMBER} \
+        --lava-server https://lkft.validation.linaro.org \
+        --qa-server https://qa-reports.linaro.org \
+        --qa-server-team qa \
+        --qa-server-project test-definitions-validation \
+	--git-commit ${BUILD_NUMBER} \
+        --testplan-path configs/test-definitions-validation/ \
+        --test-plan test-db410c-1.yaml
diff --git a/test-definitions-validation/test-db410c-1.yaml b/test-definitions-validation/test-db410c-1.yaml
new file mode 100644
index 0000000000..f3ce511cb9
--- /dev/null
+++ b/test-definitions-validation/test-db410c-1.yaml
@@ -0,0 +1,98 @@
+
+timeouts:
+  job:
+    minutes: 130
+  connection:
+    minutes: 2
+  actions:
+    finalize:
+      seconds: 60
+context:
+  test_character_delay: 10
+reboot_to_fastboot: false
+device_type: dragonboard-410c
+job_name: linaro-test-definitions-validation
+priority: 1
+visibility: public
+tags:
+- production
+- chamelium
+metadata:
+  git branch: linux-4.9.y
+  git repo: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
+  git commit: 90bf2565b75363faf5fff41f0b2108ec2a288be8
+  git describe: v4.9.235
+  make_kernelversion: 4.9.235
+  kernel-config: https://builds.tuxbuild.com/FcuPbvIbcTOPCWmt6L3_-g/kernel.config
+  build-url: https://gitlab.com/Linaro/lkft/kernel-runs/-/pipelines/187989819
+  artifact-location: ''
+  toolchain: unknown
+  email-notification: ''
+  igt-gpu-tools__url: https://gitlab.freedesktop.org/drm/igt-gpu-tools
+actions:
+- deploy:
+    timeout:
+      minutes: 40
+    to: downloads
+    images:
+      boot:
+        url: https://storage.lkft.org/rootfs/oe-sumo/20200723/dragonboard-410c/boot--5.7+git0+780e72b005-r0-dragonboard-410c-20200723155806-41-41.img
+      kernel:
+        url: https://builds.tuxbuild.com/FcuPbvIbcTOPCWmt6L3_-g/Image
+      dtb:
+        url: https://builds.tuxbuild.com/FcuPbvIbcTOPCWmt6L3_-g/dtbs/qcom/apq8016-sbc.dtb
+      modules:
+        url: https://builds.tuxbuild.com/FcuPbvIbcTOPCWmt6L3_-g/modules.tar.xz
+        compression: xz
+      rootfs:
+        url: https://storage.lkft.org/rootfs/oe-sumo/20200723/dragonboard-410c/rpb-console-image-lkft-dragonboard-410c-20200723155806-41.rootfs.ext4.gz
+        compression: gz
+        apply-overlay: true
+    os: oe
+    postprocess:
+      docker:
+        image: linaro/kir
+        steps:
+        - /kir/lava/board_setup.sh dragonboard-410c
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    docker:
+      image: linaro/kir
+    images:
+      boot:
+        url: downloads://boot.img
+      rootfs:
+        url: downloads://rpb-console-image-lkft.rootfs.img
+        apply-overlay: true
+    os: oe
+- command:
+    name: pre_os_command
+- command:
+    name: pre_power_command
+- boot:
+    docker:
+      image: linaro/kir
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+      password_prompt: ''
+      password: ''
+    prompts:
+    - 'dragonboard-410c:'
+    - root@(.*):[/~]#
+    timeout:
+      minutes: 15
+    method: fastboot
+- test:
+    timeout:
+      minutes: 45
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/igt/igt-test.yaml
+      name: igt-gpu-tools
+      parameters:
+        IGT_DIR: /usr/share/igt-gpu-tools
+        TEST_LIST: CHAMELIUM
diff --git a/test-definitions-validation/test-db845c-1.yaml b/test-definitions-validation/test-db845c-1.yaml
new file mode 100644
index 0000000000..81ec266302
--- /dev/null
+++ b/test-definitions-validation/test-db845c-1.yaml
@@ -0,0 +1,231 @@
+timeouts:
+  job:
+    minutes: 140
+  connection:
+    minutes: 2
+  actions:
+    finalize:
+      seconds: 60
+context:
+  test_character_delay: 10
+device_type: dragonboard-845c
+job_name: linaro-test-definitions-validation
+priority: medium
+visibility: public
+protocols:
+  lava-lxc:
+    name: lxc-target
+    template: debian
+    distribution: debian
+    release: stretch
+    arch: amd64
+    mirror: http://deb.debian.org/debian
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    - img2simg
+    - simg2img
+    - e2fsprogs
+    - gzip
+    - cpio
+    - git
+    - mktemp
+    - abootimg
+    os: debian
+- boot:
+    namespace: tlxc
+    prompts:
+    - root@(.*):/#
+    timeout:
+      minutes: 5
+    method: lxc
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2905
+      parameters:
+        LINK: https://dl.google.com/android/repository/platform-tools_r29.0.5-linux.zip
+- deploy:
+    timeout:
+      minutes: 40
+    to: download
+    namespace: target
+    images:
+      boot:
+        url: https://snapshots.linaro.org/96boards/dragonboard845c/linaro/debian/389/boot-linaro-sid-dragonboard-845c-389.img.gz
+        compression: gz
+      partition:0:
+        url: https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/28/dragonboard-845c-bootloader-ufs-linux-28/gpt_both0.bin
+      rootfs:
+        url: https://snapshots.linaro.org/96boards/dragonboard845c/linaro/debian/389/linaro-sid-gnome-dragonboard-845c-389.img.gz
+        compression: gz
+    os: debian
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 30
+    definitions:
+    - from: inline
+      name: resize-rootfs
+      path: inline/resize-rootfs.yaml
+      repository:
+        metadata:
+          description: resize rootfs image for test overlay
+          format: Lava-Test Test Definition 1.0
+          name: resize-rootfs
+        run:
+          steps:
+          - cd /lava-lxc
+          - overlay_file=/lava-lxc/overlays/target/overlay.tar.gz
+          - overlay_size=$(gzip -l $overlay_file | tail -1 | awk '{print $2}')
+          - overlay_size=$(( $overlay_size / 1024 ))
+          - simg2img linaro-sid-gnome-dragonboard-845c-389.img linaro-sid-gnome-dragonboard-845c-389.img.ext4
+          - free_blocks=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Free blocks" | awk '{print $3}')
+          - block_size=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Block size" | awk '{print $3}')
+          - free_size=$(( $block_size * $free_blocks / 1024 ))
+          - if [ "$free_size" -lt "$overlay_size" ]; then
+          - block_count=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Block count" | awk '{print $3}')
+          - current_size=$(( $block_size * $block_count / 1024 ))
+          - extra_size=32768
+          - final_size=$(( $current_size + $overlay_size + $extra_size ))
+          - fsck_code=$(e2fsck -y -f linaro-sid-gnome-dragonboard-845c-389.img.ext4)
+          - resize2fs linaro-sid-gnome-dragonboard-845c-389.img.ext4 "$final_size"K
+          - img2simg linaro-sid-gnome-dragonboard-845c-389.img.ext4 linaro-sid-gnome-dragonboard-845c-389.img
+          - lava-test-case "resize_rootfs" --result "pass"
+          - else
+          - lava-test-case "resize_rootfs" --result "skip"
+          - fi
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: target
+    images:
+      boot:
+        url: lxc:///boot-linaro-sid-dragonboard-845c-389.img
+      partition:0:
+        url: lxc:///gpt_both0.bin
+      rootfs:
+        url: lxc:///linaro-sid-gnome-dragonboard-845c-389.img
+        apply-overlay: true
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+- boot:
+    namespace: target
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - root@(.*):[/~]#
+    - root@linaro-gnome:~#
+    timeout:
+      minutes: 15
+    method: fastboot
+    commands:
+    - oem select-display-panel none
+    - reboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+- test:
+    namespace: target
+    timeout:
+      minutes: 120
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/hackbench/hackbench.yaml
+      name: linux-hackbench
+      params:
+        ITERATION: 5
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/linpack/linpack.yaml
+      name: linux-linpack
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/openssl/openssl-speed.yaml
+      name: linux-openssl-speed
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/stream/stream-uniprocessor.yaml
+      name: linux-stream-uniprocessor
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/pi-stress/pi-stress.yaml
+      name: linux-pi-stress
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/pm-qa/pm-qa.yaml
+      name: linux-pm-qa
+      params:
+        TESTS: cpufreq cpuidle cpuhotplug cputopology
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/docker/docker.yaml
+      name: linux-containers
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/hci-smoke/hci-smoke.yaml
+      params:
+        BOOT: auto
+      name: linux-hci-smoke
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/lmbench/lmbench-memory.yaml
+      name: linux-lmbench-memory
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/wlan-smoke/wlan-smoke.yaml
+      params:
+        DEVICE: wlan0
+      name: linux-wlan-smoke
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/usb-smoke/usb-smoke-test.yaml
+      name: linux-usb-smoke
+    - name: badblocks
+      from: git
+      history: false
+      repository: https://github.com/Linaro/test-definitions
+      path: automated/linux/badblocks/badblocks.yaml
+      parameters:
+        SKIP_INSTALL: true
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/lshw/lshw.yaml
+      name: lshw
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/mmc/mmc-test.yaml
+      name: mmc
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/network-basic/network-basic.yaml
+      name: network-basic
+    - repository: https://github.com/Linaro/test-definitions
+      from: git
+      path: automated/linux/nginx-apache-bench/apache-bench.yaml
+      name: apache-bench
diff --git a/test-definitions-validation/test-db845c-2.yaml b/test-definitions-validation/test-db845c-2.yaml
new file mode 100644
index 0000000000..0bb1e6d65a
--- /dev/null
+++ b/test-definitions-validation/test-db845c-2.yaml
@@ -0,0 +1,183 @@
+timeouts:
+  job:
+    minutes: 140
+  connection:
+    minutes: 2
+  actions:
+    finalize:
+      seconds: 60
+context:
+  test_character_delay: 10
+device_type: dragonboard-845c
+job_name: linaro-test-definitions-validation
+priority: medium
+visibility: public
+protocols:
+  lava-lxc:
+    name: lxc-target
+    template: debian
+    distribution: debian
+    release: stretch
+    arch: amd64
+    mirror: http://deb.debian.org/debian
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    - img2simg
+    - simg2img
+    - e2fsprogs
+    - gzip
+    - cpio
+    - git
+    - mktemp
+    - abootimg
+    os: debian
+- boot:
+    namespace: tlxc
+    prompts:
+    - root@(.*):/#
+    timeout:
+      minutes: 5
+    method: lxc
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2905
+      parameters:
+        LINK: https://dl.google.com/android/repository/platform-tools_r29.0.5-linux.zip
+- deploy:
+    timeout:
+      minutes: 40
+    to: download
+    namespace: target
+    images:
+      boot:
+        url: https://snapshots.linaro.org/96boards/dragonboard845c/linaro/debian/389/boot-linaro-sid-dragonboard-845c-389.img.gz
+        compression: gz
+      partition:0:
+        url: https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/28/dragonboard-845c-bootloader-ufs-linux-28/gpt_both0.bin
+      rootfs:
+        url: https://snapshots.linaro.org/96boards/dragonboard845c/linaro/debian/389/linaro-sid-gnome-dragonboard-845c-389.img.gz
+        compression: gz
+    os: debian
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 30
+    definitions:
+    - from: inline
+      name: resize-rootfs
+      path: inline/resize-rootfs.yaml
+      repository:
+        metadata:
+          description: resize rootfs image for test overlay
+          format: Lava-Test Test Definition 1.0
+          name: resize-rootfs
+        run:
+          steps:
+          - cd /lava-lxc
+          - overlay_file=/lava-lxc/overlays/target/overlay.tar.gz
+          - overlay_size=$(gzip -l $overlay_file | tail -1 | awk '{print $2}')
+          - overlay_size=$(( $overlay_size / 1024 ))
+          - simg2img linaro-sid-gnome-dragonboard-845c-389.img linaro-sid-gnome-dragonboard-845c-389.img.ext4
+          - free_blocks=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Free blocks" | awk '{print $3}')
+          - block_size=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Block size" | awk '{print $3}')
+          - free_size=$(( $block_size * $free_blocks / 1024 ))
+          - if [ "$free_size" -lt "$overlay_size" ]; then
+          - block_count=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Block count" | awk '{print $3}')
+          - current_size=$(( $block_size * $block_count / 1024 ))
+          - extra_size=32768
+          - final_size=$(( $current_size + $overlay_size + $extra_size ))
+          - fsck_code=$(e2fsck -y -f linaro-sid-gnome-dragonboard-845c-389.img.ext4)
+          - resize2fs linaro-sid-gnome-dragonboard-845c-389.img.ext4 "$final_size"K
+          - img2simg linaro-sid-gnome-dragonboard-845c-389.img.ext4 linaro-sid-gnome-dragonboard-845c-389.img
+          - lava-test-case "resize_rootfs" --result "pass"
+          - else
+          - lava-test-case "resize_rootfs" --result "skip"
+          - fi
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: target
+    images:
+      boot:
+        url: lxc:///boot-linaro-sid-dragonboard-845c-389.img
+      partition:0:
+        url: lxc:///gpt_both0.bin
+      rootfs:
+        url: lxc:///linaro-sid-gnome-dragonboard-845c-389.img
+        apply-overlay: true
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+- boot:
+    namespace: target
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - root@(.*):[/~]#
+    - root@linaro-gnome:~#
+    timeout:
+      minutes: 15
+    method: fastboot
+    commands:
+    - oem select-display-panel none
+    - reboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+- test:
+    namespace: target
+    timeout:
+      minutes: 120
+    definitions:
+    - name: memtester
+      from: git
+      history: false
+      repository: https://github.com/Linaro/test-definitions
+      path: automated/linux/memtester/memtester.yaml
+    - name: apache-apache-bench
+      from: git
+      history: false
+      repository: https://github.com/Linaro/test-definitions
+      path: automated/linux/apache-apache-bench/apache-bench.yaml
+    - name: blogbench
+      from: git
+      history: false
+      repository: https://github.com/Linaro/test-definitions
+      path: automated/linux/blogbench/blogbench.yaml
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/cyclictest/cyclictest.yaml
+      name: cyclictest
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/cyclicdeadline/cyclicdeadline.yaml
+      name: cyclicdeadline
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/fio-test/fio-test.yaml
+      name: fio-test
diff --git a/test-definitions-validation/test-db845c-3.yaml b/test-definitions-validation/test-db845c-3.yaml
new file mode 100644
index 0000000000..681d0efab2
--- /dev/null
+++ b/test-definitions-validation/test-db845c-3.yaml
@@ -0,0 +1,180 @@
+timeouts:
+  job:
+    minutes: 140
+  connection:
+    minutes: 2
+  actions:
+    finalize:
+      seconds: 60
+context:
+  test_character_delay: 10
+device_type: dragonboard-845c
+job_name: linaro-test-definitions-validation
+priority: medium
+visibility: public
+protocols:
+  lava-lxc:
+    name: lxc-target
+    template: debian
+    distribution: debian
+    release: stretch
+    arch: amd64
+    mirror: http://deb.debian.org/debian
+actions:
+- deploy:
+    namespace: tlxc
+    timeout:
+      minutes: 15
+    to: lxc
+    packages:
+    - wget
+    - unzip
+    - img2simg
+    - simg2img
+    - e2fsprogs
+    - gzip
+    - cpio
+    - git
+    - mktemp
+    - abootimg
+    os: debian
+- boot:
+    namespace: tlxc
+    prompts:
+    - root@(.*):/#
+    timeout:
+      minutes: 5
+    method: lxc
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 10
+    definitions:
+    - repository: https://github.com/Linaro/test-definitions.git
+      from: git
+      path: automated/linux/android-platform-tools/install.yaml
+      name: install-android-platform-tools-r2905
+      parameters:
+        LINK: https://dl.google.com/android/repository/platform-tools_r29.0.5-linux.zip
+- deploy:
+    timeout:
+      minutes: 40
+    to: download
+    namespace: target
+    images:
+      boot:
+        url: https://snapshots.linaro.org/96boards/dragonboard845c/linaro/debian/389/boot-linaro-sid-dragonboard-845c-389.img.gz
+        compression: gz
+      partition:0:
+        url: https://images.validation.linaro.org/snapshots.linaro.org/96boards/dragonboard845c/linaro/rescue/28/dragonboard-845c-bootloader-ufs-linux-28/gpt_both0.bin
+      rootfs:
+        url: https://snapshots.linaro.org/96boards/dragonboard845c/linaro/debian/389/linaro-sid-gnome-dragonboard-845c-389.img.gz
+        compression: gz
+    os: debian
+- test:
+    namespace: tlxc
+    timeout:
+      minutes: 30
+    definitions:
+    - from: inline
+      name: resize-rootfs
+      path: inline/resize-rootfs.yaml
+      repository:
+        metadata:
+          description: resize rootfs image for test overlay
+          format: Lava-Test Test Definition 1.0
+          name: resize-rootfs
+        run:
+          steps:
+          - cd /lava-lxc
+          - overlay_file=/lava-lxc/overlays/target/overlay.tar.gz
+          - overlay_size=$(gzip -l $overlay_file | tail -1 | awk '{print $2}')
+          - overlay_size=$(( $overlay_size / 1024 ))
+          - simg2img linaro-sid-gnome-dragonboard-845c-389.img linaro-sid-gnome-dragonboard-845c-389.img.ext4
+          - free_blocks=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Free blocks" | awk '{print $3}')
+          - block_size=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Block size" | awk '{print $3}')
+          - free_size=$(( $block_size * $free_blocks / 1024 ))
+          - if [ "$free_size" -lt "$overlay_size" ]; then
+          - block_count=$(dumpe2fs -h linaro-sid-gnome-dragonboard-845c-389.img.ext4
+            | grep "Block count" | awk '{print $3}')
+          - current_size=$(( $block_size * $block_count / 1024 ))
+          - extra_size=32768
+          - final_size=$(( $current_size + $overlay_size + $extra_size ))
+          - fsck_code=$(e2fsck -y -f linaro-sid-gnome-dragonboard-845c-389.img.ext4)
+          - resize2fs linaro-sid-gnome-dragonboard-845c-389.img.ext4 "$final_size"K
+          - img2simg linaro-sid-gnome-dragonboard-845c-389.img.ext4 linaro-sid-gnome-dragonboard-845c-389.img
+          - lava-test-case "resize_rootfs" --result "pass"
+          - else
+          - lava-test-case "resize_rootfs" --result "skip"
+          - fi
+- deploy:
+    timeout:
+      minutes: 40
+    to: fastboot
+    namespace: target
+    images:
+      boot:
+        url: lxc:///boot-linaro-sid-dragonboard-845c-389.img
+      partition:0:
+        url: lxc:///gpt_both0.bin
+      rootfs:
+        url: lxc:///linaro-sid-gnome-dragonboard-845c-389.img
+        apply-overlay: true
+    os: debian
+    protocols:
+      lava-lxc:
+      - action: fastboot-deploy
+        request: pre-power-command
+        timeout:
+          minutes: 2
+- boot:
+    namespace: target
+    auto_login:
+      login_prompt: 'login:'
+      username: root
+    prompts:
+    - root@(.*):[/~]#
+    - root@linaro-gnome:~#
+    timeout:
+      minutes: 15
+    method: fastboot
+    commands:
+    - oem select-display-panel none
+    - reboot
+    protocols:
+      lava-lxc:
+      - action: auto-login-action
+        request: pre-os-command
+        timeout:
+          minutes: 2
+- test:
+    namespace: target
+    timeout:
+      minutes: 120
+    definitions:
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/iperf/iperf-server.yaml
+      name: iperf
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/iozone/iozone.yaml
+      name: iozone
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/kselftest/kselftest.yaml
+      name: kselftest
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/lapack/lapack.yaml
+      name: lapack
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/lemp/lemp.yaml
+      name: lemp
+    - repository: https://git.linaro.org/qa/test-definitions.git
+      from: git
+      path: automated/linux/lamp/lamp.yaml
+      name: lamp
diff --git a/testdef-docker-image/builders-armhf.sh b/testdef-docker-image/builders-armhf.sh
new file mode 100644
index 0000000000..f7293cbfc7
--- /dev/null
+++ b/testdef-docker-image/builders-armhf.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -rf "${HOME}/.docker"
+    rm -rf "${WORKSPACE}/dockerfiles"
+}
+
+mkdir -p "${HOME}/.docker"
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < "${WORKSPACE}/config.json" > "${HOME}/.docker/config.json"
+chmod 0600 "${HOME}/.docker/config.json"
+
+testdef_tag="$(git describe --tags --abbrev=0)"
+
+rm -rf "${WORKSPACE}/dockerfiles"
+git clone https://git.linaro.org/ci/dockerfiles.git
+
+build_img() {
+    docker_img="$1"
+    cd "${WORKSPACE}/dockerfiles/${docker_img}"
+    ./build.sh "${testdef_tag}"
+
+    # Push to linaro/testdef-*
+    docker push "$(cat .docker-tag)"
+}
+
+build_img "stretch-armhf-testdef"
diff --git a/testdef-docker-image/builders.sh b/testdef-docker-image/builders.sh
new file mode 100644
index 0000000000..70e0f1f3fa
--- /dev/null
+++ b/testdef-docker-image/builders.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -ex
+
+trap cleanup_exit INT TERM EXIT
+
+cleanup_exit()
+{
+    rm -rf "${HOME}/.docker"
+    rm -rf "${WORKSPACE}/dockerfiles"
+}
+
+mkdir -p "${HOME}/.docker"
+sed -e "s|\${DOCKER_AUTH}|${DOCKER_AUTH}|" < "${WORKSPACE}/config.json" > "${HOME}/.docker/config.json"
+chmod 0600 "${HOME}/.docker/config.json"
+
+testdef_tag="$(git describe --tags --abbrev=0)"
+
+rm -rf "${WORKSPACE}/dockerfiles"
+git clone https://git.linaro.org/ci/dockerfiles.git
+
+build_img() {
+    docker_img="$1"
+    cd "${WORKSPACE}/dockerfiles/${docker_img}"
+    ./build.sh "${testdef_tag}"
+
+    # Push to linaro/testdef-*
+    docker push "$(cat .docker-tag)"
+}
+
+build_img "stretch-arm64-testdef"
diff --git a/trigger-96boards-b2260-u-boot.yaml b/trigger-96boards-b2260-u-boot.yaml
deleted file mode 100644
index 1c436eaf96..0000000000
--- a/trigger-96boards-b2260-u-boot.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    name: trigger-96boards-b2260-u-boot
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - STiH410 B2260 U-Boot'
-    scm:
-        - git:
-            url: https://github.com/cpriouzeau/STi-U-Boot.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - timed: '@monthly'
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-b2260-u-boot'
diff --git a/trigger-96boards-b2260.yaml b/trigger-96boards-b2260.yaml
deleted file mode 100644
index f9bd0805d6..0000000000
--- a/trigger-96boards-b2260.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-96boards-b2260
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for 96boards - STiH410 B2260'
-    triggers:
-        - timed: '@monthly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-b2260'
diff --git a/trigger-96boards-bubblegum-u-boot.yaml b/trigger-96boards-bubblegum-u-boot.yaml
deleted file mode 100644
index 10a8393b9c..0000000000
--- a/trigger-96boards-bubblegum-u-boot.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-bubblegum-u-boot
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - uCRobotics Bubblegum-96 - U-Boot'
-    scm:
-        - git:
-            url: https://github.com/96boards-bubblegum/u-boot.git
-            refspec: +refs/heads/bubblegum96-2015.07:refs/remotes/origin/bubblegum96-2015.07
-            name: origin
-            branches:
-                - refs/heads/bubblegum96-2015.07
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-bubblegum-u-boot'
diff --git a/trigger-96boards-bubblegum.yaml b/trigger-96boards-bubblegum.yaml
deleted file mode 100644
index a1c03f4ce3..0000000000
--- a/trigger-96boards-bubblegum.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-bubblegum
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - uCRobotics Bubblegum-96'
-    scm:
-        - git:
-            url: https://github.com/96boards-bubblegum/linux.git
-            refspec: +refs/heads/bubblegum96-3.10:refs/remotes/origin/bubblegum96-3.10
-            name: origin
-            branches:
-                - refs/heads/bubblegum96-3.10
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-bubblegum, 96boards-bubblegum-kernel'
diff --git a/trigger-96boards-helium-u-boot.yaml b/trigger-96boards-helium-u-boot.yaml
deleted file mode 100644
index 4aa5489080..0000000000
--- a/trigger-96boards-helium-u-boot.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-helium-u-boot
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - Marvell PXA1928 Helium U-Boot'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/rob.herring/u-boot.git
-            refspec: +refs/heads/v2015.07-pxa1928:refs/remotes/origin/v2015.07-pxa1928
-            name: origin
-            branches:
-                - refs/heads/v2015.07-pxa1928
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-helium-u-boot'
diff --git a/trigger-96boards-helium.yaml b/trigger-96boards-helium.yaml
deleted file mode 100644
index 83cf726890..0000000000
--- a/trigger-96boards-helium.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-helium
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - Marvell PXA1928 Helium'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/rob.herring/linux.git
-            refspec: +refs/heads/v4.1-pxa1928:refs/remotes/origin/v4.1-pxa1928
-            name: origin
-            branches:
-                - refs/heads/v4.1-pxa1928
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-helium'
diff --git a/trigger-96boards-hikey-4.1.yaml b/trigger-96boards-hikey-4.1.yaml
deleted file mode 100644
index 2f039569b4..0000000000
--- a/trigger-96boards-hikey-4.1.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-- job:
-    name: trigger-96boards-hikey-4.1
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: build
-    display-name: 'Trigger for 96boards - HiKey (android-hikey-linaro-4.1)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/linux.git
-            refspec: +refs/heads/android-hikey-linaro-4.1:refs/remotes/origin/android-hikey-linaro-4.1
-            name: origin
-            branches:
-                - refs/heads/android-hikey-linaro-4.1
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-hikey-4.1'
diff --git a/trigger-96boards-hikey-atf.yaml b/trigger-96boards-hikey-atf.yaml
deleted file mode 100644
index dadc80ba1f..0000000000
--- a/trigger-96boards-hikey-atf.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-hikey-atf
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - HiKey UEFI (ATF)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/arm-trusted-firmware.git
-            refspec: +refs/heads/hikey:refs/remotes/origin/hikey
-            name: origin
-            branches:
-                - refs/heads/hikey
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-hikey-uefi-openplatformpkg'
diff --git a/trigger-96boards-hikey-edk2-openplatformpkg.yaml b/trigger-96boards-hikey-edk2-openplatformpkg.yaml
index e68f795aca..fec4cf25eb 100644
--- a/trigger-96boards-hikey-edk2-openplatformpkg.yaml
+++ b/trigger-96boards-hikey-edk2-openplatformpkg.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for 96boards - HiKey UEFI (edk2 OpenPlatformPkg)'
     scm:
         - git:
diff --git a/trigger-96boards-hikey-edk2.yaml b/trigger-96boards-hikey-edk2.yaml
deleted file mode 100644
index a00d7a570f..0000000000
--- a/trigger-96boards-hikey-edk2.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- job:
-    name: trigger-96boards-hikey-edk2
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: build
-    display-name: 'Trigger for 96boards - HiKey UEFI (edk2)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/edk2.git
-            refspec: +refs/heads/hikey:refs/remotes/origin/hikey
-            name: origin
-            branches:
-                - refs/heads/hikey
-            basedir: linaro-edk2
-            skip-tag: true
-            shallow-clone: true
-            clean: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-hikey-uefi'
diff --git a/trigger-96boards-hikey-mainline-rebase.yaml b/trigger-96boards-hikey-mainline-rebase.yaml
deleted file mode 100644
index e883d7f1a9..0000000000
--- a/trigger-96boards-hikey-mainline-rebase.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-hikey-mainline-rebase
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for 96boards - HiKey (hikey-mainline-rebase)'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/linux.git
-            refspec: +refs/heads/hikey-mainline-rebase:refs/remotes/origin/hikey-mainline-rebase
-            name: origin
-            branches:
-                - refs/heads/hikey-mainline-rebase
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:            
-        - trigger-builds:
-            - project: '96boards-hikey-mainline-rebase'
diff --git a/trigger-96boards-hikey-openplatformpkg.yaml b/trigger-96boards-hikey-openplatformpkg.yaml
index 44c9b9a7f5..8861da7bd6 100644
--- a/trigger-96boards-hikey-openplatformpkg.yaml
+++ b/trigger-96boards-hikey-openplatformpkg.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for 96boards - HiKey UEFI (OpenPlatformPkg)'
     scm:
         - git:
diff --git a/trigger-96boards-hikey.yaml b/trigger-96boards-hikey.yaml
deleted file mode 100644
index 68d5dd7eeb..0000000000
--- a/trigger-96boards-hikey.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-96boards-hikey
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: build
-    display-name: 'Trigger for 96boards - HiKey'
-    scm:
-        - git:
-            url: https://github.com/96boards-hikey/linux.git
-            refspec: +refs/heads/hikey:refs/remotes/origin/hikey
-            name: origin
-            branches:
-                - refs/heads/hikey
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:            
-        - trigger-builds:
-            - project: '96boards-hikey, 96boards-hikey-android'
diff --git a/trigger-android-daily-builds.yaml b/trigger-android-daily-builds.yaml
index 4a9211b9d0..b681eefd2f 100644
--- a/trigger-android-daily-builds.yaml
+++ b/trigger-android-daily-builds.yaml
@@ -11,7 +11,7 @@
                 - job-read
                 - job-extended-read
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for daily Android builds'
     triggers:
         - timed: 'H 0 * * *'
@@ -25,8 +25,3 @@
                 - 'linaro-art-vixl-art-host-test'
                 - 'linaro-art-tip-build-ARTVixlTest'
                 - 'android-clang-toolchain'
-            - project: 'android-generic-build'
-              predefined-parameters: |
-                  MANIFEST_BRANCH=master
-                  LUNCH_TARGET=aosp_arm64_a-eng
-                  BUILD_TYPE=public
diff --git a/trigger-android-hikey-linaro-4.14-pmwg.yaml b/trigger-android-hikey-linaro-4.14-pmwg.yaml
new file mode 100644
index 0000000000..8ecaca6707
--- /dev/null
+++ b/trigger-android-hikey-linaro-4.14-pmwg.yaml
@@ -0,0 +1,64 @@
+- job:
+    name: trigger-android-hikey-linaro-4.14-pmwg
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 60
+            num-to-keep: 60
+    parameters:
+        - string:
+            name: KERNEL_BRANCH
+            default: 'android-hikey-linaro-4.14-pmwg'
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for PMWG Android 4.14 on HiKey'
+    scm:
+        - git:
+            url: https://git.linaro.org/power/android.git
+            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
+            name: origin
+            branches:
+                - origin/${KERNEL_BRANCH}
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+    triggers:
+        - pollscm: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=12}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
+            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
+            cat lkft_parameters
+    publishers:
+        - trigger-parameterized-builds:
+            - project:
+                - 'android-hikey-linaro-4.14-pmwg'
+                - 'android-hikey960-linaro-4.14-pmwg'
+              condition: SUCCESS
+              property-file: lkft_parameters
+        - email-ext:
+            recipients: 'private-pmwg@lists.linaro.org, vishal.bhoj@linaro.org, fathi.boudra@linaro.org'
+            content-type: text
+            subject: '[Jenkins] Trigger: ${GIT_BRANCH} ${GIT_REVISION,length=12}'
+            body: |
+                Project: ${PROJECT_NAME}
+                Build number: ${BUILD_NUMBER}
+                Build status: ${BUILD_STATUS}
+                Build URL: ${BUILD_URL}
+                Console output: ${BUILD_URL}consoleText
+                Git branch: ${GIT_BRANCH}
+                Git commit: ${GIT_COMMIT}
+
+                https://git.linaro.org/power/android.git/commit/?h=${KERNEL_BRANCH}&id=${GIT_COMMIT}
+            attach-build-log: true
+            always: true
diff --git a/trigger-android-hikey-linaro-4.9-pmwg.yaml b/trigger-android-hikey-linaro-4.9-pmwg.yaml
index 9394f7be9a..e997a4e693 100644
--- a/trigger-android-hikey-linaro-4.9-pmwg.yaml
+++ b/trigger-android-hikey-linaro-4.9-pmwg.yaml
@@ -15,7 +15,7 @@
             name: KERNEL_BRANCH
             default: 'android-hikey-linaro-4.9-pmwg'
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for PMWG Android on HiKey'
     scm:
         - git:
diff --git a/trigger-android-weekly-builds.yaml b/trigger-android-weekly-builds.yaml
index 96cfe8e058..7ef21d7f7d 100644
--- a/trigger-android-weekly-builds.yaml
+++ b/trigger-android-weekly-builds.yaml
@@ -10,8 +10,11 @@
             anonymous:
                 - job-read
                 - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for weekly Android builds'
     triggers:
         - timed: 'H 0 * * 6'
@@ -20,10 +23,9 @@
     builders:
         - trigger-builds:
             - project:
-                - 'android-chromium-clang-armv7'
-                - 'android-chromium-clang-armv8'
-                - 'android-chromium-gcc-armv7'
-                - 'android-chromium-gcc-armv8'
                 - 'linaro-art-build-metrics'
-                - 'android-lcr-reference-hikey-o'
-                - 'android-lcr-reference-x15-o'
+                - 'android-lcr-reference-x15-master'
+                - 'android-lcr-reference-x15-master-auto'
+                - 'lkft-aosp-member-wrapper'
+                - 'android-hikey-optee-master'
+                - 'armnn-ci-benchmarking'
diff --git a/trigger-armnn-ci-build.yaml b/trigger-armnn-ci-build.yaml
new file mode 100644
index 0000000000..a381745e56
--- /dev/null
+++ b/trigger-armnn-ci-build.yaml
@@ -0,0 +1,43 @@
+- job:
+    name: trigger-armnn-ci-build
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for armnn-ci-build'
+    scm:
+        - git:
+            url: https://git.mlplatform.org/ml/armnn.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
+            name: origin
+            branches:
+                - refs/heads/master
+            submodule:
+                recursive: true
+    triggers:
+        - pollscm:
+            cron: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            git clean -fdx
+            echo GIT_COM_ID=${GIT_COMMIT} >> armnn_ci_parameters
+            cat armnn_ci_parameters
+    publishers:
+        - trigger-parameterized-builds:
+            - project: 'armnn-ci-build'
+              property-file: armnn_ci_parameters
+            - project: 'armnn32-ci-build'
+              property-file: armnn_ci_parameters
+
diff --git a/trigger-build-kvmtool.yaml b/trigger-build-kvmtool.yaml
index 306f33033a..971cfd0aca 100644
--- a/trigger-build-kvmtool.yaml
+++ b/trigger-build-kvmtool.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for kvmtool packages'
     scm:
         - git:
diff --git a/trigger-ci-job-configs.yaml b/trigger-ci-job-configs.yaml
index 423d322740..58d339c161 100644
--- a/trigger-ci-job-configs.yaml
+++ b/trigger-ci-job-configs.yaml
@@ -6,15 +6,26 @@
         - authorization:
             anonymous:
                 - job-discover
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 200
     disabled: false
-    node: master
+    node: triggers
     display-name: 'CI job configs deployment'
+    scm:
+        - git:
+            url: https://review.linaro.org/${GERRIT_PROJECT}
+            refspec: ${GERRIT_REFSPEC}
+            branches:
+                - ${GERRIT_BRANCH}
+            skip-tag: true
+            clean:
+                before: true
+            choosing-strategy: gerrit
+            basedir: configs
     triggers:
         - gerrit:
             server-name: 'review.linaro.org'
@@ -52,6 +63,10 @@
             - text:
                 credential-id: AUTH_TOKEN
                 variable: AUTH_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: SQUAD_AUTH_TOKEN
+                variable: SQUAD_AUTH_TOKEN
     builders:
         - shell: |
             #!/bin/bash -e
@@ -69,18 +84,26 @@
             echo "    Gerrit Environment"
             env |grep '^GERRIT'
             echo "########################################################################"
-
-            rm -rf ${WORKSPACE}/*
-
-            git clone -b ${GERRIT_BRANCH} --depth 2 https://review.linaro.org/${GERRIT_PROJECT}
-            cd *
-            git fetch https://review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
-            git checkout -q FETCH_HEAD
+            cd configs/
 
             export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
             export GIT_COMMIT=${GERRIT_PATCHSET_REVISION}
+
+            set +e
+            KERNEL_TEST_CONFIG=$(git show --pretty="format:" --name-only | grep "kernel-testing-configs/test-params")
+            set -e
+            if [ ! -z ${KERNEL_TEST_CONFIG} ];then
+              source ${KERNEL_TEST_CONFIG}
+              export KERNEL_BRANCH KERNEL_REPO DUT EMAIL_ADDRESS
+              cd kernel-testing-configs
+              ./generate-jjb-configs.sh
+              export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
+              export GIT_COMMIT=$(git rev-parse HEAD)
+              cd ../
+            fi
+
             jenkins-jobs --version
-            python run-jjb.py
+            python3 run-jjb.py
     publishers:
         - email:
-            recipients: 'fathi.boudra@linaro.org ben.copeland@linaro.org'
+            recipients: 'linaro-infrastructure-errors@lists.linaro.org'
diff --git a/trigger-coresight.yaml b/trigger-coresight.yaml
deleted file mode 100644
index a38bb84765..0000000000
--- a/trigger-coresight.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-- job:
-    name: trigger-coresight
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Coresight'
-    scm:
-        - git:
-            url: http://git.linaro.org/kernel/coresight.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=hisi vexpress" > defconfig.properties
-        - trigger-builds:
-            - project: 'coresight'
-              property-file: defconfig.properties
diff --git a/trigger-daily.yaml b/trigger-daily.yaml
new file mode 100644
index 0000000000..1ea12920fe
--- /dev/null
+++ b/trigger-daily.yaml
@@ -0,0 +1,20 @@
+- job:
+    name: trigger-daily
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger to launch daily rebuilds'
+    triggers:
+        - timed: '@daily'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
diff --git a/trigger-debian-arm64-rootfs.yaml b/trigger-debian-arm64-rootfs.yaml
deleted file mode 100644
index fa2267537a..0000000000
--- a/trigger-debian-arm64-rootfs.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-debian-arm64-rootfs
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: build
-    display-name: 'Trigger for Debian arm64 rootfs'
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'debian-arm64-rootfs'
diff --git a/trigger-debian-armhf-rootfs.yaml b/trigger-debian-armhf-rootfs.yaml
deleted file mode 100644
index 3b1eda4d43..0000000000
--- a/trigger-debian-armhf-rootfs.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-debian-armhf-rootfs
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: build
-    display-name: 'Trigger for Debian armhf rootfs'
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'debian-armhf-rootfs'
diff --git a/trigger-debian-fai.yaml b/trigger-debian-fai.yaml
deleted file mode 100644
index 54af24121c..0000000000
--- a/trigger-debian-fai.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-- job:
-    name: trigger-debian-fai
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: master
-    display-name: 'Trigger to monitor FAI changes'
-    scm:
-        - git:
-            url: https://git.linaro.org/git/ci/fai.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-debian-images-dragonboard410c'
-                - 'lt-qcom-debian-images-dragonboard820c'
-              condition: SUCCESS
-              trigger-with-no-params: true
diff --git a/trigger-erp-test-automation-weekly.yaml b/trigger-erp-test-automation-weekly.yaml
deleted file mode 100644
index 7c02cd2df0..0000000000
--- a/trigger-erp-test-automation-weekly.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- job:
-    name: trigger-erp-test-automation-weekly
-    display-name: 'Trigger ERP test automation weekly'
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: erp-test-automation
-              predefined-parameters: |
-                  HOSTS=cb-g0
-                  BUILD_ENV=staging
-                  BUILD_NUM=latest
diff --git a/trigger-idlestat.yaml b/trigger-idlestat.yaml
deleted file mode 100644
index d819e9538b..0000000000
--- a/trigger-idlestat.yaml
+++ /dev/null
@@ -1,72 +0,0 @@
-- job:
-    name: trigger-idlestat
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for idlestat (new release notification)'
-    scm:
-        - git:
-            url: https://git.linaro.org/power/idlestat.git
-            refspec: +refs/tags/*:refs/remotes/origin/tags/*
-            name: origin
-            branches:
-                - refs/tags/*
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -x
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf meta-linaro
-            }
-
-            tag=$(git describe --tags --abbrev=0)
-            version=$(echo ${tag} | cut -d'-' -f2)
-
-            git clone --depth 1 http://git.linaro.org/openembedded/meta-linaro.git
-            recipe=$(find meta-linaro -type f -name 'idlestat_git.bb')
-            sed -i "s|^SRCREV = .*|SRCREV = \"${GIT_COMMIT}\"|" ${recipe}
-            sed -i "s|^PV = .*|PV = \"${version}+git\${SRCPV}\"|" ${recipe}
-
-            cd meta-linaro && git diff > ${WORKSPACE}/idlestat-recipe-update.patch
-    publishers:
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org, riku.voipio@linaro.org'
-            body: |
-                Project: ${PROJECT_NAME}
-                Build number: ${BUILD_NUMBER}
-                Build status: ${BUILD_STATUS}
-                Build URL: ${BUILD_URL}
-                Build summary:
-
-                New upstream release: https://git.linaro.org/power/idlestat.git ${GIT_BRANCH}
-
-                Please, update Debian package and OpenEmbedded recipe to ${GIT_COMMIT}.
-            attachments: '*.patch'
-            always: true
diff --git a/trigger-ldcg-onednn-benchmarks.yaml b/trigger-ldcg-onednn-benchmarks.yaml
new file mode 100644
index 0000000000..93b1890ba4
--- /dev/null
+++ b/trigger-ldcg-onednn-benchmarks.yaml
@@ -0,0 +1,23 @@
+- job:
+    name: trigger-ldcg-onednn-benchmarks
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+               - job-read
+               - job-extended-read
+    disabled: false
+    node: triggers
+    display-name: "Trigger for OneDNN benchmarks"
+    triggers:
+        - timed: '@weekly'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project:
+                - 'ldcg-onednn-benchmarks'
diff --git a/trigger-ldcg-tensorflow-asv-benchmarks.yaml b/trigger-ldcg-tensorflow-asv-benchmarks.yaml
new file mode 100644
index 0000000000..9c2173d36b
--- /dev/null
+++ b/trigger-ldcg-tensorflow-asv-benchmarks.yaml
@@ -0,0 +1,23 @@
+- job:
+    name: trigger-ldcg-tensorflow-asv-benchmarks
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Tensorflow benchmarks run with asv'
+    triggers:
+        - pollscm:
+            cron: 'H/5 * * * 6'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: 
+              - 'ldcg-tensorflow-asv-benchmarks'
diff --git a/trigger-ldcg-tensorflow-io.yaml b/trigger-ldcg-tensorflow-io.yaml
new file mode 100644
index 0000000000..6817560bdc
--- /dev/null
+++ b/trigger-ldcg-tensorflow-io.yaml
@@ -0,0 +1,35 @@
+- job:
+    name: trigger-ldcg-tensorflow-io
+    project-type: freestyle
+    defaults: global
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 30
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Tensorflow IO upstream'
+    scm:
+      - git:
+          url: https://github.com/tensorflow/io.git
+          refspec: +refs/heads/master:refs/remotes/origin/master
+          name: origin
+          branches:
+            - refs/heads/master
+          skip-tag: true
+          shallow-clone: true
+          wipe-workspace: false
+    triggers:
+      - pollscm:
+          cron: 'H/5 * * * *'
+    wrappers:
+      - timestamps
+      - build-name:
+          name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    publishers:
+      - trigger-parameterized-builds:
+          - project: 'ldcg-python-manylinux-tensorflow-io'
+            predefined-parameters: buildgit=true
diff --git a/trigger-ldcg-tensorflow-text.yaml b/trigger-ldcg-tensorflow-text.yaml
new file mode 100644
index 0000000000..f736c8a0a8
--- /dev/null
+++ b/trigger-ldcg-tensorflow-text.yaml
@@ -0,0 +1,35 @@
+- job:
+    name: trigger-ldcg-tensorflow-text
+    project-type: freestyle
+    defaults: global
+    logrotate:
+      daysToKeep: 30
+      numToKeep: 30
+    properties:
+      - authorization:
+          anonymous:
+            - job-read
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Tensorflow Text upstream'
+    scm:
+      - git:
+          url: https://github.com/tensorflow/text.git
+          refspec: +refs/heads/master:refs/remotes/origin/master
+          name: origin
+          branches:
+            - refs/heads/master
+          skip-tag: true
+          shallow-clone: true
+          wipe-workspace: false
+    triggers:
+      - pollscm:
+          cron: 'H/5 * * * *'
+    wrappers:
+      - timestamps
+      - build-name:
+          name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    publishers:
+      - trigger-parameterized-builds:
+          - project: 'ldcg-python-manylinux-tensorflow-text'
+            predefined-parameters: buildgit=true
diff --git a/trigger-lhg-oe-build-next.yaml b/trigger-lhg-oe-build-next.yaml
deleted file mode 100644
index 0740863e23..0000000000
--- a/trigger-lhg-oe-build-next.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-- job:
-    name: trigger-lhg-oe-build-next
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: master
-    display-name: 'Trigger for LHG rpb-based build (staging)'
-    triggers:
-        # Run the builds every Monday, Wednesday, and Friday in the morning
-        - timed: 'H H(0-6) * * 1,3,5'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'lhg-oe-build-next'
diff --git a/trigger-lhg-oe-build.yaml b/trigger-lhg-oe-build.yaml
index 7e49cd2d09..e81915677f 100644
--- a/trigger-lhg-oe-build.yaml
+++ b/trigger-lhg-oe-build.yaml
@@ -9,8 +9,8 @@
         - authorization:
             anonymous:
                 - job-read
-    disabled: false
-    node: master
+    disabled: true
+    node: triggers
     display-name: 'Trigger for LHG rpb-based build'
     triggers:
         # Run the builds every Tuesday, Thursday, and Saturday in the morning
diff --git a/trigger-lhg-oe-rocko.yaml b/trigger-lhg-oe-rocko.yaml
new file mode 100644
index 0000000000..9d6ba9c819
--- /dev/null
+++ b/trigger-lhg-oe-rocko.yaml
@@ -0,0 +1,22 @@
+- job:
+    name: trigger-lhg-oe-rocko
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for LHG rocko build'
+    triggers:
+        # Run the builds every Monday, Wednesday, and Friday in the morning
+        - timed: 'H H(0-6) * * 1,3,5'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: 'lhg-oe-rocko'
diff --git a/trigger-lhg-oe-thud.yaml b/trigger-lhg-oe-thud.yaml
new file mode 100644
index 0000000000..449931652f
--- /dev/null
+++ b/trigger-lhg-oe-thud.yaml
@@ -0,0 +1,22 @@
+- job:
+    name: trigger-lhg-oe-thud
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for LHG Thud build'
+    triggers:
+        # Run the builds every Monday, Wednesday, and Friday in the morning
+        - timed: 'H H(0-6) * * 1,3,5'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: 'lhg-oe-thud'
diff --git a/trigger-lhg-oe-wpe-master.yaml b/trigger-lhg-oe-wpe-master.yaml
new file mode 100644
index 0000000000..6eed2d7ad9
--- /dev/null
+++ b/trigger-lhg-oe-wpe-master.yaml
@@ -0,0 +1,22 @@
+- job:
+    name: trigger-lhg-oe-wpe-master
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for LHG master wpe build'
+    triggers:
+        # Run the builds every Monday, Wednesday, and Friday in the morning
+        - timed: 'H H(0-6) * * 1,3,5'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: 'lhg-oe-wpe-master'
diff --git a/trigger-lhg-opencdm-sanity-check-rocko.yaml b/trigger-lhg-opencdm-sanity-check-rocko.yaml
new file mode 100644
index 0000000000..620873742f
--- /dev/null
+++ b/trigger-lhg-opencdm-sanity-check-rocko.yaml
@@ -0,0 +1,46 @@
+- job:
+    name: trigger-lhg-opencdm-sanity-check-rocko
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+        - github:
+            url: https://github.com/linaro-mmwg/open-content-decryption-module
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for LHG opencdm sanity check'
+    scm:
+        - git:
+            url: https://github.com/linaro-mmwg/open-content-decryption-module.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            white-list-target-branches:
+                - 'chromium-65.0.3315.0.r527534.igalia'
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+                - project: 'lhg-oe-rocko'
+                - block: true
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
diff --git a/trigger-lhg-opencdm-sanity-check.yaml b/trigger-lhg-opencdm-sanity-check.yaml
index f5032613b5..c565324902 100644
--- a/trigger-lhg-opencdm-sanity-check.yaml
+++ b/trigger-lhg-opencdm-sanity-check.yaml
@@ -11,13 +11,13 @@
             days-to-keep: 30
             num-to-keep: 30
         - github:
-            url: https://github.com/linaro-home/open-content-decryption-module
-    disabled: false
-    node: master
+            url: https://github.com/linaro-mmwg/open-content-decryption-module
+    disabled: true
+    node: triggers
     display-name: 'Trigger for LHG opencdm sanity check'
     scm:
         - git:
-            url: https://github.com/linaro-home/open-content-decryption-module.git
+            url: https://github.com/linaro-mmwg/open-content-decryption-module.git
             refspec: +refs/pull/*:refs/remotes/origin/pr/*
             name: origin
             branches:
@@ -28,11 +28,16 @@
     triggers:
         - github-pull-request:
             github-hooks: true
+            white-list-target-branches:
+                - 'chromium-53.0.2785.143'
             permit-all: true
             auth-id: 'GITHUB_TOKEN'
     wrappers:
         - timestamps
     builders:
+        - trigger-builds:
+                - project: 'lhg-oe-build'
+                - block: true
         - shell: |
             #!/bin/bash -e
             echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
diff --git a/trigger-lhg-optee-clearkey-cdmi-sanity-check-rocko.yaml b/trigger-lhg-optee-clearkey-cdmi-sanity-check-rocko.yaml
new file mode 100644
index 0000000000..e42f8b9612
--- /dev/null
+++ b/trigger-lhg-optee-clearkey-cdmi-sanity-check-rocko.yaml
@@ -0,0 +1,46 @@
+- job:
+    name: trigger-lhg-optee-clearkey-cdmi-sanity-check-rocko
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+        - github:
+            url: https://github.com/linaro-mmwg/optee-clearkey-cdmi
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for ClearKey CDMI for OP TEE/LinaroCDM sanity check'
+    scm:
+        - git:
+            url: https://github.com/linaro-mmwg/optee-clearkey-cdmi.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            white-list-target-branches:
+                - 'master'
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+                - project: 'lhg-oe-rocko'
+                - block: true
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
diff --git a/trigger-lhg-optee-clearkey-cdmi-sanity-check.yaml b/trigger-lhg-optee-clearkey-cdmi-sanity-check.yaml
index 2f3f3eda54..b68a93b12b 100644
--- a/trigger-lhg-optee-clearkey-cdmi-sanity-check.yaml
+++ b/trigger-lhg-optee-clearkey-cdmi-sanity-check.yaml
@@ -11,13 +11,13 @@
             days-to-keep: 30
             num-to-keep: 30
         - github:
-            url: https://github.com/linaro-home/optee-clearkey-cdmi
-    disabled: false
-    node: master
+            url: https://github.com/linaro-mmwg/optee-clearkey-cdmi
+    disabled: true
+    node: triggers
     display-name: 'Trigger for ClearKey CDMI for OP TEE/LinaroCDM sanity check'
     scm:
         - git:
-            url: https://github.com/linaro-home/optee-clearkey-cdmi.git
+            url: https://github.com/linaro-mmwg/optee-clearkey-cdmi.git
             refspec: +refs/pull/*:refs/remotes/origin/pr/*
             name: origin
             branches:
@@ -28,11 +28,16 @@
     triggers:
         - github-pull-request:
             github-hooks: true
+            white-list-target-branches:
+                - 'chromium-53.0.2785.143'
             permit-all: true
             auth-id: 'GITHUB_TOKEN'
     wrappers:
         - timestamps
     builders:
+        - trigger-builds:
+                - project: 'lhg-oe-build'
+                - block: true
         - shell: |
             #!/bin/bash -e
             echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
diff --git a/trigger-linux-arm-soc-for-next.yaml b/trigger-linux-arm-soc-for-next.yaml
deleted file mode 100644
index 8ab5c9a96f..0000000000
--- a/trigger-linux-arm-soc-for-next.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-arm-soc-for-next
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux ARM SoC Kernel (for-next)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git
-            refspec: +refs/heads/for-next:refs/remotes/origin/for-next
-            name: origin
-            branches: 
-                - refs/heads/for-next
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=" > defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/tree/arch/arm/configs?h=for-next -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/arm/arm-soc.git/tree/arch/arm64/configs?h=for-next -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-        - trigger-builds:
-            - project: 'linux-arm-soc-for-next'
-              property-file: defconfig.properties
diff --git a/trigger-linux-eas.yaml b/trigger-linux-eas.yaml
deleted file mode 100644
index c85ca91293..0000000000
--- a/trigger-linux-eas.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-- job:
-    name: trigger-linux-eas
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux EAS'
-    scm:
-        - git:
-            url: http://git.linaro.org/kernel/eas-backports.git
-            refspec: +refs/heads/eas-test:refs/remotes/origin/eas-test
-            name: origin
-            branches:
-                - refs/heads/eas-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=omap2plus vexpress" > defconfig.properties
-        - trigger-builds:
-            - project: 'linux-eas'
-              property-file: defconfig.properties
diff --git a/trigger-linux-leg.yaml b/trigger-linux-leg.yaml
deleted file mode 100644
index 01e5142a0c..0000000000
--- a/trigger-linux-leg.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-linux-leg
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: true
-    node: build
-    display-name: 'Trigger for LEG Kernel'
-    scm:
-        - git:
-            url: git://git.linaro.org/leg/acpi/leg-kernel.git
-            refspec: +refs/heads/leg-kernel:refs/remotes/origin/leg-kernel
-            name: origin
-            branches:
-                - refs/heads/leg-kernel
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'linux-leg'
diff --git a/trigger-linux-linaro-stable-lsk-v3.10-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v3.10-pre-merge.yaml
deleted file mode 100644
index 3e60cedc24..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.10-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.10-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.10 (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10-test:refs/remotes/origin/linux-linaro-lsk-v3.10-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.10-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.10-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v3.10-rt-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v3.10-rt-pre-merge.yaml
deleted file mode 100644
index 8d5b4839a7..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.10-rt-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.10-rt-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.10 RT (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10-rt-test:refs/remotes/origin/linux-linaro-lsk-v3.10-rt-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.10-rt-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.10-rt-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v3.10-rt.yaml b/trigger-linux-linaro-stable-lsk-v3.10-rt.yaml
deleted file mode 100644
index a9359ae568..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.10-rt.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.10-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.10 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10-rt:refs/remotes/origin/linux-linaro-lsk-v3.10-rt
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.10-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.10-rt'
diff --git a/trigger-linux-linaro-stable-lsk-v3.10.yaml b/trigger-linux-linaro-stable-lsk-v3.10.yaml
deleted file mode 100644
index 5f3cbf9942..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.10.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.10
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.10'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.10:refs/remotes/origin/linux-linaro-lsk-v3.10
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.10
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.10'
diff --git a/trigger-linux-linaro-stable-lsk-v3.14-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v3.14-pre-merge.yaml
deleted file mode 100644
index b8090f2041..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.14-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.14-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.14 (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14-test:refs/remotes/origin/linux-linaro-lsk-v3.14-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.14-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.14-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v3.14-rt-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v3.14-rt-pre-merge.yaml
deleted file mode 100644
index d8d62dcdc2..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.14-rt-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.14-rt-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.14 RT (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14-rt-test:refs/remotes/origin/linux-linaro-lsk-v3.14-rt-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.14-rt-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.14-rt-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v3.14-rt.yaml b/trigger-linux-linaro-stable-lsk-v3.14-rt.yaml
deleted file mode 100644
index a575e1c979..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.14-rt.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.14-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.14 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14-rt:refs/remotes/origin/linux-linaro-lsk-v3.14-rt
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.14-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.14-rt'
diff --git a/trigger-linux-linaro-stable-lsk-v3.14.yaml b/trigger-linux-linaro-stable-lsk-v3.14.yaml
deleted file mode 100644
index e4ac96271b..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.14.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.14
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.14'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.14:refs/remotes/origin/linux-linaro-lsk-v3.14
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.14
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.14'
diff --git a/trigger-linux-linaro-stable-lsk-v3.18-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v3.18-pre-merge.yaml
deleted file mode 100644
index f3ad7cbb68..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.18-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.18-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.18 (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18-test:refs/remotes/origin/linux-linaro-lsk-v3.18-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.18-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.18-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v3.18-rt-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v3.18-rt-pre-merge.yaml
deleted file mode 100644
index 0ef62d8c9d..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.18-rt-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.18-rt-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.18 RT (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18-rt-test:refs/remotes/origin/linux-linaro-lsk-v3.18-rt-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.18-rt-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.18-rt-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v3.18-rt.yaml b/trigger-linux-linaro-stable-lsk-v3.18-rt.yaml
deleted file mode 100644
index 4cb38d9618..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.18-rt.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.18-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.18 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18-rt:refs/remotes/origin/linux-linaro-lsk-v3.18-rt
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.18-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.18-rt'
diff --git a/trigger-linux-linaro-stable-lsk-v3.18.yaml b/trigger-linux-linaro-stable-lsk-v3.18.yaml
deleted file mode 100644
index fa6b5cbd4b..0000000000
--- a/trigger-linux-linaro-stable-lsk-v3.18.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v3.18
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v3.18'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v3.18:refs/remotes/origin/linux-linaro-lsk-v3.18
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v3.18
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v3.18'
diff --git a/trigger-linux-linaro-stable-lsk-v4.1-pre-merge.yaml b/trigger-linux-linaro-stable-lsk-v4.1-pre-merge.yaml
deleted file mode 100644
index 564bfd6dbb..0000000000
--- a/trigger-linux-linaro-stable-lsk-v4.1-pre-merge.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v4.1-pre-merge
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v4.1 (pre-merge)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v4.1-test:refs/remotes/origin/linux-linaro-lsk-v4.1-test
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v4.1-test
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v4.1-pre-merge'
diff --git a/trigger-linux-linaro-stable-lsk-v4.1-rt.yaml b/trigger-linux-linaro-stable-lsk-v4.1-rt.yaml
deleted file mode 100644
index 2860b72698..0000000000
--- a/trigger-linux-linaro-stable-lsk-v4.1-rt.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v4.1-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v4.1 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v4.1-rt:refs/remotes/origin/linux-linaro-lsk-v4.1-rt
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v4.1-rt
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v4.1-rt'
diff --git a/trigger-linux-linaro-stable-lsk-v4.1.yaml b/trigger-linux-linaro-stable-lsk-v4.1.yaml
deleted file mode 100644
index 770b8a4a04..0000000000
--- a/trigger-linux-linaro-stable-lsk-v4.1.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-linaro-stable-lsk-v4.1
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-#    parameters:
-#        - password:
-#            name: token
-#            default: ${token}
-#        - string:
-#            name: ci_base_url
-#            default: 'https://ci.linaro.org/job'
-    disabled: true
-    node: build
-    display-name: 'Trigger for Linaro Stable Kernel v4.1'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/linux-linaro-lsk-v4.1:refs/remotes/origin/linux-linaro-lsk-v4.1
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-lsk-v4.1
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-#    builders:
-#        - shell: |
-#            #!/bin/bash
-#
-#            set -e
-#
-#            curl=`which curl` || { echo 'Failed to find curl' && exit 1; }
-#            job_name=`echo ${JOB_NAME} |cut -d'-' -f2-`
-#
-#            ${curl} --insecure ${ci_base_url}/${job_name}/buildWithParameters?token=${token}
-    publishers:
-        - trigger:
-            project: 'linux-linaro-stable-lsk-v4.1'
diff --git a/trigger-linux-linaro-tracking-ll-ilp32.yaml b/trigger-linux-linaro-tracking-ll-ilp32.yaml
deleted file mode 100644
index e6e0ae135d..0000000000
--- a/trigger-linux-linaro-tracking-ll-ilp32.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-linux-linaro-tracking-ll-ilp32
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux Linaro Kernel (ll-extra, ILP32)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro-extra:refs/remotes/origin/linux-linaro-extra
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-extra
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'linux-linaro-tracking-ll-ilp32'
diff --git a/trigger-linux-linaro-tracking-ll.yaml b/trigger-linux-linaro-tracking-ll.yaml
deleted file mode 100644
index 1fd5c94bfd..0000000000
--- a/trigger-linux-linaro-tracking-ll.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-- job:
-    name: trigger-linux-linaro-tracking-ll
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux Linaro Kernel (ll)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro:refs/remotes/origin/linux-linaro
-            name: origin
-            branches:
-                - refs/heads/linux-linaro
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf meta-linaro
-            }
-
-            git clone --depth 1 http://git.linaro.org/openembedded/meta-linaro.git
-
-            VERSION=`grep "^VERSION =" Makefile | cut -d' ' -f3`.`grep "^PATCHLEVEL =" Makefile | cut -d' ' -f3`
-
-            ll_recipe=`find meta-linaro -type f -name 'linux-linaro-aarch64.bb'`
-            sed -i "s|^SRCREV_kernel=.*|SRCREV_kernel=\"${GIT_COMMIT}\"|" ${ll_recipe}
-            sed -i "s|^PV = .*|PV = \"${VERSION}+git\${SRCPV}\"|" ${ll_recipe}
-
-            ll_recipe=`find meta-linaro -type f -name 'linux-linaro-vexpress_git.bb'`
-            sed -i "s|^SRCREV_kernel=.*|SRCREV_kernel=\"${GIT_COMMIT}\"|" ${ll_recipe}
-            sed -i "s|^PV = .*|PV = \"${VERSION}+git\${SRCPV}\"|" ${ll_recipe}
-
-            cd meta-linaro && git diff > ${WORKSPACE}/linux-linaro-recipe-update.patch
-        - trigger-builds:
-            - project: 'linux-linaro-tracking-ll'
-    publishers:
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org'
-            attachments: '*.patch'
-            always: true
diff --git a/trigger-linux-linaro-tracking-llct.yaml b/trigger-linux-linaro-tracking-llct.yaml
deleted file mode 100644
index 987e87b715..0000000000
--- a/trigger-linux-linaro-tracking-llct.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-linux-linaro-tracking-llct
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux Linaro Kernel (llct)'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-tracking.git
-            refspec: +refs/heads/linux-linaro-core-tracking:refs/remotes/origin/linux-linaro-core-tracking
-            name: origin
-            branches:
-                - refs/heads/linux-linaro-core-tracking
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'linux-linaro-tracking-llct'
diff --git a/trigger-linux-ltsi.yaml b/trigger-linux-ltsi.yaml
deleted file mode 100644
index 449b932645..0000000000
--- a/trigger-linux-ltsi.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-ltsi
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux LTSI Kernel (linux-3.14.y)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/linux-3.14.y:refs/remotes/origin/linux-3.14.y
-            name: origin
-            branches: 
-                - refs/heads/linux-3.14.y
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=" > defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/arch/arm/configs?h=linux-3.14.y -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/configs?h=linux-3.14.y -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-        - trigger-builds:
-            - project: 'linux-ltsi'
-              property-file: defconfig.properties
diff --git a/trigger-linux-mainline.yaml b/trigger-linux-mainline.yaml
deleted file mode 100644
index afae572ac4..0000000000
--- a/trigger-linux-mainline.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-mainline
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux Mainline Kernel (master)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=" > defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm/configs -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/configs -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-        - trigger-builds:
-            - project: 'linux-mainline'
-              property-file: defconfig.properties
diff --git a/trigger-linux-next.yaml b/trigger-linux-next.yaml
deleted file mode 100644
index 7dad62c248..0000000000
--- a/trigger-linux-next.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-next
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux Next (master)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=" > defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm/configs -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-
-            wget http://git.kernel.org/cgit/linux/kernel/git/next/linux-next.git/tree/arch/arm64/configs -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-        - trigger-builds:
-            - project: 'linux-next'
-              property-file: defconfig.properties
diff --git a/trigger-linux-stable.yaml b/trigger-linux-stable.yaml
deleted file mode 100644
index f7b7162090..0000000000
--- a/trigger-linux-stable.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-- job:
-    name: trigger-linux-stable
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Linux Stable Kernel (linux-3.14.y)'
-    scm:
-        - git:
-            url: git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/linux-3.14.y:refs/remotes/origin/linux-3.14.y
-            name: origin
-            branches: 
-                - refs/heads/linux-3.14.y
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              exit 0
-            }
-
-            echo -n "defconfig_list=" > defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/arch/arm/configs?h=linux-3.14.y -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-
-            wget https://git.kernel.org/cgit/linux/kernel/git/stable/linux-stable.git/tree/arch/arm64/configs?h=linux-3.14.y -O configs
-            cut -d'>' -f6 configs | cut -d'<' -f1 | grep defconfig | tr -s "\n" " " | sed 's/_defconfig//g' >> defconfig.properties
-        - trigger-builds:
-            - project: 'linux-stable'
-              property-file: defconfig.properties
diff --git a/trigger-lite-gateway-ubuntu-core.yaml b/trigger-lite-gateway-ubuntu-core.yaml
index af4209b687..7c9f270f9c 100644
--- a/trigger-lite-gateway-ubuntu-core.yaml
+++ b/trigger-lite-gateway-ubuntu-core.yaml
@@ -10,7 +10,7 @@
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for LITE - Ubuntu Core gateway image'
     triggers:
         - timed: '@monthly'
diff --git a/trigger-lkft-hikey-aosp-4.14.yaml b/trigger-lkft-hikey-aosp-4.14.yaml
deleted file mode 100644
index b1019021a6..0000000000
--- a/trigger-lkft-hikey-aosp-4.14.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- job:
-    name: trigger-lkft-hikey-4.14
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.14'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT HiKey builds (4.14 branch)'
-    scm:
-        - git:
-            remotes:
-                - android-hikey-linaro-4.14:
-                    url: https://android.googlesource.com/kernel/hikey-linaro
-                    refspec: +refs/heads/android-hikey-linaro-4.14:refs/remotes/android-hikey-linaro-4.14/android-hikey-linaro-4.14
-                - linux-stable-4.14:
-                    url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-                    refspec: +refs/heads/linux-4.14.y:refs/remotes/linux-stable-4.14/linux-4.14.y
-            branches:
-                - android-hikey-linaro-4.14/android-hikey-linaro-4.14
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-aosp-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-aosp-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-android-8.0-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-android-8.1-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-lkft-hikey-aosp-4.4.yaml b/trigger-lkft-hikey-aosp-4.4.yaml
deleted file mode 100644
index df58faca68..0000000000
--- a/trigger-lkft-hikey-aosp-4.4.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- job:
-    name: trigger-lkft-hikey-4.4
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.4'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT HiKey builds (4.4 branch)'
-    scm:
-        - git:
-            remotes:
-                - android-hikey-linaro-4.4:
-                    url: https://android.googlesource.com/kernel/hikey-linaro
-                    refspec: +refs/heads/android-hikey-linaro-4.4:refs/remotes/android-hikey-linaro-4.4/android-hikey-linaro-4.4
-                - linux-stable-4.4:
-                    url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-                    refspec: +refs/heads/linux-4.4.y:refs/remotes/linux-stable-4.4/linux-4.4.y
-            branches:
-                - android-hikey-linaro-4.4/android-hikey-linaro-4.4
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-aosp-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-aosp-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-android-8.0-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-android-8.1-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-lkft-hikey-aosp-4.9.yaml b/trigger-lkft-hikey-aosp-4.9.yaml
deleted file mode 100644
index 9959e6bfbd..0000000000
--- a/trigger-lkft-hikey-aosp-4.9.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-- job:
-    name: trigger-lkft-hikey-4.9
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'android-hikey-linaro-4.9'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT HiKey builds (4.9 branch)'
-    scm:
-        - git:
-            remotes:
-                - android-hikey-linaro-4.9:
-                    url: https://android.googlesource.com/kernel/hikey-linaro
-                    refspec: +refs/heads/android-hikey-linaro-4.9:refs/remotes/android-hikey-linaro-4.9/android-hikey-linaro-4.9
-                - linux-stable-4.9:
-                    url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-                    refspec: +refs/heads/linux-4.9.y:refs/remotes/linux-stable-4.9/linux-4.9.y
-            branches:
-                - android-hikey-linaro-4.9/android-hikey-linaro-4.9
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-aosp-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-aosp-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-android-8.0-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
-            - project:
-                - 'lkft-hikey-android-8.1-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-lkft-hikey-dlezcano-4.14.yaml b/trigger-lkft-hikey-dlezcano-4.14.yaml
new file mode 100644
index 0000000000..97b8aa9884
--- /dev/null
+++ b/trigger-lkft-hikey-dlezcano-4.14.yaml
@@ -0,0 +1,50 @@
+- job:
+    name: trigger-lkft-hikey-dlezcano-4.14
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+    parameters:
+        - string:
+            name: KERNEL_BRANCH
+            default: 'lkft'
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for LKFT HiKey builds (4.14 branch)'
+    scm:
+        - git:
+            remotes:
+                - android-hikey-dlezcano-4.14:
+                    url: https://git.linaro.org/people/daniel.lezcano/android.git
+                    refspec: +refs/heads/lkft:refs/remotes/android-hikey-dlezcano-4.14/lkft
+            branches:
+                - android-hikey-dlezcano-4.14/lkft
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+    triggers:
+        - pollscm: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
+            echo KERNEL_COMMIT=${GIT_COMMIT} >> lkft_parameters
+            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
+            cat lkft_parameters
+    publishers:
+        - trigger-parameterized-builds:
+            - project:
+                - 'openembedded-lkft-dlezcano-4.14'
+              condition: SUCCESS
+              property-file: lkft_parameters
+
diff --git a/trigger-lkft-notify-kselftest-next.yaml b/trigger-lkft-notify-kselftest-next.yaml
new file mode 100644
index 0000000000..c7a37ad9c6
--- /dev/null
+++ b/trigger-lkft-notify-kselftest-next.yaml
@@ -0,0 +1,61 @@
+- job:
+    name: trigger-lkft-notify-kselftest-next
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    concurrent: false
+    display-name: 'Trigger LKFT kselftest next report'
+    scm:
+        - git:
+            url: https://github.com/Linaro/lkft-tools.git
+            refspec: +refs/heads/*:refs/remotes/origin/*
+            name: origin
+            branches:
+                - refs/heads/master
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+            clean:
+                before: true
+    triggers:
+        - timed: '0 * * * *'
+    wrappers:
+        - timeout:
+            timeout: 60
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+
+            pip install --user -r requirements.txt
+
+            python ./bin/trigger_generate_next_kselftest_report.py
+
+        - trigger-builds:
+            - project: lkft-notify-kselftest-next
+              block: false
+              parameter-factories:
+                  - factory: filebuild
+                    file-pattern: "*.build_notify_parameters"
+                    no-files-found-action: SKIP
+
+    publishers:
+        - workspace-cleanup:
+             include:
+              - "*_parameters"
+        - email:
+             recipients: 'dan.rue@linaro.org anders.roxell@linaro.org'
diff --git a/trigger-lt-hisilicon-hix5hd2.yaml b/trigger-lt-hisilicon-hix5hd2.yaml
deleted file mode 100644
index ababdfcdcc..0000000000
--- a/trigger-lt-hisilicon-hix5hd2.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-- job:
-    name: trigger-lt-hisilicon-hix5hd2
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for HiSilicon LT - hix5hd2'
-    scm:
-        - git:
-            url: http://git.linaro.org/git/landing-teams/working/hisilicon/kernel.git
-            refspec: +refs/heads/hix5hd2:refs/remotes/origin/hix5hd2
-            name: origin
-            branches:
-                - refs/heads/hix5hd2
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'LT-HiSilicon-hix5hd2'
diff --git a/trigger-lt-qcom-bootloaders.yaml b/trigger-lt-qcom-bootloaders.yaml
deleted file mode 100644
index da01b6e40e..0000000000
--- a/trigger-lt-qcom-bootloaders.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-- job:
-    name: trigger-lt-qcom-bootloaders
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for Qualcomm Bootloader builds'
-    triggers:
-        - timed: '@monthly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'lt-qcom-bootloader-dragonboard410c'
-            - project: 'lt-qcom-bootloader-dragonboard820c'
diff --git a/trigger-lt-qcom-debian-images-dragonboard410c.yaml b/trigger-lt-qcom-debian-images-dragonboard410c.yaml
deleted file mode 100644
index 96b3dd458b..0000000000
--- a/trigger-lt-qcom-debian-images-dragonboard410c.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- job:
-    name: trigger-lt-qcom-debian-images-dragonboard410c
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build
-    display-name: 'Trigger for Qualcomm Debian based images for Snapdragon 410'
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://obs.linaro.org/linaro-overlay-buster/buster/Release'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'lt-qcom-debian-images-dragonboard410c'
diff --git a/trigger-lt-qcom-debian-images-dragonboard820c.yaml b/trigger-lt-qcom-debian-images-dragonboard820c.yaml
deleted file mode 100644
index 387226b4bd..0000000000
--- a/trigger-lt-qcom-debian-images-dragonboard820c.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-- job:
-    name: trigger-lt-qcom-debian-images-dragonboard820c
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build
-    display-name: 'Trigger for Qualcomm Debian based images for Snapdragon 820'
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://obs.linaro.org/linaro-overlay-buster/buster/Release'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'lt-qcom-debian-images-dragonboard820c'
diff --git a/trigger-lt-qcom-debian-images.yaml b/trigger-lt-qcom-debian-images.yaml
deleted file mode 100644
index 6f6c6fd133..0000000000
--- a/trigger-lt-qcom-debian-images.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- job:
-    name: trigger-lt-qcom-debian-images
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-    disabled: false
-    node: build
-    display-name: 'Trigger for Qualcomm Debian based images'
-    scm:
-        - git:
-            url: https://git.linaro.org/git/landing-teams/working/qualcomm/kernel.git
-            name: origin
-            branches:
-                - refs/heads/release/qcomlt-4.9
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'lt-qcom-debian-images-dragonboard600c'
-            - project: 'lt-qcom-debian-images-dragonboard410c'
diff --git a/trigger-lt-qcom-linux-4.14.0.yaml b/trigger-lt-qcom-linux-4.14.0.yaml
deleted file mode 100644
index 780d5f1945..0000000000
--- a/trigger-lt-qcom-linux-4.14.0.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job:
-    name: trigger-lt-qcom-linux-4.14.0
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'Trigger for QCOM LT kernel 4.14 branch'
-    scm:
-        - git:
-            url: https://git.linaro.org/git/landing-teams/working/qualcomm/kernel.git
-            refspec: +refs/heads/release/*:refs/remotes/origin/release/*
-            name: origin
-            branches:
-                - refs/heads/release/qcomlt-4.14
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            # bring in stable and mainline tags
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
-
-            echo KERNEL_VERSION=$(make kernelversion) > qcomlt_parameters
-            echo KERNEL_DESCRIBE=$(git describe --always) >> qcomlt_parameters
-            echo KERNEL_BRANCH=$(echo ${GIT_BRANCH} | sed  's|origin/||') >> qcomlt_parameters
-            echo TARGET_REPO=linaro-overlay-buster >> qcomlt_parameters
-            echo KDEB_CHANGELOG_DIST=buster >> qcomlt_parameters
-            cat qcomlt_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-linux'
-              condition: SUCCESS
-              property-file: qcomlt_parameters
diff --git a/trigger-lt-qcom-linux-4.9.0.yaml b/trigger-lt-qcom-linux-4.9.0.yaml
deleted file mode 100644
index 7322f0f4eb..0000000000
--- a/trigger-lt-qcom-linux-4.9.0.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job:
-    name: trigger-lt-qcom-linux-4.9.0
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'Trigger for QCOM LT kernel 4.9 branch'
-    scm:
-        - git:
-            url: https://git.linaro.org/git/landing-teams/working/qualcomm/kernel.git
-            refspec: +refs/heads/release/*:refs/remotes/origin/release/*
-            name: origin
-            branches:
-                - refs/heads/release/qcomlt-4.9
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            # bring in stable and mainline tags
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
-
-            echo KERNEL_VERSION=$(make kernelversion) > qcomlt_parameters
-            echo KERNEL_DESCRIBE=$(git describe --always) >> qcomlt_parameters
-            echo KERNEL_BRANCH=$(echo ${GIT_BRANCH} | sed  's|origin/||') >> qcomlt_parameters
-            echo TARGET_REPO=linaro-overlay-buster >> qcomlt_parameters
-            echo KDEB_CHANGELOG_DIST=buster >> qcomlt_parameters
-            cat qcomlt_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-linux'
-              condition: SUCCESS
-              property-file: qcomlt_parameters
diff --git a/trigger-lt-qcom-linux-aosp-4.14.0.yaml b/trigger-lt-qcom-linux-aosp-4.14.0.yaml
deleted file mode 100644
index a0c09afe06..0000000000
--- a/trigger-lt-qcom-linux-aosp-4.14.0.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: trigger-lt-qcom-linux-aosp-4.14.0
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'Trigger for QCOM LT kernel 4.14 (AOSP) branch'
-    scm:
-        - git:
-            url: https://git.linaro.org/git/landing-teams/working/qualcomm/kernel.git
-            refspec: +refs/heads/release/*:refs/remotes/origin/release/*
-            name: origin
-            branches:
-                - refs/heads/release/android/qcomlt-4.14
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            # bring in stable and mainline tags
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
-
-            echo KERNEL_VERSION=$(make kernelversion) > qcomlt_parameters
-            echo KERNEL_DESCRIBE=$(git describe --always) >> qcomlt_parameters
-            echo KERNEL_BRANCH=$(echo ${GIT_BRANCH} | sed  's|origin/||') >> qcomlt_parameters
-            cat qcomlt_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-linux-aosp'
-              condition: SUCCESS
-              property-file: qcomlt_parameters
diff --git a/trigger-lt-qcom-linux-build/get_branch_to_build.py b/trigger-lt-qcom-linux-build/get_branch_to_build.py
new file mode 100755
index 0000000000..31aa24d258
--- /dev/null
+++ b/trigger-lt-qcom-linux-build/get_branch_to_build.py
@@ -0,0 +1,68 @@
+#!/usr/bin/env python3
+
+import os
+import errno
+import subprocess
+import sys
+import re
+
+TMPDIR='.gitbranchtrack'
+
+try:
+    os.makedirs(TMPDIR)
+except OSError as err:
+    if err.errno != errno.EEXIST:
+        raise
+
+search_branches = os.environ['KERNEL_BRANCHES'].split()
+remote_branches = subprocess.check_output("git branch -r", shell=True).decode("utf-8").split()
+
+build = False
+remote_name = os.getenv('GIT_REMOTE_NAME', 'origin')
+branch_name = ''
+previous_revision = ''
+revision = ''
+for sb in search_branches:
+    if (build):
+        break
+
+    rex = re.compile("%s/(?P<branch_name>%s)$" % (remote_name, sb))
+    for rb in remote_branches:
+        s = rex.search(rb)
+        if s:
+            last_revision = subprocess.check_output('git rev-parse %s' % rb, shell=True).decode("utf-8").strip()
+
+            branch_name = s.group('branch_name')
+            file_name = os.path.join(TMPDIR, re.sub("[^A-Za-z0-9._-]", "_", branch_name))
+            revisions = []
+            try:
+                f = open(file_name, 'r')
+                revisions = f.read().split()
+            except IOError as err:
+                if err.errno != errno.ENOENT:
+                    raise
+
+            if last_revision not in revisions:
+                with open(file_name, 'a+') as f:
+                    f.write("%s\n" % last_revision)
+
+                revision = last_revision
+                try:
+                    previous_revision = revisions[-1]
+                except:
+                    pass
+                build = True
+                break
+
+if build:
+    print("KERNEL_BRANCH=%s" % branch_name)
+    print("KERNEL_PREVIOUS_REVISION=%s" % previous_revision)
+    print("KERNEL_REVISION=%s" % revision)
+
+    print("GIT_BRANCH=%s/%s" % (remote_name, branch_name))
+    print("GIT_COMMIT=%s" % revision)
+    print("GIT_PREVIOUS_COMMIT=%s" % previous_revision)
+    print("GIT_PREVIOUS_SUCCESSFUL_COMMIT=%s" % previous_revision)
+    sys.exit(0)
+
+sys.exit(1)
diff --git a/trigger-lt-qcom-linux-build/postbuild.groovy b/trigger-lt-qcom-linux-build/postbuild.groovy
new file mode 100644
index 0000000000..0029daf128
--- /dev/null
+++ b/trigger-lt-qcom-linux-build/postbuild.groovy
@@ -0,0 +1,14 @@
+if (manager.build.result == hudson.model.Result.SUCCESS) {
+  def repo = manager.envVars["KERNEL_REPO_URL"]
+  def branch = manager.envVars["KERNEL_BRANCH"]
+  def revision = manager.envVars["KERNEL_REVISION"]
+  def configs = manager.envVars["KERNEL_CONFIGS_arm64"]
+
+  def desc = "&nbsp;<h2>Trigger settings</h2><br />"
+  desc += "&nbsp;<b>Repository:</b> ${repo}<br />"
+  desc += "&nbsp;<b>Branch:</b> ${branch}<br />"
+  desc += "&nbsp;<b>Revision:</b> ${revision}<br />"
+  desc += "&nbsp;<b>Configs:</b> ${configs}<br />"
+
+  manager.build.setDescription(desc)
+}
diff --git a/trigger-lt-qcom-linux-db820c-4.11.0.yaml b/trigger-lt-qcom-linux-db820c-4.11.0.yaml
deleted file mode 100644
index 17470862c0..0000000000
--- a/trigger-lt-qcom-linux-db820c-4.11.0.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-- job:
-    name: trigger-lt-qcom-linux-db820c-4.11.0
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro-landing-team-qualcomm-personnel:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'Trigger for QCOM LT kernel DB820c 4.11 branch'
-    scm:
-        - git:
-            url: https://git.linaro.org/git/landing-teams/working/qualcomm/kernel.git
-            refspec: +refs/heads/release/*:refs/remotes/origin/release/*
-            name: origin
-            branches:
-                - refs/heads/release/db820c/qcomlt-4.11
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            # bring in stable and mainline tags
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git
-            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
-
-            echo KERNEL_VERSION=$(make kernelversion) > qcomlt_parameters
-            echo KERNEL_DESCRIBE=$(git describe --always) >> qcomlt_parameters
-            echo KERNEL_BRANCH=$(echo ${GIT_BRANCH} | sed  's|origin/||') >> qcomlt_parameters
-            echo TARGET_REPO=linaro-overlay-buster >> qcomlt_parameters
-            echo KDEB_CHANGELOG_DIST=buster >> qcomlt_parameters
-            cat qcomlt_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'lt-qcom-linux'
-              condition: SUCCESS
-              property-file: qcomlt_parameters
diff --git a/trigger-lt-qcom-linux-integration.yaml b/trigger-lt-qcom-linux-integration.yaml
deleted file mode 100644
index 329dd20269..0000000000
--- a/trigger-lt-qcom-linux-integration.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-lt-qcom-linux-integration
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for LT Qualcomm Linux Integration build'
-    triggers:
-        - pollurl:
-            cron: 'H/5 * * * *'
-            polling-node: master
-            urls:
-              - url: 'https://storage.kernelci.org/qcom-lt/integration-linux-qcomlt/'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            pip install --user python-dateutil beautifulsoup4
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            python configs/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py \
-              > lt_qcom_linux_integration_parameters
-        - inject:
-            properties-file: lt_qcom_linux_integration_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project: lt-qcom-linux-integration
-              predefined-parameters: |
-                KERNEL_IMAGE_URL=${KERNEL_IMAGE_URL}
-                KERNEL_DT_URL=${KERNEL_DT_URL}
-                KERNEL_MODULES_URL=${KERNEL_MODULES_URL}
-                ROOTFS_URL=${ROOTFS_URL}
-              condition: SUCCESS
diff --git a/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py b/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py
deleted file mode 100644
index 8af4726fb0..0000000000
--- a/trigger-lt-qcom-linux-integration/get_latest_kernel_ci_build.py
+++ /dev/null
@@ -1,124 +0,0 @@
-#!/usr/bin/env python
-
-import sys
-import os
-import urllib2
-import urlparse
-import re
-import dateutil.parser
-
-from bs4 import BeautifulSoup, SoupStrainer
-
-
-def get_kernel_ci_build(url, arch_config, dt_file):
-    f = urllib2.urlopen(url)
-    page = f.read()
-    soup = BeautifulSoup(page, "html.parser")
-
-    last_build = -1
-    for tr in soup.select('table > tbody > tr'):
-        if 'Parent directory' in tr.text or 'last.commit' in tr.text:
-            continue
-
-        if last_build == -1:
-            last_build = tr
-        elif dateutil.parser.parse(tr.contents[2].text) > \
-                dateutil.parser.parse(last_build.contents[2].text):
-            last_build = tr
-
-    url = url + last_build.contents[0].text + arch_config
-
-    image_url = url + 'Image'
-    dt_url = url + dt_file
-    modules_url = url + 'modules.tar.xz'
-
-    return (image_url, dt_url, modules_url)
-
-
-def get_ramdisk_url(url):
-    f = urllib2.urlopen(url)
-    page = f.read()
-
-    base_url_p = urlparse.urlparse(url)
-    base_url = "%s://%s" % (base_url_p.scheme, base_url_p.netloc)
-    rex = re.compile('rpb-initramfs-image-test-.*\.rootfs\.cpio\.gz$')
-
-    ramdisk_url = ''
-    soup = BeautifulSoup(page, "html.parser", parse_only=SoupStrainer("a"))
-    for line in soup.find_all('a', href=True):
-        s = rex.search(line['href'])
-        if s:
-            ramdisk_url = base_url + line['href']
-            break
-
-    return ramdisk_url
-
-
-def validate_url(url):
-    request = urllib2.Request(url)
-    request.get_method = lambda: 'HEAD'
-    urllib2.urlopen(request)
-
-
-def validate_if_already_built(url, artifacts_urls):
-    f = urllib2.urlopen(url)
-    page = f.read()
-
-    max_search = 8
-    search_count = 0
-    soup = BeautifulSoup(page, "html.parser")
-    for tr in soup.select('table > tr'):
-        if 'Parent Directory' in tr.text or 'latest' in tr.text:
-            continue
-
-        build_url = url + tr.contents[3].text.strip().rstrip()
-        f = urllib2.urlopen(build_url)
-        build_page = f.read()
-
-        if all(u in build_page for u in artifacts_urls):
-            print("INFO: Build exists %s in URL: %s" %
-                  (str(artifacts_urls), build_url))
-            sys.exit(1)
-
-        search_count = search_count + 1
-        if search_count > max_search:
-            break
-
-
-def main():
-    kernel_ci_base_url = os.environ.get('KERNEL_CI_BASE_URL',
-                                        'https://storage.kernelci.org/qcom-lt/integration-linux-qcomlt/')
-    kernel_ci_arch_config = os.environ.get('KERNEL_CI_ARCH_CONFIG',
-                                           'arm64/defconfig+CONFIG_CPU_BIG_ENDIAN=y/')
-    kernel_ci_dt_file = os.environ.get('KERNEL_CI_DT_FILE',
-                                       'dtbs/qcom/apq8016-sbc.dtb')
-    ramdisk_base_url = os.environ.get('RAMDISK_BASE_URL',
-                                      'https://snapshots.linaro.org/96boards/dragonboard410c/linaro/openembedded/rocko/latest/rpb/')
-    builds_url = os.environ.get('BUILDS_URL',
-                                'https://snapshots.linaro.org/96boards/dragonboard410c/linaro/linux-integration/')
-
-    (image_url, dt_url, modules_url) = get_kernel_ci_build(kernel_ci_base_url,
-                                                           kernel_ci_arch_config, kernel_ci_dt_file)
-    print("KERNEL_IMAGE_URL=%s" % image_url)
-    validate_url(image_url)
-    print("KERNEL_DT_URL=%s" % dt_url)
-    validate_url(dt_url)
-    print("KERNEL_MODULES_URL=%s" % modules_url)
-    validate_url(modules_url)
-
-    ramdisk_url = get_ramdisk_url(ramdisk_base_url)
-    print('ROOTFS_URL=%s' % ramdisk_url)
-    validate_url(ramdisk_url)
-
-    validate_if_already_built(builds_url, (image_url, dt_url, modules_url,
-                              ramdisk_url))
-
-
-if __name__ == '__main__':
-    try:
-        ret = main()
-    except Exception:
-        ret = 1
-        import traceback
-        traceback.print_exc()
-    sys.exit(ret)
diff --git a/trigger-lt-qcom-linux.yaml b/trigger-lt-qcom-linux.yaml
new file mode 100644
index 0000000000..e09e69bb0d
--- /dev/null
+++ b/trigger-lt-qcom-linux.yaml
@@ -0,0 +1,124 @@
+- project:
+    name: trigger-lt-qcom-linux
+
+    # defaults
+    repo: 'https://git.codelinaro.org/linaro/qcomlt/kernel.git'
+    configs_arm64: 'defconfig distro.config'
+    configs_arm: 'multi_v7_defconfig distro.config'
+    branch: 'release/qcomlt-{version}'
+    trigger:
+      - 'refs/heads/release/qcomlt-{version}'
+    refspec: '+refs/heads/*:refs/remotes/origin/*'
+    debian: ''
+
+    jobs:
+        - 'trigger-lt-qcom-linux-{version}':
+            version: '5.7'
+            flavor: 'release'
+            debian: 'linux'
+        - 'trigger-lt-qcom-linux-{version}':
+            version: '5.9'
+            flavor: 'release'
+            debian: 'linux'
+        - 'trigger-lt-qcom-linux-{version}':
+            version: '5.10'
+            flavor: 'release'
+            debian: 'linux'
+        - 'trigger-lt-qcom-linux-{version}':
+            version: '5.13'
+            flavor: 'release'
+            debian: 'linux'
+        - 'trigger-lt-qcom-linux-{version}':
+            version: '5.15'
+            flavor: 'release'
+            debian: 'linux'
+        - 'trigger-lt-qcom-linux-{version}':
+            branch: 'integration-linux-qcomlt'
+            trigger:
+              - 'refs/heads/{branch}'
+            version: 'integration'
+            flavor: 'integration'
+        - 'trigger-lt-qcom-linux-{version}':
+            branch: 'master'
+            trigger:
+              - 'refs/tags/v4.*'
+              - 'refs/tags/v5.*'
+              - 'refs/tags/v6.*'
+            refspec: '+refs/heads/master:refs/remotes/origin/master +refs/tags/*:refs/remotes/origin/tags/*'
+            version: 'mainline'
+            repo: 'https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
+            configs_arm64: 'defconfig'
+            configs_arm: 'multi_v7_defconfig'
+            flavor: 'mainline'
+
+- job-template:
+    name: 'trigger-lt-qcom-linux-{version}'
+    project-type: freestyle
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            linaro-qualcomm-ci:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 1
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Qualcomm LT kernel {branch} branch'
+    scm:
+        - git:
+            url: '{repo}'
+            refspec: '{refspec}'
+            name: origin
+            branches: '{trigger}'
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+    triggers:
+        - pollscm:
+            cron: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${{BUILD_NUMBER}}-${{GIT_REVISION,length=8}}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+
+            # bring in stable and mainline tags
+            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/torvalds/linux.git
+            git fetch --tags https://kernel.googlesource.com/pub/scm/linux/kernel/git/stable/linux-stable.git
+
+            echo KERNEL_VERSION=$(make kernelversion) > qcomlt_parameters
+            echo KERNEL_DESCRIBE=$(git describe --always) >> qcomlt_parameters
+            echo KERNEL_REPO_URL={repo} >> qcomlt_parameters
+            if [ "{flavor}" = "mainline" ]; then
+              echo KERNEL_BRANCH=master >> qcomlt_parameters
+            else
+              echo KERNEL_BRANCH=$(echo $GIT_BRANCH | sed  's|origin/||') >> qcomlt_parameters
+            fi
+            echo KERNEL_FLAVOR={flavor} >> qcomlt_parameters
+            echo KERNEL_DEBIAN={debian} >> qcomlt_parameters
+            echo TARGET_REPO=linaro-overlay-sid >> qcomlt_parameters
+            echo KDEB_CHANGELOG_DIST=unstable >> qcomlt_parameters
+
+            echo KERNEL_CONFIGS_arm={configs_arm} >> qcomlt_parameters
+            echo KERNEL_CONFIGS_arm64={configs_arm64} >> qcomlt_parameters
+            cat qcomlt_parameters
+    publishers:
+        - trigger-parameterized-builds:
+            - project:
+                - 'lt-qcom-linux'
+              condition: SUCCESS
+              property-file: qcomlt_parameters
+        - email-ext:
+            recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org'
+            failure: true
+            still-failing: true
diff --git a/trigger-lt-qcom-openembedded-images-rocko.yaml b/trigger-lt-qcom-openembedded-images-rocko.yaml
deleted file mode 100644
index 188dee7cc4..0000000000
--- a/trigger-lt-qcom-openembedded-images-rocko.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-- job:
-    name: trigger-lt-qcom-openembedded-images-rocko
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 1
-            num-to-keep: 30
-            artifact-num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for Qualcomm OE builds (rocko)'
-    scm:
-        - repo:
-            manifest-url: https://github.com/96boards/oe-rpb-manifest.git
-            manifest-branch: qcom/rocko
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'lt-qcom-openembedded-rpb-rocko'
diff --git a/trigger-ltp-upstream.yaml b/trigger-ltp-upstream.yaml
index 5a8b7a615e..5c0fb6455e 100644
--- a/trigger-ltp-upstream.yaml
+++ b/trigger-ltp-upstream.yaml
@@ -11,7 +11,7 @@
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for LTP upstream (master)'
     scm:
         - git:
diff --git a/trigger-luajit-aarch64.yaml b/trigger-luajit-aarch64.yaml
deleted file mode 100644
index b43d4920a7..0000000000
--- a/trigger-luajit-aarch64.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    name: trigger-luajit-aarch64
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: build
-    display-name: 'Trigger for LuaJIT CI (Aarch64)'
-    scm:
-        - git:
-            url: https://github.com/cbaylis/luajit-aarch64/
-            refspec: +refs/heads/aarch64-v2.1-new:refs/remotes/origin/aarch64-v2.1-new
-            name: origin
-            branches:
-                - refs/heads/aarch64-v2.1-new
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'luajit-aarch64'
diff --git a/trigger-mmwg-oe-dunfell.yaml b/trigger-mmwg-oe-dunfell.yaml
new file mode 100644
index 0000000000..3d2ad9dd01
--- /dev/null
+++ b/trigger-mmwg-oe-dunfell.yaml
@@ -0,0 +1,22 @@
+- job:
+    name: trigger-mmwg-oe-dunfell
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for MMWG master build'
+    triggers:
+        # Run the builds every Monday, Wednesday, and Friday in the morning
+        - timed: 'H H(0-6) * * 1,3,5'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: 'mmwg-openembedded-dunfell'
diff --git a/trigger-monthly.yaml b/trigger-monthly.yaml
new file mode 100644
index 0000000000..4723d56fb1
--- /dev/null
+++ b/trigger-monthly.yaml
@@ -0,0 +1,23 @@
+- job:
+    name: trigger-monthly
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger to launch monthly rebuilds'
+    triggers:
+        - timed: '@monthly'
+    wrappers:
+        - timestamps
+    builders:
+        - trigger-builds:
+            - project: '96boards-b2260'
+        - trigger-builds:
+            - project: '96boards-hikey-debian'
diff --git a/trigger-odp-sanity-check.yaml b/trigger-odp-sanity-check.yaml
new file mode 100644
index 0000000000..7d5160ac5a
--- /dev/null
+++ b/trigger-odp-sanity-check.yaml
@@ -0,0 +1,75 @@
+- job:
+    name: trigger-odp-sanity-check
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+        - github:
+            url: https://github.com/Linaro/odp
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'https://lng.validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'odp'
+        - string:
+            name: QA_SERVER_TEAM
+            default: 'lng'
+    disabled: false
+    node: master
+    display-name: 'Trigger for ODP sanity check'
+    scm:
+        - git:
+            url: https://github.com/Linaro/odp.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+        - shell: |
+            #!/bin/bash -e
+
+            rm -rf configs odp-ci-lava
+            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+            git clone --depth 1 https://github.com/Linaro/odp-ci-lava.git
+
+            python configs/openembedded-lkft/submit_for_testing.py \
+              --device-type thunderx \
+              --build-number ${BUILD_NUMBER} \
+              --lava-server ${LAVA_SERVER} \
+              --qa-server ${QA_SERVER} \
+              --qa-server-team ${QA_SERVER_TEAM} \
+              --qa-server-project ${QA_SERVER_PROJECT} \
+              --git-commit ${ghprbActualCommit} \
+              --template-path odp-ci-lava/multinodes \
+              --template-names thunderx-lng03-ubuntu-17.10.yaml
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
diff --git a/trigger-oe-recipe-gator.yaml b/trigger-oe-recipe-gator.yaml
deleted file mode 100644
index 85865ba0a4..0000000000
--- a/trigger-oe-recipe-gator.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-- job:
-    name: trigger-oe-recipe-gator
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for GATOR recipe'
-    scm:
-        - git:
-            url: http://git.linaro.org/arm/ds5/gator.git
-            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
-            name: origin
-            branches:
-                - refs/heads/linaro
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf meta-linaro
-            }
-
-            git clone --depth 1 http://git.linaro.org/openembedded/meta-linaro.git
-            gator_recipe=`find meta-linaro -type f -name 'gator_git.bb'`
-            sed -i "s|^SRCREV = .*|SRCREV = \"${GIT_COMMIT}\"|" ${gator_recipe}
-            sed -i "s|^PV = .*|PV = \"`git describe --tags | cut -d'-' -f2`+git\${SRCPV}\"|" ${gator_recipe}
-
-            cd meta-linaro && git diff > ${WORKSPACE}/gator-recipe-update.patch
-    publishers:
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org, koen.kooi@linaro.org'
-            attachments: '*.patch'
-            always: true
diff --git a/trigger-oe-recipe-kselftests-next.yaml b/trigger-oe-recipe-kselftests-next.yaml
deleted file mode 100644
index 43a953a435..0000000000
--- a/trigger-oe-recipe-kselftests-next.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-- job:
-    name: trigger-oe-recipe-kselftests-next
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for kselftests from linux-next (new update notification)'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -x
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              rm -rf meta-rpb
-            }
-
-            tag=$(git describe --tags --abbrev=0)
-            version=$(echo ${tag} | cut -d'-' -f3)
-
-            git clone -b morty --depth 1 https://github.com/96boards/meta-rpb.git
-            recipe=$(find meta-rpb -type f -name 'kselftests-next_git.bb')
-            sed -i "s|^SRCREV = .*|SRCREV = \"${GIT_COMMIT}\"|" ${recipe}
-            sed -i "s|^PV = .*|PV = \"${version}+git\${SRCPV}\"|" ${recipe}
-
-            cd meta-rpb && git diff > ${WORKSPACE}/kselftests-next-recipe-update.patch
-    publishers:
-        - email-ext:
-            recipients: 'fathi.boudra@linaro.org'
-            body: |
-                Project: ${PROJECT_NAME}
-                Build number: ${BUILD_NUMBER}
-                Build status: ${BUILD_STATUS}
-                Build URL: ${BUILD_URL}
-                Build summary:
-
-                New upstream commit: ${GIT_URL} ${GIT_BRANCH}
-
-                Please, update OpenEmbedded recipe to ${GIT_COMMIT}.
-            attachments: '*.patch'
-            always: true
diff --git a/trigger-ofp-perf-tests.yaml b/trigger-ofp-perf-tests.yaml
index c1a13e8b3f..87551b8ff7 100644
--- a/trigger-ofp-perf-tests.yaml
+++ b/trigger-ofp-perf-tests.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
diff --git a/trigger-openembedded-armv8-luvos-master.yaml b/trigger-openembedded-armv8-luvos-master.yaml
index 70c6d20ec9..352428647a 100644
--- a/trigger-openembedded-armv8-luvos-master.yaml
+++ b/trigger-openembedded-armv8-luvos-master.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for luvOS - ARMv8 (master)'
     scm:
         - git:
diff --git a/trigger-openembedded-armv8-luvos-next.yaml b/trigger-openembedded-armv8-luvos-next.yaml
index d795752bb3..3c9ee0a3cf 100644
--- a/trigger-openembedded-armv8-luvos-next.yaml
+++ b/trigger-openembedded-armv8-luvos-next.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for luvOS - ARMv8 (next)'
     scm:
         - git:
diff --git a/trigger-openembedded-lkft-linaro-hikey-stable-4.4.yaml b/trigger-openembedded-lkft-linaro-hikey-stable-4.4.yaml
deleted file mode 100644
index 985b751669..0000000000
--- a/trigger-openembedded-lkft-linaro-hikey-stable-4.4.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linaro-hikey-stable-4.4
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable 4.4 + HiKey'
-    scm:
-        - git:
-            url: https://git.linaro.org/people/sumit.semwal/linux-lts.git
-            refspec: +refs/tags/*:refs/remotes/origin/tags/*
-            name: origin
-            branches:
-                - refs/tags/4.4.*-hikey
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_BRANCH=$(git describe --tags --abbrev=0) > lkft_parameters
-            echo KERNEL_DESCRIBE=$(git describe --always --tags) >> lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linaro-hikey-stable-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, sumit.semwal@linaro.org, fathi.boudra@linaro.org, milosz.wasilewski@linaro.org'
-            body: |
-                Project: ${PROJECT_NAME}
-                Build number: ${BUILD_NUMBER}
-                Build status: ${BUILD_STATUS}
-                Build URL: ${BUILD_URL}
-
-                New upstream tag:
-                https://git.linaro.org/people/sumit.semwal/linux-lts.git ${GIT_BRANCH} ${GIT_COMMIT}
-            always: true
diff --git a/trigger-openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml b/trigger-openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
deleted file mode 100644
index 6799336069..0000000000
--- a/trigger-openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linaro-hikey-stable-rc-4.4
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: LINUX_TAG_PATTERN
-            default: "4.4.*-rc*-hikey-*"
-            description: "Linux tag to build (from lkft/arm64-stable-rc and linux-stable trees)."
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable RC 4.4 + HiKey'
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash -e
-
-            test -d arm64-stable-rc || git init arm64-stable-rc
-            cd arm64-stable-rc
-
-            git remote add arm64-stable-rc https://git.linaro.org/lkft/arm64-stable-rc.git || true
-            git remote add linux-stable-4.4 https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git || true
-
-            git fetch --no-tags arm64-stable-rc  +refs/tags/4.4.*:refs/tags/4.4.*
-            git fetch --no-tags linux-stable-4.4 +refs/tags/v4.4.*:refs/tags/v4.4.*
-
-            tag=$(git tag -l "${LINUX_TAG_PATTERN}" | sort -V | tail -n1)
-            git checkout ${tag}
-
-            echo KERNEL_BRANCH=$(git describe --tags --abbrev=0) > ${WORKSPACE}/lkft_parameters
-            echo KERNEL_DESCRIBE=$(git describe --always --tags) >> ${WORKSPACE}/lkft_parameters
-            echo SRCREV_kernel=$(git rev-parse HEAD) >> ${WORKSPACE}/lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> ${WORKSPACE}/lkft_parameters
-            cat ${WORKSPACE}/lkft_parameters
-
-            . ${WORKSPACE}/lkft_parameters
-            echo "#${BUILD_NUMBER}-${SRCREV_kernel:0:8}" > ${WORKSPACE}/version.txt
-        - build-name-setter:
-            name: 'version.txt'
-            file: true
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linaro-hikey-stable-rc-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
-        - email-ext:
-            recipients: 'lkft-maintainers@lists.linaro.org, sumit.semwal@linaro.org, fathi.boudra@linaro.org, milosz.wasilewski@linaro.org'
-            body: |
-                Project: ${PROJECT_NAME}
-                Build number: ${BUILD_NUMBER}
-                Build status: ${BUILD_STATUS}
-                Build URL: ${BUILD_URL}
-
-                New upstream tag:
-                https://git.linaro.org/lkft/arm64-stable-rc.git
-            always: true
diff --git a/trigger-openembedded-lkft-linux-mainline.yaml b/trigger-openembedded-lkft-linux-mainline.yaml
deleted file mode 100644
index 225e7ffea3..0000000000
--- a/trigger-openembedded-lkft-linux-mainline.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-mainline
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'master'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Mainline'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-mainline'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-next.yaml b/trigger-openembedded-lkft-linux-next.yaml
deleted file mode 100644
index 762f88b6da..0000000000
--- a/trigger-openembedded-lkft-linux-next.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-next
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'master'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Next'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-next'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-4.13.yaml b/trigger-openembedded-lkft-linux-stable-4.13.yaml
deleted file mode 100644
index e7ced3fe7f..0000000000
--- a/trigger-openembedded-lkft-linux-stable-4.13.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-4.13
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.13.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable 4.13.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-4.13'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-4.14.yaml b/trigger-openembedded-lkft-linux-stable-4.14.yaml
deleted file mode 100644
index 93a7d051ae..0000000000
--- a/trigger-openembedded-lkft-linux-stable-4.14.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-4.14
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.14.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable 4.14.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-4.15.yaml b/trigger-openembedded-lkft-linux-stable-4.15.yaml
deleted file mode 100644
index c89696099a..0000000000
--- a/trigger-openembedded-lkft-linux-stable-4.15.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-4.15
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.15.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable 4.15.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-4.15'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-4.4.yaml b/trigger-openembedded-lkft-linux-stable-4.4.yaml
deleted file mode 100644
index 3e1278345c..0000000000
--- a/trigger-openembedded-lkft-linux-stable-4.4.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-4.4
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.4.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable 4.4.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-4.9.yaml b/trigger-openembedded-lkft-linux-stable-4.9.yaml
deleted file mode 100644
index 4726c2742c..0000000000
--- a/trigger-openembedded-lkft-linux-stable-4.9.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-4.9
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.9.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable 4.9.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rc-4.13.yaml b/trigger-openembedded-lkft-linux-stable-rc-4.13.yaml
deleted file mode 100644
index 41f4b55560..0000000000
--- a/trigger-openembedded-lkft-linux-stable-rc-4.13.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-rc-4.13
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.13.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable RC 4.13.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) >> lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-rc-4.13'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rc-4.14.yaml b/trigger-openembedded-lkft-linux-stable-rc-4.14.yaml
deleted file mode 100644
index b6cce93aed..0000000000
--- a/trigger-openembedded-lkft-linux-stable-rc-4.14.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-rc-4.14
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.14.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable RC 4.14.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) >> lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-rc-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rc-4.15.yaml b/trigger-openembedded-lkft-linux-stable-rc-4.15.yaml
deleted file mode 100644
index ec61c59a43..0000000000
--- a/trigger-openembedded-lkft-linux-stable-rc-4.15.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-rc-4.15
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.15.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable RC 4.15.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) >> lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-rc-4.15'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rc-4.4.yaml b/trigger-openembedded-lkft-linux-stable-rc-4.4.yaml
deleted file mode 100644
index 49bbe57fb0..0000000000
--- a/trigger-openembedded-lkft-linux-stable-rc-4.4.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-rc-4.4
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.4.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable RC 4.4.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) >> lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-rc-4.4'
-                - 'linaro-hikey-stable-rc-4.4-merge-and-tag'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rc-4.9.yaml b/trigger-openembedded-lkft-linux-stable-rc-4.9.yaml
deleted file mode 100644
index ee9bc12c9f..0000000000
--- a/trigger-openembedded-lkft-linux-stable-rc-4.9.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-linux-stable-rc-4.9
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-4.9.y'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - Linux Stable RC 4.9.y'
-    scm:
-        - git:
-            url: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm:
-            cron: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) >> lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-linux-stable-rc-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rt-4.4.yaml b/trigger-openembedded-lkft-linux-stable-rt-4.4.yaml
index f50e4d7cdc..0e45363fe0 100644
--- a/trigger-openembedded-lkft-linux-stable-rt-4.4.yaml
+++ b/trigger-openembedded-lkft-linux-stable-rt-4.4.yaml
@@ -15,7 +15,7 @@
             name: KERNEL_BRANCH
             default: 'v4.4-rt'
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for LKFT - Linux Stable RT 4.4'
     scm:
         - git:
@@ -36,6 +36,7 @@
     builders:
         - shell: |
             #!/bin/bash -e
+            git clean -fdx
             echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
             echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
             echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
diff --git a/trigger-openembedded-lkft-linux-stable-rt-4.9.yaml b/trigger-openembedded-lkft-linux-stable-rt-4.9.yaml
index e1d9d8a0a7..31807ca48f 100644
--- a/trigger-openembedded-lkft-linux-stable-rt-4.9.yaml
+++ b/trigger-openembedded-lkft-linux-stable-rt-4.9.yaml
@@ -15,7 +15,7 @@
             name: KERNEL_BRANCH
             default: 'v4.9-rt'
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for LKFT - Linux Stable RT 4.9'
     scm:
         - git:
@@ -36,6 +36,7 @@
     builders:
         - shell: |
             #!/bin/bash -e
+            git clean -fdx
             echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
             echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
             echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.14-rt-test.yaml b/trigger-openembedded-lkft-lsk-4.14-rt-test.yaml
deleted file mode 100644
index 235f9fcc90..0000000000
--- a/trigger-openembedded-lkft-lsk-4.14-rt-test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.14-rt-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14-rt-test'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.14 RT test'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.14-rt-test'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.14-rt.yaml b/trigger-openembedded-lkft-lsk-4.14-rt.yaml
deleted file mode 100644
index 2049376512..0000000000
--- a/trigger-openembedded-lkft-lsk-4.14-rt.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.14-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14-rt'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.14 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.14-rt'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.14-test.yaml b/trigger-openembedded-lkft-lsk-4.14-test.yaml
deleted file mode 100644
index 4cfeaa34b9..0000000000
--- a/trigger-openembedded-lkft-lsk-4.14-test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.14-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14-test'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.14 test'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.14-test'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.14.yaml b/trigger-openembedded-lkft-lsk-4.14.yaml
deleted file mode 100644
index 88cc7440e2..0000000000
--- a/trigger-openembedded-lkft-lsk-4.14.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.14
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.14'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.14'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.14'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.4-rt-test.yaml b/trigger-openembedded-lkft-lsk-4.4-rt-test.yaml
deleted file mode 100644
index f782678e40..0000000000
--- a/trigger-openembedded-lkft-lsk-4.4-rt-test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.4-rt-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4-rt-test'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.4 RT test'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.4-rt-test'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.4-rt.yaml b/trigger-openembedded-lkft-lsk-4.4-rt.yaml
deleted file mode 100644
index 2f82a62b25..0000000000
--- a/trigger-openembedded-lkft-lsk-4.4-rt.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.4-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4-rt'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.4 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.4-rt'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.4-test.yaml b/trigger-openembedded-lkft-lsk-4.4-test.yaml
deleted file mode 100644
index 0f1ae0d3dd..0000000000
--- a/trigger-openembedded-lkft-lsk-4.4-test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.4-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4-test'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.4 test'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.4-test'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.4.yaml b/trigger-openembedded-lkft-lsk-4.4.yaml
deleted file mode 100644
index e401aa7716..0000000000
--- a/trigger-openembedded-lkft-lsk-4.4.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.4
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.4'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.4'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.4'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.9-rt-test.yaml b/trigger-openembedded-lkft-lsk-4.9-rt-test.yaml
deleted file mode 100644
index c08ad679b5..0000000000
--- a/trigger-openembedded-lkft-lsk-4.9-rt-test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.9-rt-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9-rt-test'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.9 RT test'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.9-rt-test'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.9-rt.yaml b/trigger-openembedded-lkft-lsk-4.9-rt.yaml
deleted file mode 100644
index f3c7b8c3b2..0000000000
--- a/trigger-openembedded-lkft-lsk-4.9-rt.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.9-rt
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9-rt'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.9 RT'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.9-rt'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.9-test.yaml b/trigger-openembedded-lkft-lsk-4.9-test.yaml
deleted file mode 100644
index bfb096c0c9..0000000000
--- a/trigger-openembedded-lkft-lsk-4.9-test.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.9-test
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9-test'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.9 test'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.9-test'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-lkft-lsk-4.9.yaml b/trigger-openembedded-lkft-lsk-4.9.yaml
deleted file mode 100644
index 8b75952bad..0000000000
--- a/trigger-openembedded-lkft-lsk-4.9.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-lkft-lsk-4.9
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    parameters:
-        - string:
-            name: KERNEL_BRANCH
-            default: 'linux-linaro-lsk-v4.9'
-    disabled: false
-    node: master
-    display-name: 'Trigger for LKFT - LSK 4.9'
-    scm:
-        - git:
-            url: https://git.linaro.org/kernel/linux-linaro-stable.git
-            refspec: +refs/heads/${KERNEL_BRANCH}:refs/remotes/origin/${KERNEL_BRANCH}
-            name: origin
-            branches:
-                - origin/${KERNEL_BRANCH}
-            skip-tag: true
-            shallow-clone: false
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - shell: |
-            #!/bin/bash -e
-            echo KERNEL_DESCRIBE=$(git describe --always) > lkft_parameters
-            echo SRCREV_kernel=${GIT_COMMIT} >> lkft_parameters
-            echo MAKE_KERNELVERSION=$(make kernelversion) >> lkft_parameters
-            cat lkft_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project:
-                - 'openembedded-lkft-lsk-4.9'
-              condition: SUCCESS
-              property-file: lkft_parameters
diff --git a/trigger-openembedded-rootfs-external-toolchain.yaml b/trigger-openembedded-rootfs-external-toolchain.yaml
deleted file mode 100644
index a90cd0b94d..0000000000
--- a/trigger-openembedded-rootfs-external-toolchain.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-- job:
-    name: trigger-openembedded-rootfs-external-toolchain
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for OpenEmbedded rootfs with external toolchain'
-    triggers:
-        - pollurl:
-            cron: '@daily'
-            polling-node: build
-            urls:
-              - url: 'http://abe.tcwglab.linaro.org/binaries/'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-
-            # FIXME: figure out the new toolchain URLs
-            toolchain_armv7a_url='http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-arm-linux-gnueabihf-4.9-2014.09_linux.tar.xz'
-            toolchain_armv8_url='http://releases.linaro.org/14.09/components/toolchain/binaries/gcc-linaro-aarch64-linux-gnu-4.9-2014.09_linux.tar.xz'
-
-            cat << EOF > toolchain_url_parameters
-            toolchain_armv7a_url=${toolchain_armv7a_url}
-            toolchain_armv8_url=${toolchain_armv8_url}
-            EOF
-        - inject:
-            properties-file: toolchain_url_parameters
-    publishers:
-        - trigger-parameterized-builds:
-            - project: openembedded-armv7a-rootfs-external-toolchain
-              predefined-parameters: toolchain_url=${toolchain_armv7a_url}
-              condition: SUCCESS
-            - project: openembedded-armv8-rootfs-external-toolchain
-              predefined-parameters: toolchain_url=${toolchain_armv8_url}
-              condition: SUCCESS
diff --git a/trigger-optee-build-sanity-check.yaml b/trigger-optee-build-sanity-check.yaml
index 64f8e67bf2..ca45ee49e9 100644
--- a/trigger-optee-build-sanity-check.yaml
+++ b/trigger-optee-build-sanity-check.yaml
@@ -13,7 +13,7 @@
         - github:
             url: https://github.com/OP-TEE/build
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for OP-TEE Build sanity check'
     scm:
         - git:
diff --git a/trigger-optee-client-sanity-check.yaml b/trigger-optee-client-sanity-check.yaml
index f8fae97606..8b9072317d 100644
--- a/trigger-optee-client-sanity-check.yaml
+++ b/trigger-optee-client-sanity-check.yaml
@@ -13,7 +13,7 @@
         - github:
             url: https://github.com/OP-TEE/optee_client
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for OP-TEE Client sanity check'
     scm:
         - git:
@@ -41,5 +41,6 @@
             file: true
         - trigger-builds:
             - project:
-                - 'android-hikey-optee-o'
+                - 'android-hikey-optee-p'
               current-parameters: true
+              block: true
diff --git a/trigger-optee-daily.yaml b/trigger-optee-daily.yaml
index 8ab0b7273d..68c3e60b25 100644
--- a/trigger-optee-daily.yaml
+++ b/trigger-optee-daily.yaml
@@ -11,7 +11,7 @@
             days-to-keep: 90
             num-to-keep: 90
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for daily OP-TEE jobs'
     triggers:
         - timed: '@daily'
diff --git a/trigger-optee-examples-sanity-check.yaml b/trigger-optee-examples-sanity-check.yaml
new file mode 100644
index 0000000000..a8e4e08c82
--- /dev/null
+++ b/trigger-optee-examples-sanity-check.yaml
@@ -0,0 +1,46 @@
+- job:
+    name: trigger-optee-examples-sanity-check
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+        - github:
+            url: https://github.com/linaro-swg/optee_examples
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for OP-TEE Examples sanity check'
+    scm:
+        - git:
+            url: https://github.com/linaro-swg/optee_examples.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - trigger-builds:
+            - project:
+                - 'android-hikey-optee-p'
+              current-parameters: true
+              block: true
diff --git a/trigger-optee-kmgk-sanity-check.yaml b/trigger-optee-kmgk-sanity-check.yaml
new file mode 100644
index 0000000000..58932d0ce1
--- /dev/null
+++ b/trigger-optee-kmgk-sanity-check.yaml
@@ -0,0 +1,46 @@
+- job:
+    name: trigger-optee-kmgk-sanity-check
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+        - github:
+            url: https://github.com/linaro-swg/kmgk
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for OP-TEE KMGK sanity check'
+    scm:
+        - git:
+            url: https://github.com/linaro-swg/kmgk.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - trigger-builds:
+            - project:
+                - 'android-hikey-optee-p'
+              current-parameters: true
+              block: true
diff --git a/trigger-optee-os-sanity-check.yaml b/trigger-optee-os-sanity-check.yaml
index 614213e59b..8f31dcf461 100644
--- a/trigger-optee-os-sanity-check.yaml
+++ b/trigger-optee-os-sanity-check.yaml
@@ -13,7 +13,7 @@
         - github:
             url: https://github.com/OP-TEE/optee_os
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for OP-TEE Trusted OS sanity check'
     scm:
         - git:
@@ -41,5 +41,6 @@
             file: true
         - trigger-builds:
             - project:
-                - 'android-hikey-optee-o'
+                - 'android-hikey-optee-p'
               current-parameters: true
+              block: true
diff --git a/trigger-optee-test-sanity-check.yaml b/trigger-optee-test-sanity-check.yaml
new file mode 100644
index 0000000000..ff85bcd002
--- /dev/null
+++ b/trigger-optee-test-sanity-check.yaml
@@ -0,0 +1,46 @@
+- job:
+    name: trigger-optee-test-sanity-check
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+        - github:
+            url: https://github.com/OP-TEE/optee_test
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for OP-TEE Test sanity check'
+    scm:
+        - git:
+            url: https://github.com/OP-TEE/optee_test.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - trigger-builds:
+            - project:
+                - 'android-hikey-optee-p'
+              current-parameters: true
+              block: true
diff --git a/trigger-private-ci-job-configs.yaml b/trigger-private-ci-job-configs.yaml
new file mode 100644
index 0000000000..4c79119237
--- /dev/null
+++ b/trigger-private-ci-job-configs.yaml
@@ -0,0 +1,71 @@
+- job:
+    name: trigger-private-ci-job-configs
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            everyone-flat:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 200
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for private CI jobs'
+    triggers:
+        - gerrit:
+            server-name: 'dev-private-review.linaro.org'
+            trigger-on:
+                - change-merged-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'ci/job/configs'
+                  branches:
+                    - branch-pattern: 'master'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: JJB_USER
+                variable: JJB_USER
+        - credentials-binding:
+            - text:
+                credential-id: JJB_PASSWORD
+                variable: JJB_PASSWORD
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: DEV_PRIVATE_KEY
+                variable: DEV_PRIVATE_KEY
+        - credentials-binding:
+            - text:
+                credential-id: AUTH_TOKEN
+                variable: AUTH_TOKEN
+        - ssh-agent-credentials:
+                users:
+                    - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - shell:
+            !include-raw: trigger-private-ci-job-configs/poll-jobs.sh
+    publishers:
+        - email:
+            recipients: 'riku.voipio@linaro.org ben.copeland@linaro.org'
diff --git a/trigger-private-ci-job-configs/poll-jobs.sh b/trigger-private-ci-job-configs/poll-jobs.sh
new file mode 100755
index 0000000000..78033a3213
--- /dev/null
+++ b/trigger-private-ci-job-configs/poll-jobs.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+set -ex
+
+echo ""
+echo "########################################################################"
+echo "    Gerrit Environment"
+env |grep '^GERRIT'
+echo "########################################################################"
+
+git config --global user.name "Linaro CI"
+git config --global user.email "ci_notify@linaro.org"
+
+rm -rf ${WORKSPACE}/*
+
+git clone -b ${GERRIT_BRANCH} --depth 2 ssh://git@dev-private-review.linaro.org/${GERRIT_PROJECT} gerrit-project
+cd gerrit-project
+git fetch ssh://git@dev-private-review.linaro.org/${GERRIT_PROJECT} ${GERRIT_REFSPEC}
+git checkout -q FETCH_HEAD
+# Overlay changes on top of ci/job/configs
+case ${GERRIT_PROJECT} in
+	lkft/ci/job/configs)
+		cd ..
+		git clone --depth 1 https://git.linaro.org/ci/job/configs.git ci-job-configs
+		cp -axf -t ci-job-configs gerrit-project/*
+		cd ci-job-configs
+		git add . && git commit -m "Import changes from ${GERRIT_PROJECT}"
+		export GERRIT_PATCHSET_REVISION=$(git rev-parse HEAD)
+		;;
+esac
+
+export GIT_PREVIOUS_COMMIT=$(git rev-parse HEAD~1)
+export GIT_COMMIT=${GERRIT_PATCHSET_REVISION}
+jenkins-jobs --version
+wget -q https://git.linaro.org/ci/job/configs.git/plain/run-jjb.py -O run-jjb.py
+python3 run-jjb.py
+
diff --git a/trigger-private-lkft-ci-job-configs.yaml b/trigger-private-lkft-ci-job-configs.yaml
new file mode 100644
index 0000000000..570852d787
--- /dev/null
+++ b/trigger-private-lkft-ci-job-configs.yaml
@@ -0,0 +1,68 @@
+- job:
+    name: trigger-private-lkft-ci-job-configs
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            kv-team:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 200
+    disabled: false
+    node: triggers
+    display-name: 'CI job configs deployment for LKFT LT Private Jobs'
+    triggers:
+        - gerrit:
+            server-name: 'dev-private-review.linaro.org'
+            trigger-on:
+                - change-merged-event
+            projects:
+                - project-compare-type: 'PLAIN'
+                  project-pattern: 'lkft/ci/job/configs'
+                  branches:
+                    - branch-pattern: 'master'
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: JJB_USER
+                variable: JJB_USER
+        - credentials-binding:
+            - text:
+                credential-id: JJB_PASSWORD
+                variable: JJB_PASSWORD
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: LKFT_PRIVATE_KEY
+                variable: LKFT_PRIVATE_KEY
+        - credentials-binding:
+            - text:
+                credential-id: AUTH_TOKEN
+                variable: AUTH_TOKEN
+        - ssh-agent-credentials:
+                users:
+                    - 'LKFT_COMMIT_BOT_KEY'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            echo "#${BUILD_NUMBER}-${GERRIT_PATCHSET_REVISION:0:8}" > ${WORKSPACE}/version.txt
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+        - shell:
+            !include-raw: trigger-private-ci-job-configs/poll-jobs.sh
+    publishers:
+        - email:
+            recipients: 'riku.voipio@linaro.org ben.copeland@linaro.org dan.rue@linaro.org daniel.diaz@linaro.org'
diff --git a/trigger-qemu-upstream.yaml b/trigger-qemu-upstream.yaml
index 459d477ce6..f567bf8216 100644
--- a/trigger-qemu-upstream.yaml
+++ b/trigger-qemu-upstream.yaml
@@ -10,11 +10,11 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for Qemu upstream'
     scm:
         - git:
-            url: git://git.qemu.org/qemu.git
+            url: https://gitlab.com/qemu-project/qemu.git
             refspec: +refs/heads/master:refs/remotes/origin/master
             name: origin
             branches:
diff --git a/trigger-robher-aosp.yaml b/trigger-robher-aosp.yaml
deleted file mode 100644
index 8a902bc170..0000000000
--- a/trigger-robher-aosp.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-- job:
-    name: trigger-robher-aosp
-    project-type: freestyle
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-    logrotate:
-        days-to-keep: 60
-        num-to-keep: 60
-    disabled: false
-    node: master
-    display-name: 'Trigger for Rob Herring - AOSP build playground'
-    scm:
-        - git:
-            url: git://anongit.freedesktop.org/mesa/mesa
-            branches:
-                - origin/master
-                - origin/android/*
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-            subdir: external/mesa3d
-    triggers:
-        - pollscm: 'H H/5 * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: 'robher-aosp'
diff --git a/trigger-rpb-centos-installer-staging.yaml b/trigger-rpb-centos-installer-staging.yaml
deleted file mode 100644
index 0ac242249d..0000000000
--- a/trigger-rpb-centos-installer-staging.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-- job:
-    name: trigger-96boards-reference-centos-installer-staging
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - CentOS Installer (staging)'
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://repo.linaro.org/rpm/linaro-staging/centos-7/repo/'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-centos-installer-staging'
diff --git a/trigger-rpb-centos-installer.yaml b/trigger-rpb-centos-installer.yaml
deleted file mode 100644
index a9ec7a5ec1..0000000000
--- a/trigger-rpb-centos-installer.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-- job:
-    name: trigger-96boards-reference-centos-installer
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - CentOS Installer'
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://repo.linaro.org/rpm/linaro-overlay/centos-7/repo/'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-centos-installer'
diff --git a/trigger-rpb-debian-installer-staging.yaml b/trigger-rpb-debian-installer-staging.yaml
deleted file mode 100644
index 9d49ee4920..0000000000
--- a/trigger-rpb-debian-installer-staging.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-- job:
-    name: trigger-96boards-reference-debian-installer-staging
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - Debian Installer (staging)'
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://obs.linaro.org/ERP:/staging/Debian_9/debian-installer/Release'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: rpb-kernel-latest
-              predefined-parameters: |
-                  TARGET_REPO=ERP:staging
-                  OBS_RELEASE=Debian_9
-            - project: 96boards-reference-debian-installer-staging
diff --git a/trigger-rpb-debian-installer.yaml b/trigger-rpb-debian-installer.yaml
deleted file mode 100644
index 53fb04cb21..0000000000
--- a/trigger-rpb-debian-installer.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-- job:
-    name: trigger-96boards-reference-debian-installer
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - Debian Installer'
-    triggers:
-        - pollurl:
-            cron: '@hourly'
-            polling-node: build
-            urls:
-              - url: 'http://obs.linaro.org/ERP:/17.12/Debian_9/debian-installer/Release'
-                check-content:
-                  - simple: true
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-debian-installer'
diff --git a/trigger-rpb-kernel-noupstream.yaml b/trigger-rpb-kernel-noupstream.yaml
deleted file mode 100644
index 2b474ba054..0000000000
--- a/trigger-rpb-kernel-noupstream.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    name: trigger-rpb-kernel-noupstream
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    parameters:
-        - string:
-            name: KERNEL_GIT_BRANCH
-            default: 'erp-noupstream'
-        - string:
-            name: KERNEL_GIT_URL
-            default: 'https://github.com/Linaro/rpk.git'
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - Linux Kernel (RPK erp-noupstream branch)'
-    scm:
-        - git:
-            url: ${KERNEL_GIT_URL}
-            refspec: +refs/heads/${KERNEL_GIT_BRANCH}:refs/remotes/origin/${KERNEL_GIT_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_GIT_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-kernel-enterprise'
-            - project: 'rpb-reference-kernel-rpm'
diff --git a/trigger-rpb-kernel.yaml b/trigger-rpb-kernel.yaml
deleted file mode 100644
index 24350ec332..0000000000
--- a/trigger-rpb-kernel.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-- job:
-    name: trigger-rpb-kernel
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    parameters:
-        - string:
-            name: KERNEL_GIT_BRANCH
-            default: 'master'
-        - string:
-            name: KERNEL_GIT_URL
-            default: 'https://github.com/Linaro/rpk.git'
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - Linux Kernel (RPK master branch)'
-    scm:
-        - git:
-            url: ${KERNEL_GIT_URL}
-            refspec: +refs/heads/${KERNEL_GIT_BRANCH}:refs/remotes/origin/${KERNEL_GIT_BRANCH}
-            name: origin
-            branches:
-                - refs/heads/${KERNEL_GIT_BRANCH}
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    triggers:
-        - pollscm: 'H/5 * * * *'
-    wrappers:
-        - timestamps
-        - build-name:
-            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
-    builders:
-        - trigger-builds:
-            - project:
-                - '96boards-b2260'
diff --git a/trigger-rpb-openembedded-jethro.yaml b/trigger-rpb-openembedded-jethro.yaml
deleted file mode 100644
index 8f9a72a6a3..0000000000
--- a/trigger-rpb-openembedded-jethro.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-96boards-reference-platform-openembedded-jethro
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - OpenEmbedded (jethro)'
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-platform-openembedded-jethro'
diff --git a/trigger-rpb-openembedded-krogoth.yaml b/trigger-rpb-openembedded-krogoth.yaml
deleted file mode 100644
index c1be5dcb80..0000000000
--- a/trigger-rpb-openembedded-krogoth.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-96boards-reference-platform-openembedded-krogoth
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - OpenEmbedded (krogoth)'
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-platform-openembedded-krogoth'
diff --git a/trigger-rpb-openembedded-master.yaml b/trigger-rpb-openembedded-master.yaml
deleted file mode 100644
index 8867ea5600..0000000000
--- a/trigger-rpb-openembedded-master.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-96boards-reference-platform-openembedded-master
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - OpenEmbedded (master)'
-    triggers:
-        - timed: '@daily'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-platform-openembedded-master'
diff --git a/trigger-rpb-openembedded-morty.yaml b/trigger-rpb-openembedded-morty.yaml
deleted file mode 100644
index 79181f9801..0000000000
--- a/trigger-rpb-openembedded-morty.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-- job:
-    name: trigger-96boards-reference-platform-openembedded-morty
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Reference Platform - OpenEmbedded (morty)'
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: '96boards-reference-platform-openembedded-morty'
diff --git a/trigger-schneider-openembedded-dunfell-rzn1d-4.19.yaml b/trigger-schneider-openembedded-dunfell-rzn1d-4.19.yaml
new file mode 100644
index 0000000000..e60487c20e
--- /dev/null
+++ b/trigger-schneider-openembedded-dunfell-rzn1d-4.19.yaml
@@ -0,0 +1,202 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-dunfell:refs/remotes/origin/linaro-dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/lces2-4.19-lts:refs/remotes/origin/lces2-4.19-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-4.19-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/lces2-2020.07:refs/remotes/origin/lces2-2020.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-2020.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-dunfell-rzn1d-4.19
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-dunfell rzn1d 4.19)'
+    scm:
+        - poky
+        - meta-linaro
+        - meta-openembedded
+        - meta-rauc
+        - meta-security
+        - meta-virtualization
+        - meta-backports
+        - meta-dip-base
+        - DIP-Yocto-Linux-Distro
+        - DIP-linux
+        - DIP-uboot
+        - DIP-secureboot
+    triggers:
+        - pollscm: 'H 12,6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-dunfell-4.19'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-dunfell-rzn1d-5.10.yaml b/trigger-schneider-openembedded-dunfell-rzn1d-5.10.yaml
new file mode 100644
index 0000000000..3fd3223812
--- /dev/null
+++ b/trigger-schneider-openembedded-dunfell-rzn1d-5.10.yaml
@@ -0,0 +1,202 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-dunfell:refs/remotes/origin/linaro-dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/lces2-5.10-lts:refs/remotes/origin/lces2-5.10-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-5.10-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/lces2-2020.07:refs/remotes/origin/lces2-2020.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-2020.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-dunfell-rzn1d-5.10
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-dunfell rzn1d 5.10)'
+    scm:
+        - poky
+        - meta-linaro
+        - meta-openembedded
+        - meta-rauc
+        - meta-security
+        - meta-virtualization
+        - meta-backports
+        - meta-dip-base
+        - DIP-Yocto-Linux-Distro
+        - DIP-linux
+        - DIP-uboot
+        - DIP-secureboot
+    triggers:
+        - pollscm: 'H 12,6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-dunfell-5.10'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-dunfell-rzn1d-5.4.yaml b/trigger-schneider-openembedded-dunfell-rzn1d-5.4.yaml
new file mode 100644
index 0000000000..eab748dd6c
--- /dev/null
+++ b/trigger-schneider-openembedded-dunfell-rzn1d-5.4.yaml
@@ -0,0 +1,202 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-dunfell:refs/remotes/origin/linaro-dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/lces2-5.4-lts:refs/remotes/origin/lces2-5.4-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-5.4-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/lces2-2020.07:refs/remotes/origin/lces2-2020.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-2020.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-dunfell-rzn1d-5.4
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-dunfell rzn1d 5.4)'
+    scm:
+        - poky
+        - meta-linaro
+        - meta-openembedded
+        - meta-rauc
+        - meta-security
+        - meta-virtualization
+        - meta-backports
+        - meta-dip-base
+        - DIP-Yocto-Linux-Distro
+        - DIP-linux
+        - DIP-uboot
+        - DIP-secureboot
+    triggers:
+        - pollscm: 'H 12,6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-dunfell-5.4'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-dunfell-soca9-4.19.yaml b/trigger-schneider-openembedded-dunfell-soca9-4.19.yaml
new file mode 100644
index 0000000000..877d0e0b03
--- /dev/null
+++ b/trigger-schneider-openembedded-dunfell-soca9-4.19.yaml
@@ -0,0 +1,192 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-dunfell:refs/remotes/origin/linaro-dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/soca9-4.19-lts:refs/remotes/origin/soca9-4.19-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-4.19-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/soca9-2020.07:refs/remotes/origin/soca9-2020.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-2020.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-dunfell-soca9-4.19
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-dunfell soca9 4.19)'
+    scm:
+        - DIP-linux
+        - DIP-uboot
+    triggers:
+        - pollscm: 'H 12,6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-dunfell-4.19'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-dunfell-soca9-5.10.yaml b/trigger-schneider-openembedded-dunfell-soca9-5.10.yaml
new file mode 100644
index 0000000000..93de43e254
--- /dev/null
+++ b/trigger-schneider-openembedded-dunfell-soca9-5.10.yaml
@@ -0,0 +1,192 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-dunfell:refs/remotes/origin/linaro-dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/soca9-5.10-lts:refs/remotes/origin/soca9-5.10-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-5.10-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/soca9-2020.07:refs/remotes/origin/soca9-2020.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-2020.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-dunfell-soca9-5.10
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-dunfell soca9 5.10)'
+    scm:
+        - DIP-linux
+        - DIP-uboot
+    triggers:
+        - pollscm: 'H 12,6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-dunfell-5.10'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-dunfell-soca9-5.4.yaml b/trigger-schneider-openembedded-dunfell-soca9-5.4.yaml
new file mode 100644
index 0000000000..98539b75cc
--- /dev/null
+++ b/trigger-schneider-openembedded-dunfell-soca9-5.4.yaml
@@ -0,0 +1,192 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/dunfell:refs/remotes/origin/dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-dunfell:refs/remotes/origin/linaro-dunfell
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-dunfell
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/soca9-5.4-lts:refs/remotes/origin/soca9-5.4-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-5.4-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/soca9-2020.07:refs/remotes/origin/soca9-2020.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-2020.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-dunfell-soca9-5.4
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-dunfell soca9 5.4)'
+    scm:
+        - DIP-linux
+        - DIP-uboot
+    triggers:
+        - pollscm: 'H 12,6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-dunfell-5.4'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-warrior-rzn1d-4.19.yaml b/trigger-schneider-openembedded-warrior-rzn1d-4.19.yaml
new file mode 100644
index 0000000000..14c925055e
--- /dev/null
+++ b/trigger-schneider-openembedded-warrior-rzn1d-4.19.yaml
@@ -0,0 +1,202 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-warrior:refs/remotes/origin/linaro-warrior
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/lces2-4.19-lts:refs/remotes/origin/lces2-4.19-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-4.19-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/lces2-2019.07:refs/remotes/origin/lces2-2019.07
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/lces2-2019.07
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-warrior-rzn1d-4.19
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-warrior rzn1d 4.19)'
+    scm:
+        - poky
+        - meta-linaro
+        - meta-openembedded
+        - meta-rauc
+        - meta-security
+        - meta-virtualization
+        - meta-backports
+        - meta-dip-base
+        - DIP-Yocto-Linux-Distro
+        - DIP-linux
+        - DIP-uboot
+        - DIP-secureboot
+    triggers:
+        - pollscm: 'H 6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-warrior-4.19'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-schneider-openembedded-warrior-soca9-4.19.yaml b/trigger-schneider-openembedded-warrior-soca9-4.19.yaml
new file mode 100644
index 0000000000..07334de741
--- /dev/null
+++ b/trigger-schneider-openembedded-warrior-soca9-4.19.yaml
@@ -0,0 +1,192 @@
+- scm:
+    name: poky
+    scm:
+        - git:
+            url: http://git.yoctoproject.org/git/poky
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-linaro
+    scm:
+        - git:
+            url: git://git.linaro.org/openembedded/meta-linaro.git
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-openembedded
+    scm:
+        - git:
+            url: https://github.com/openembedded/meta-openembedded
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-rauc
+    scm:
+        - git:
+            url: https://github.com/rauc/meta-rauc
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-security
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-security
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-virtualization
+    scm:
+        - git:
+            url: https://git.yoctoproject.org/git/meta-virtualization
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-backports
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-backports.git
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: meta-dip-base
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/meta-dip-base.git
+            refspec: +refs/heads/warrior:refs/remotes/origin/warrior
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-Yocto-Linux-Distro
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-Yocto-Linux-Distro.git
+            refspec: +refs/heads/linaro-warrior:refs/remotes/origin/linaro-warrior
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro-warrior
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-linux
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-linux.git
+            refspec: +refs/heads/soca9-4.19-lts:refs/remotes/origin/soca9-4.19-lts
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-4.19-lts
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-uboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-uboot.git
+            refspec: +refs/heads/soca9-2018.03:refs/remotes/origin/soca9-2018.03
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/soca9-2018.03
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- scm:
+    name: DIP-secureboot
+    scm:
+        - git:
+            url: ssh://git@dev-private-git.linaro.org/schneider/DIP-secureboot.git
+            refspec: +refs/heads/linaro:refs/remotes/origin/linaro
+            credentials-id: '768c1ba1-6052-4b97-a531-7e4fabda6979'
+            name: origin
+            branches:
+                - refs/heads/linaro
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+- job:
+    name: trigger-schneider-openembedded-warrior-soca9-4.19
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-discover
+            ralph.siemsen@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+            schneider-linaro-git:
+                - job-read
+                - job-extended-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'Trigger for Schneider Openembedded project (linaro-warrior soca9 4.19)'
+    scm:
+        - DIP-linux
+        - DIP-uboot
+    triggers:
+        - pollscm: 'H 6 * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - ssh-agent-credentials:
+                users:
+                - '768c1ba1-6052-4b97-a531-7e4fabda6979'
+    builders:
+        - trigger-builds:
+            - project: 'schneider-openembedded-warrior-4.19'
+              predefined-parameters: GIT_COMMIT=${GIT_COMMIT}
+    publishers:
+        - email:
+            recipients: 'ralph.siemsen@linaro.org'
diff --git a/trigger-spark.yaml b/trigger-spark.yaml
index cccfd13944..82d4c4da39 100644
--- a/trigger-spark.yaml
+++ b/trigger-spark.yaml
@@ -9,7 +9,7 @@
         - authorization:
             anonymous:
                 - job-read
-    disabled: false
+    disabled: true
     node: build
     display-name: 'Trigger for Spark'
     scm:
diff --git a/trigger-stretch-rootfs.yaml b/trigger-stretch-rootfs.yaml
deleted file mode 100644
index f486112c14..0000000000
--- a/trigger-stretch-rootfs.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-- job:
-    name: trigger-stretch-rootfs
-    project-type: freestyle
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-    disabled: false
-    node: build
-    display-name: 'Trigger for Debian rootfs (stretch)'
-    triggers:
-        - timed: '@weekly'
-    wrappers:
-        - timestamps
-    builders:
-        - trigger-builds:
-            - project: 'stretch-arm64-rootfs'
-            - project: 'stretch-armhf-rootfs'
diff --git a/trigger-test.yaml b/trigger-test.yaml
new file mode 100644
index 0000000000..ad5108664d
--- /dev/null
+++ b/trigger-test.yaml
@@ -0,0 +1,37 @@
+- job:
+    name: trigger-test
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+    disabled: false
+    node: triggers
+    display-name: 'Trigger test'
+    scm:
+        - git:
+            url: https://git.linaro.org/people/riku.voipio/ansible-playbooks.git
+            refspec: +refs/heads/master:refs/remotes/origin/master
+            name: origin
+            branches:
+                - refs/heads/master
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: false
+    triggers:
+        - pollscm: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            cd *
+            git status
+        - trigger-builds:
+            - project: 'qemu-docker'
diff --git a/trigger-tvm-ci-build.yaml b/trigger-tvm-ci-build.yaml
new file mode 100644
index 0000000000..a6fdcfc284
--- /dev/null
+++ b/trigger-tvm-ci-build.yaml
@@ -0,0 +1,38 @@
+- job:
+    name: trigger-tvm-ci-build
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: true
+    node: triggers
+    display-name: 'DELETE ME'
+    scm:
+        - git:
+            url: https://github.com/apache/tvm.git
+            branches:
+                - origin/main
+            submodule:
+                recursive: true
+    triggers:
+        - pollscm:
+            cron: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+    builders:
+        - shell: |
+            #!/bin/bash -e
+            git clean -fdx
+            echo GIT_COM_ID=${GIT_COMMIT} >> tvm_ci_parameters
+            cat tvm_ci_parameters
+    publishers:
+        - trigger-parameterized-builds:
+            - project: 'tvm-ci-build'
+              property-file: tvm_ci_parameters
diff --git a/trigger-u-boot-upstream.yaml b/trigger-u-boot-upstream.yaml
index acfeb30478..1ebc7f28d5 100644
--- a/trigger-u-boot-upstream.yaml
+++ b/trigger-u-boot-upstream.yaml
@@ -10,7 +10,7 @@
             anonymous:
                 - job-read
     disabled: false
-    node: build
+    node: triggers
     display-name: 'Trigger for U-Boot upstream (mainline)'
     scm:
         - git:
diff --git a/trigger-zephyr-aeolus.yaml b/trigger-zephyr-aeolus.yaml
index a3183195bf..5171e0a5a6 100644
--- a/trigger-zephyr-aeolus.yaml
+++ b/trigger-zephyr-aeolus.yaml
@@ -10,7 +10,7 @@
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for LITE Aeolus'
     triggers:
         - timed: '@daily'
@@ -19,7 +19,7 @@
     builders:
         - trigger-builds:
             - project:
-                - zephyr-aeolus
                 - lite-aeolus-micropython
                 - lite-aeolus-jerryscript
                 - lite-aeolus-zephyr.js
+                - lite-aeolus-openamp
diff --git a/trigger-zephyr-upstream-arm.yaml b/trigger-zephyr-upstream-arm.yaml
index 5a4547ee6e..151e1fd17a 100644
--- a/trigger-zephyr-upstream-arm.yaml
+++ b/trigger-zephyr-upstream-arm.yaml
@@ -10,11 +10,11 @@
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: master
+    node: triggers
     display-name: 'Trigger for Zephyr project (arm)'
     scm:
         - git:
-            url: https://git.linaro.org/lite/zephyr.git
+            url: https://github.com/zephyrproject-rtos/zephyr.git
             refspec: +refs/heads/arm:refs/remotes/origin/arm
             name: origin
             branches:
diff --git a/trigger-zephyr-upstream.yaml b/trigger-zephyr-upstream.yaml
index a04e05327c..683be7d553 100644
--- a/trigger-zephyr-upstream.yaml
+++ b/trigger-zephyr-upstream.yaml
@@ -6,24 +6,30 @@
         - authorization:
             anonymous:
                 - job-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 30
     disabled: false
-    node: build
-    display-name: 'Trigger for Zephyr project (master)'
+    node: triggers
+    display-name: 'Trigger for Zephyr project (main)'
     scm:
         - git:
-            url: https://git.linaro.org/lite/zephyr.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
+            url: https://github.com/zephyrproject-rtos/zephyr.git
+            refspec: +refs/heads/main:refs/remotes/origin/main
             name: origin
             branches:
-                - refs/heads/master
+                - refs/heads/main
             skip-tag: true
             shallow-clone: true
             wipe-workspace: false
     triggers:
-        - pollscm: 'H/5 * * * *'
+        - timed: 'H 21 * * *'
+        - pollscm: 'H 9 * * *'
     wrappers:
         - timestamps
         - build-name:
diff --git a/tvm-ci-build.yaml b/tvm-ci-build.yaml
new file mode 100644
index 0000000000..3cd16eece5
--- /dev/null
+++ b/tvm-ci-build.yaml
@@ -0,0 +1,73 @@
+- job:
+    name: tvm-ci-build
+    display-name: 'DELETE ME'
+    concurrent: true
+    project-type: freestyle
+    defaults: global
+    description: |
+        Updates source and build tvm frequently to ensure builds are succesful.
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 90
+            num-to-keep: 90
+        - github:
+            url: https://github.com/apache/tvm.git
+    triggers:
+        - github-pull-request:
+            trigger-phrase: 'TRIGGER BUILD'
+            white-list-target-branches:
+                - 'main'
+            success-comment: 'build successful'
+            failure-comment: 'build failed'
+    parameters:
+        - string:
+            name: LAVA_SERVER
+            default: 'https://validation.linaro.org/RPC2/'
+        - string:
+            name: GIT_COM_ID
+    disabled: true
+    node: docker-buster-arm64
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell: |
+            git clone https://github.com/K1504296/armnn-ci.git
+            cd armnn-ci && bash -ex tvm-builders.sh
+        - shell: |
+            #!/bin/bash -e
+            echo "DEVICE_TYPE=${DEVICE_TYPE}" > device_type_parameters
+        - inject:
+            properties-file: device_type_parameters
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            set -ex
+            sudo apt-get install -y jq
+
+            LAVA_ID=$GIT_COM_ID
+            TVM_TAR_LOCATION=https://snapshots.linaro.org/components/tvm/${BUILD_NUMBER}/tvm.tar.xz
+            jq -n --arg 'LAVA_ID' $LAVA_ID \
+            --arg 'TVM_TAR_LOCATION' $TVM_TAR_LOCATION \
+            --arg 'BUILD_NUMBER' $BUILD_NUMBER \
+            '{LAVA_ID:$LAVA_ID, TVM_TAR_LOCATION:$TVM_TAR_LOCATION, BUILD_NUMBER:$BUILD_NUMBER}' > out/buildInfo
+            #PUBLISH
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+            --link-latest \
+            out/ components/tvm/${BUILD_NUMBER}
diff --git a/u-boot-am57xx-evm.yaml b/u-boot-am57xx-evm.yaml
new file mode 100644
index 0000000000..3b85c7baf1
--- /dev/null
+++ b/u-boot-am57xx-evm.yaml
@@ -0,0 +1,140 @@
+- job:
+    name: u-boot-am57xx-evm
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    disabled: false
+    node: docker-buster-amd64
+    display-name: 'U-Boot upstream (mainline) for am57xx-evm'
+    scm:
+        - git:
+            url: https://github.com/u-boot/u-boot
+            refspec: +refs/heads/master:refs/remotes/origin/master
+            name: origin
+            branches:
+                - refs/heads/master
+            skip-tag: true
+            shallow-clone: false
+            wipe-workspace: false
+    triggers:
+        - pollscm: 'H/5 * * * *'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}-${GIT_REVISION,length=8}'
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - linaro-publish-token
+        - shell: |
+            #!/bin/bash
+
+            env |grep GIT
+
+            set -ex
+
+            trap cleanup_exit INT TERM EXIT
+
+            cleanup_exit()
+            {
+              cd ${WORKSPACE}
+              rm -rf build out
+              git clean -fdx
+              git reset --hard
+              #sudo umount bootfs || true
+              #sudo kpartx -dv x15-install.img || true
+            }
+
+            sudo apt-get update
+            sudo apt-get install -y libssl-dev python-requests rsync \
+                swig libpython-dev gcc-arm-linux-gnueabihf \
+                parted kpartx pigz python-pip virtualenv
+
+            cat Makefile
+            export CC=arm-linux-gnueabihf-
+            make ARCH=arm CROSS_COMPILE=${CC} distclean
+            make ARCH=arm CROSS_COMPILE=${CC} am57xx_evm_defconfig
+            make ARCH=arm CROSS_COMPILE=${CC}
+
+            mkdir -p out bootfs
+
+            # create x15 boot image
+            dd if=/dev/zero of=x15-install.img bs=48 seek=1M count=0
+            /sbin/parted --script x15-install.img mklabel msdos
+            /sbin/parted --script x15-install.img mkpart p fat32 0 48
+            /sbin/parted --script x15-install.img set 1 boot
+            for device in $(sudo kpartx -avs x15-install.img | cut -d' ' -f3); do
+              partition=$(echo ${device} | cut -d'p' -f3)
+              case "${partition}" in
+                1)
+                  sudo mkfs.fat -F16 /dev/mapper/${device}
+                  sudo mount /dev/mapper/${device} bootfs
+                  ;;
+              esac
+            done
+            sudo cp MLO bootfs
+            sudo cp u-boot.img bootfs
+
+            sudo umount bootfs
+            sudo kpartx -dv x15-install.img
+            time pigz -9 x15-install.img
+            mv x15-install.img.gz out/x15-u-boot-sd-${BUILD_NUMBER}.img.gz
+
+            ./scripts/setlocalversion --save-scmversion
+            GIT_TAG=$(git describe --abbrev=0)
+            LOCALVERSION=$(cat .scmversion)
+            # remove leading 'v' as it doesn't show up in u-boot version string
+
+            cat << EOF > ${WORKSPACE}/submit_for_testing_parameters
+            BUILD_NUMBER=${BUILD_NUMBER}
+            UBOOT_VERSION_STRING="${GIT_TAG:1}${LOCALVERSION}"
+            LAVA_JOB_PRIORITY=50
+            IMAGE_URL="http://snapshots.linaro.org/components/kernel/u-boot/${BUILD_NUMBER}/x15-u-boot-sd-${BUILD_NUMBER}.img.gz"
+            IMAGE_COMP=gz
+            PROJECT_NAME=ti-uboot
+            PROJECT=projects/ti/
+            EOF
+
+            cp .config out/config
+            cp MLO u-boot.img u-boot-dtb.bin arch/arm/dts/*.dtb spl/u-boot-spl.bin spl/u-boot-spl.dtb out/
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --api_version 3 \
+              --link-latest \
+              out components/kernel/u-boot/${BUILD_NUMBER}
+
+            # submit tests to LAVA
+            rm -rf venv | true
+            virtualenv -p python3 venv
+            source ./venv/bin/activate
+
+            git clone https://github.com/Linaro/lava-test-plans.git
+            cd lava-test-plans
+            pip install -r requirements.txt
+            ./submit_for_testing.py --variables ${WORKSPACE}/submit_for_testing_parameters \
+              --device-type x15-bl \
+              --test-plan ti-uboot \
+              --qa-server-team ti \
+              --qa-server-project u-boot \
+              --lava-server https://validation.linaro.org \
+              --build-id ${BUILD_NUMBER}-${GIT_COMMIT,length=8}
+
+    publishers:
+        - email:
+            recipients: 'vishal.bhoj@linaro.org'
diff --git a/u-boot-upstream.yaml b/u-boot-upstream.yaml
index 6023fd0f69..9fa9bf56c0 100644
--- a/u-boot-upstream.yaml
+++ b/u-boot-upstream.yaml
@@ -7,7 +7,7 @@
             anonymous:
                 - job-read
                 - job-extended-read
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -15,7 +15,7 @@
         - build-discarder:
             days-to-keep: 30
             num-to-keep: 30
-    disabled: false
+    disabled: true
     node: docker-xenial-amd64
     display-name: 'U-Boot upstream (mainline)'
     scm:
@@ -102,7 +102,7 @@
 
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
               out components/kernel/u-boot/${BUILD_NUMBER}
diff --git a/uadk-openssl.yaml b/uadk-openssl.yaml
new file mode 100644
index 0000000000..5fdb3f7d79
--- /dev/null
+++ b/uadk-openssl.yaml
@@ -0,0 +1,53 @@
+- job:
+    name: uadk-openssl
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 10
+        - github:
+            url: https://github.com/Linaro/uadk_engine
+    disabled: false
+    node: d06-uadk
+    display-name: 'UADK - User Space Accelerator Development Kit (engine for OpenSSL)'
+    concurrent: false
+    scm:
+        - git:
+            url: https://github.com/Linaro/uadk_engine.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            basedir: uadk_engine
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            white-list-target-branches:
+                - 'master'
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: uadk/builders.sh
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+    publishers:
+        - email:
+            recipients: 'haojian.zhuang@linaro.org'
diff --git a/uadk.yaml b/uadk.yaml
new file mode 100644
index 0000000000..8d22d65fd9
--- /dev/null
+++ b/uadk.yaml
@@ -0,0 +1,54 @@
+- job:
+    name: uadk
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 10
+        - github:
+            url: https://github.com/Linaro/uadk
+    disabled: false
+    node: d06-uadk
+    display-name: 'UADK - User Space Accelerator Development Kit'
+    concurrent: false
+    scm:
+        - git:
+            url: https://github.com/Linaro/uadk.git
+            refspec: +refs/pull/*:refs/remotes/origin/pr/*
+            name: origin
+            branches:
+                - ${sha1}
+            basedir: uadk
+            skip-tag: true
+            shallow-clone: true
+            wipe-workspace: true
+    triggers:
+        - github-pull-request:
+            github-hooks: true
+            permit-all: true
+            white-list-target-branches:
+                - 'master'
+                - 'dev'
+            auth-id: 'GITHUB_TOKEN'
+    wrappers:
+        - timestamps
+    builders:
+        - shell:
+            !include-raw: uadk/builders.sh
+        - build-name-setter:
+            name: 'version.txt'
+            file: true
+    publishers:
+        - email:
+            recipients: 'haojian.zhuang@linaro.org'
diff --git a/uadk/builders.sh b/uadk/builders.sh
new file mode 100755
index 0000000000..28f55178b1
--- /dev/null
+++ b/uadk/builders.sh
@@ -0,0 +1,328 @@
+#!/bin/bash -e
+
+export UADK_VER_ENV="v2"
+LOCK_FILE="/var/lock/uadk-lock"
+BIN_DIR="usr/local/bin"
+INC_DIR="usr/local/include"
+LIB_DIR="usr/local/lib"
+UACCE_PATH="/sys/class/uacce"
+
+lock() {
+	exit_code=1
+	pending=0
+	while [ "$exit_code" != 0 ]; do
+		exit_code=0
+		mkdir ${LOCK_FILE} &> /dev/null || exit_code=$?
+		#mkdir ${LOCK_FILE} || exit_code=$?
+		if [ "$exit_code" != 0 ]; then
+			if [ "$pending" = 0 ]; then
+				# Some script is accessing hardware
+				echo "Wait for other building script finishing."
+				pending=1
+			fi
+		fi
+	done
+}
+
+unlock() {
+	if [ -d ${LOCK_FILE} ]; then
+		rmdir ${LOCK_FILE}
+		echo "Release lock"
+	fi
+}
+
+ctrlc_handler() {
+	echo "Ctrl-C caught...performing clean up"
+	unlock
+	# Exit with error code
+	exit 2
+}
+
+# Check whether prebuilt package exists.
+# If it exists, install binaries and libraries directly.
+check_prebuilt_package() {
+	exit_code=0
+	cd ${WORKSPACE}
+	case $1 in
+	"openssl")
+		if [ -d ${WORKSPACE}/openssl ]; then
+			cd ${WORKSPACE}/openssl
+			git checkout OpenSSL_1_1_1a || exit_code=$?
+			if [ "$exit_code" != 0 ]; then
+				cd ${WORKSPACE}
+				rm -fr ${WORKSPACE}/openssl
+				git clone https://github.com/openssl/openssl.git
+				cd ${WORKSPACE}/openssl
+			fi
+		else
+			git clone https://github.com/openssl/openssl.git
+			cd ${WORKSPACE}/openssl
+		fi
+		git checkout OpenSSL_1_1_1a
+		COMMIT=`git log HEAD^..HEAD | grep commit`
+		NAME=`ls ../openssl-*.tar.xz`
+		NAME=${NAME#*openssl-}
+		;;
+	*)
+		echo "Invalid package name: $1"
+		return 1
+		;;
+	esac
+	NAME=`echo ${NAME} | cut -b 1-8`
+	if [ -z ${NAME} ]; then
+		echo "Can not find package ${NAME}."
+		return 1
+	fi
+	COMMIT=${COMMIT#*commit }
+	COMMIT=`echo ${COMMIT} | cut -b 1-8`
+	if [ ${NAME} = ${COMMIT} ]; then
+		echo "Prebuilt package ${NAME} is found."
+		cd ${WORKSPACE}
+		case $1 in
+		"openssl")
+			rm -fr ${WORKSPACE}/openssl
+			tar -xJf openssl-${NAME}.tar.xz
+			cd ${WORKSPACE}/openssl
+			./config --prefix=${LIB_ROOT}/usr/local
+			make install &> /dev/null
+			;;
+		esac
+		return 0
+	fi
+	echo "Package name ${NAME} could not match commit name ${COMMIT}."
+	return 1
+}
+
+# Check whether repo is downloaded since pull request occurs.
+# If it exists, skip to fetch repo with master branch.
+check_existed_repo() {
+	exit_code=0
+	cd ${WORKSPACE}
+	case $1 in
+	"uadk")
+		if [ ! -d ${WORKSPACE}/uadk ]; then
+			echo "Clone UADK repo."
+			git clone --depth 1 https://github.com/Linaro/uadk.git
+		fi
+		cd ${WORKSPACE}/uadk
+		;;
+	"ssluadk")
+		if [ ! -d ${WORKSPACE}/uadk_engine ]; then
+			echo "Clone OPENSSL-UADK repo."
+			git clone --depth 1 https://github.com/Linaro/uadk_engine.git
+		fi
+		cd ${WORKSPACE}/uadk_engine
+		;;
+	*)
+		echo "Invalid repo name: $1"
+		return 1
+		;;
+	esac
+	return 0
+}
+
+# Delete uadk and ssluadk repo while build is finished.
+clean_repo() {
+	rm -fr ${WORKSPACE}/uadk
+	rm -fr ${WORKSPACE}/uadk_engine
+}
+
+build_uadk() {
+	echo "Prepare to build UADK repo."
+	exit_code=0
+	check_existed_repo uadk || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		return $exit_code
+	fi
+
+	cd ${WORKSPACE}/uadk
+	autoreconf -vfi
+
+	# static build for v2
+	exit_code=0
+	./configure \
+	  --prefix=${WORKSPACE}/uadk-static-v2/usr/local \
+	  --includedir=${WORKSPACE}/uadk-static-v2/${INC_DIR}/uadk \
+	  --enable-static --disable-shared --with-static_drv
+	make -j$(nproc) || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to build UADK statically."
+		return $exit_code
+	fi
+	make install
+	exit_code=0
+	if [ -d "$UACCE_PATH" ]; then
+		sudo \
+		LD_LIBRARY_PATH=${WORKSPACE}/uadk-static-v2/usr/local/lib/ \
+		PATH=${WORKSPACE}/uadk-static-v2/usr/local/bin:${PATH}  \
+		${WORKSPACE}/uadk/test/sanity_test.sh || exit_code=$?
+	fi
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to run UADK tests with static build."
+	fi
+
+	sh cleanup.sh
+	autoreconf -vfi
+
+	# shared build for v2
+	exit_code=0
+	./configure \
+	  --prefix=${WORKSPACE}/uadk-shared-v2/usr/local
+	make -j$(nproc) || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to build UADK statically."
+		return $exit_code
+	fi
+	make install
+	exit_code=0
+	if [ -d "$UACCE_PATH" ]; then
+		sudo \
+		LD_LIBRARY_PATH=${WORKSPACE}/uadk-shared-v2/usr/local/lib/ \
+		PATH=${WORKSPACE}/uadk-shared-v2/usr/local/bin:${PATH}  \
+		${WORKSPACE}/uadk/test/sanity_test.sh || exit_code=$?
+	fi
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to run UADK tests with dynamic build."
+	fi
+
+	return 0
+}
+
+build_openssl() {
+	exit_code=0
+	check_prebuilt_package openssl || exit_code=$?
+	if [ "$exit_code" = 0 ]; then
+		return 0
+	fi
+
+	./config --prefix=${LIB_ROOT}/usr/local
+	exit_code=0
+	make -j$(nproc) || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to build OpenSSL ($exit_code)"
+		return $exit_code
+	fi
+	make install || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to install OpenSSL ($exit_code)"
+		return $exit_code
+	fi
+
+	# get the first 8 bytes of commit number
+	COMMIT=`git log HEAD^..HEAD | grep commit`
+	COMMIT=${COMMIT#*commit }
+	COMMIT=`echo ${COMMIT} | cut -b 1-8`
+	cd ${WORKSPACE}
+	# clean old packages
+	rm -f openssl-*.tar.xz || exit_code=$?
+	echo "rm ssl $exit_code"
+	# create new package
+	tar -cJf openssl-${COMMIT}.tar.xz openssl || exit_code=$?
+	echo "tar ssl $exit_code"
+	return 0
+}
+
+build_uadk_openssl() {
+	echo "Prepare to build OPENSSL-UADK repo."
+	exit_code=0
+	check_existed_repo ssluadk || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		return $exit_code
+	fi
+
+	cd ${WORKSPACE}/uadk_engine
+	autoreconf -i -f -v
+	./configure --prefix=${LIB_ROOT}/usr/local \
+		--libdir=${LIB_ROOT}/${LIB_DIR}/engines-1.1
+
+	exit_code=0
+	LD_LIBRARY_PATH=${LIB_ROOT}/${LIB_DIR}:${LIB_ROOT}/${LIB_DIR}/engines-1.1 \
+	  PATH=${LIB_ROOT}/${BIN_DIR}:${PATH} \
+	  C_INCLUDE_PATH=${LIB_ROOT}/${INC_DIR} \
+	  make || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to build uadk_engine ($exit_code)"
+		return $exit_code
+	fi
+	exit_code=0
+	make install || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to install uadk_engine ($exit_code)"
+		return $exit_code
+	fi
+	exit_code=0
+	sudo \
+	  LD_LIBRARY_PATH=${LIB_ROOT}/${LIB_DIR}:${LIB_ROOT}/${LIB_DIR}/engines-1.1 \
+	  PATH=${LIB_ROOT}/${BIN_DIR}/:${PATH} \
+	  C_INCLUDE_PATH=${LIB_ROOT}/${INC_DIR}/ \
+	  openssl engine -t uadk_engine || exit_code=$?
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to verify uadk_engine engine ($exit_code)"
+		return $exit_code
+	fi
+	exit_code=0
+	if [ -d "$UACCE_PATH" ]; then
+		sudo \
+		LD_LIBRARY_PATH=${LIB_ROOT}/${LIB_DIR}:${LIB_ROOT}/${LIB_DIR}/engines-1.1 \
+		PATH=${LIB_ROOT}/${BIN_DIR}/:${PATH} \
+		C_INCLUDE_PATH=${LIB_ROOT}/${INC_DIR}/ \
+		test/sanity_test.sh || exit_code=$?
+	fi
+	if [ "$exit_code" != 0 ]; then
+		echo "Fail to run sanity test ($exit_code)"
+		return $exit_code
+	fi
+
+	return $exit_code
+}
+
+# Initialize trap to call ctrlc_handler function when signal 2 (SIGINT) is
+# received.
+trap "ctrlc_handler" 2
+
+if [ -z "${WORKSPACE}" ]; then
+  # Local build
+  export WORKSPACE=${PWD}
+fi
+LIB_ROOT=${WORKSPACE}/uadk-shared-v2
+export PKG_CONFIG_PATH=${LIB_ROOT}/${LIB_DIR}/pkgconfig/
+
+# Prevent multiple building scripts to access hardware
+lock
+
+echo "#${BUILD_NUMBER}-${ghprbActualCommit:0:8}" > ${WORKSPACE}/version.txt
+
+# Build dependencies already pre-installed on the node
+#sudo apt update -q=2
+#sudo apt install -q=2 --yes --no-install-recommends zlib1g-dev libnuma-dev
+
+rm -fr ${WORKSPACE}/uadk-shared-v2
+rm -fr ${WORKSPACE}/uadk-static-v2
+
+exit_code=0
+
+# Build OPENSSL
+build_openssl || exit_code=$?
+if [ "$exit_code" != 0 ]; then
+	clean_repo
+	unlock
+	exit 1
+fi
+# Build UADK
+build_uadk || exit_code=$?
+if [ "$exit_code" != 0 ]; then
+	clean_repo
+	unlock
+	exit 1
+fi
+# Build UADK-OPENSSL
+build_uadk_openssl || exit_code=$?
+if [ "$exit_code" != 0 ]; then
+	clean_repo
+	unlock
+	exit 1
+fi
+
+clean_repo
+unlock
+echo "Run build script successfully!"
diff --git a/ubuntu-arm64-rootfs.yaml b/ubuntu-arm64-rootfs.yaml
deleted file mode 100644
index ff09c81d1e..0000000000
--- a/ubuntu-arm64-rootfs.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- job:
-    name: ubuntu-arm64-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Ubuntu arm64 rootfs'
-    scm:
-        - git:
-            url: git://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-arm64
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - gnome
-                - nano
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=6G tmpfs builddir
-            cp -a vivid-arm64-${rootfs} builddir/
-            cd builddir/vivid-arm64-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/vivid-arm64-${rootfs}/linaro-vivid-* out
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out ubuntu/images/${rootfs}-arm64/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/linaro-vivid-${rootfs}-*'
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/ubuntu-armhf-hwpacks.yaml b/ubuntu-armhf-hwpacks.yaml
deleted file mode 100644
index 35d21908dd..0000000000
--- a/ubuntu-armhf-hwpacks.yaml
+++ /dev/null
@@ -1,207 +0,0 @@
-- job:
-    name: ubuntu-armhf-hwpacks
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: false
-    node: build
-    display-name: 'Linaro Ubuntu hardware packs (armhf)'
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - arndale-be
-                - lsk-arndale-be
-                - lsk-vexpress
-                - lsk-vexpress-be
-                - lsk-vexpress64
-                - lsk-vexpress64-be
-                - lt-vexpress64
-                - vexpress
-                - vexpress64
-                - vexpress64-be
-        - axis:
-            type: slave
-            name: label
-            values:
-                - build
-    execution-strategy:
-        sequential: true
-        touchstone:
-            expr: 'hwpack=="arndale"'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - linaro-publish-token
-        - copyartifact:
-            project: package-and-publish-linux-linaro
-            filter: 'out/*.deb'
-            target: artifacts
-            flatten: true
-            optional: true
-        - copyartifact:
-            project: package-and-publish-linux-linaro-stable
-            filter: 'out/*.deb'
-            target: artifacts
-            flatten: true
-            optional: true
-        - shell: |
-            #!/bin/bash
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-              rm -rf artifacts
-            }
-
-            dpkg -s linaro-image-tools |grep '^Version'
-
-            rm -rf out *.txt
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=2G tmpfs builddir
-            cd builddir
-
-            VERSION=`date +%Y%m%d`-${BUILD_NUMBER}
-            case "${hwpack}" in
-              arndale|arndale-octa|beaglebone|highbank|lsk-vexpress|midway|origen|panda|snowball|vexpress)
-                git clone git://git.linaro.org/hwpack/${hwpack}.git
-                linaro-hwpack-create --debug ${hwpack}/hwpacks/linaro-${hwpack} ${VERSION}
-                mv hwpack_linaro-${hwpack}* ${WORKSPACE}
-                mv *.txt ${WORKSPACE}
-                ;;
-              lsk-vexpress64|lsk-vexpress64-be|vexpress64|vexpress64-be|lt-vexpress64)
-                git clone git://git.linaro.org/hwpack/vexpress64-rtsm.git
-                linaro-hwpack-create --debug vexpress64-rtsm/hwpacks/linaro-vexpress64-rtsm ${VERSION}
-                mv hwpack_linaro-vexpress64-rtsm_${VERSION}_arm64_supported.manifest.txt ${WORKSPACE}/hwpack_linaro-arm64_supported.manifest.txt
-                mv hwpack_linaro-vexpress64-rtsm_${VERSION}_arm64_supported.tar.gz ${WORKSPACE}/hwpack_linaro_arm64_supported.tar.gz
-                mv *.txt ${WORKSPACE}
-                ;;
-            esac
-
-            cd ${WORKSPACE}
-
-            echo "distribution=ubuntu" > remote_directory_parameters
-
-            case "${hwpack}" in
-              lsk-arndale-be|arndale-be)
-                find artifacts -type f -name "linux-*-linaro-${hwpack}_*.deb" -exec mv -t ${WORKSPACE} {} +
-
-                rm -f hwpack_linaro_armhf_supported.tar.gz
-                export HWPACK_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=arndale,label=build/lastSuccessfulBuild/buildNumber`
-                export HWPACK_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=arndale,label=build/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export HWPACK_BUILD_URL="http://snapshots.linaro.org/ubuntu/hwpacks/arndale/${HWPACK_BUILD_NUMBER}/hwpack_linaro-arndale_${HWPACK_BUILD_TIMESTAMP}-${HWPACK_BUILD_NUMBER}_armhf_supported.tar.gz"
-                wget --progress=dot -e dotbytes=2M ${HWPACK_BUILD_URL} -O hwpack_linaro_armhf_supported.tar.gz
-
-                linaro-hwpack-replace -t hwpack_linaro_armhf_supported.tar.gz -p `ls linux-image-*-linaro-${hwpack}_*.deb` -r linux-image -d -i
-                linaro-hwpack-replace -t hwpack_linaro_armhf_supported.tar.gz -p `ls linux-headers-*-linaro-${hwpack}_*.deb` -r linux-headers -d -i
-
-                mv hwpack_linaro_armhf_supported.tar.gz ${WORKSPACE}/hwpack_linaro-${hwpack}_${VERSION}_armhf_supported.tar.gz
-                mv hwpack_linaro_armhf_supported.manifest.txt ${WORKSPACE}/hwpack_linaro-${hwpack}_${VERSION}_armhf_supported.manifest.txt
-
-                echo "distribution=openembedded" > remote_directory_parameters
-                ;;
-              lsk-panda-be|panda-be)
-                [ "${hwpack}" = "panda-be" ] && omap=omap-be || true
-                [ "${hwpack}" = "lsk-panda-be" ] && omap=lsk-omap-be || true
-                find artifacts -type f -name "linux-*-linaro-${omap}_*.deb" -exec mv -t ${WORKSPACE} {} +
-
-                rm -f hwpack_linaro_armhf_supported.tar.gz
-                export HWPACK_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=panda,label=build/lastSuccessfulBuild/buildNumber`
-                export HWPACK_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=panda,label=build/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export HWPACK_BUILD_URL="http://snapshots.linaro.org/ubuntu/hwpacks/panda/${HWPACK_BUILD_NUMBER}/hwpack_linaro-panda_${HWPACK_BUILD_TIMESTAMP}-${HWPACK_BUILD_NUMBER}_armhf_supported.tar.gz"
-                wget --progress=dot -e dotbytes=2M ${HWPACK_BUILD_URL} -O hwpack_linaro_armhf_supported.tar.gz
-
-                linaro-hwpack-replace -t hwpack_linaro_armhf_supported.tar.gz -p `ls linux-image-*-linaro-${omap}_*.deb` -r linux-image -d -i
-                linaro-hwpack-replace -t hwpack_linaro_armhf_supported.tar.gz -p `ls linux-headers-*-linaro-${omap}_*.deb` -r linux-headers -d -i
-
-                mv hwpack_linaro_armhf_supported.tar.gz ${WORKSPACE}/hwpack_linaro-${hwpack}_${VERSION}_armhf_supported.tar.gz
-                mv hwpack_linaro_armhf_supported.manifest.txt ${WORKSPACE}/hwpack_linaro-${hwpack}_${VERSION}_armhf_supported.manifest.txt
-
-                echo "distribution=openembedded" > remote_directory_parameters
-                ;;
-              lsk-vexpress-be|vexpress-be)
-                find artifacts -type f -name "linux-*-linaro-${hwpack}_*.deb" -exec mv -t ${WORKSPACE} {} +
-
-                rm -f hwpack_linaro_armhf_supported.tar.gz
-                export HWPACK_BUILD_NUMBER=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=vexpress,label=build/lastSuccessfulBuild/buildNumber`
-                export HWPACK_BUILD_TIMESTAMP=`wget -q --no-check-certificate -O - https://ci.linaro.org/jenkins/job/ubuntu-armhf-hwpacks/hwpack=vexpress,label=build/lastSuccessfulBuild/buildTimestamp?format=yyyyMMdd`
-                export HWPACK_BUILD_URL="http://snapshots.linaro.org/ubuntu/hwpacks/vexpress/${HWPACK_BUILD_NUMBER}/hwpack_linaro-vexpress_${HWPACK_BUILD_TIMESTAMP}-${HWPACK_BUILD_NUMBER}_armhf_supported.tar.gz"
-                wget --progress=dot -e dotbytes=2M ${HWPACK_BUILD_URL} -O hwpack_linaro_armhf_supported.tar.gz
-
-                linaro-hwpack-replace -t hwpack_linaro_armhf_supported.tar.gz -p `ls linux-image-*-linaro-${hwpack}_*.deb` -r linux-image -d -i
-                linaro-hwpack-replace -t hwpack_linaro_armhf_supported.tar.gz -p `ls linux-headers-*-linaro-${hwpack}_*.deb` -r linux-headers -d -i
-
-                mv hwpack_linaro_armhf_supported.tar.gz ${WORKSPACE}/hwpack_linaro-${hwpack}_${VERSION}_armhf_supported.tar.gz
-                mv hwpack_linaro_armhf_supported.manifest.txt ${WORKSPACE}/hwpack_linaro-${hwpack}_${VERSION}_armhf_supported.manifest.txt
-
-                echo "distribution=openembedded" > remote_directory_parameters
-                ;;
-              lsk-vexpress64|lsk-vexpress64-be|vexpress64|vexpress64-be|lt-vexpress64)
-                find artifacts -type f -name "linux-*-linaro-${hwpack}_*.deb" -exec mv -t ${WORKSPACE} {} +
-
-                rm -f hwpack_linaro-${hwpack}-rtsm_*_arm64_supported.tar.gz
-
-                linaro-hwpack-replace -t hwpack_linaro_arm64_supported.tar.gz -p `ls linux-image-*-linaro-${hwpack}_*.deb` -r linux-image -d -i
-                linaro-hwpack-replace -t hwpack_linaro_arm64_supported.tar.gz -p `ls linux-headers-*-linaro-${hwpack}_*.deb` -r linux-headers -d -i
-
-                mv hwpack_linaro_arm64_supported.tar.gz ${WORKSPACE}/hwpack_linaro-${hwpack}-rtsm_${VERSION}_arm64_supported.tar.gz
-                mv hwpack_linaro_arm64_supported.manifest.txt ${WORKSPACE}/hwpack_linaro-${hwpack}-rtsm_${VERSION}_arm64_supported.manifest.txt
-
-                echo "distribution=openembedded" > remote_directory_parameters
-                ;;
-            esac
-
-            echo "HWPACK_JOB_NAME=${JOB_NAME}" > post_build_lava_parameters
-            echo "HWPACK_BUILD_NUMBER=${BUILD_NUMBER}" >> post_build_lava_parameters
-            echo "HWPACK_FILE_NAME=`ls hwpack_linaro-${hwpack}*.tar.gz`" >> post_build_lava_parameters
-
-            case "${hwpack}" in
-              arndale|highbank|panda)
-                echo "DEVICE_TYPE=${hwpack}" >> post_build_lava_parameters
-                ;;
-              snowball)
-                echo "DEVICE_TYPE=snowball_sd" >> post_build_lava_parameters
-                # XXX workaround until BUILD.INFO.txt is fixed
-                rm -f BUILD-INFO.txt
-                touch EULA.txt
-                ;;
-              lsk-vexpress|vexpress)
-                echo "DEVICE_TYPE=vexpress-a9" >> post_build_lava_parameters
-                ;;
-              arndale-be|arndale-octa|beaglebone|lsk-arndale-be|lsk-panda-be|lsk-vexpress-be|lsk-vexpress64|lsk-vexpress64-be|midway|panda-be|vexpress64|vexpress64-be|lt-vexpress64)
-                echo "Skip DEVICE_TYPE for ${hwpack}"
-                ;;
-            esac
-        - inject:
-            properties-file: remote_directory_parameters
-        - shell: |
-            mkdir out
-            mv hwpack_linaro-${hwpack}* out
-            ${HOME}/bin/linaro-cp --api_version 3 out ${distribution}/hwpacks/${hwpack}/${BUILD_NUMBER}
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-    publishers:
-        - archive:
-            artifacts: 'out/*'
-            latest-only: true
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/ubuntu-armhf-pre-built-images.yaml b/ubuntu-armhf-pre-built-images.yaml
deleted file mode 100644
index f540b61199..0000000000
--- a/ubuntu-armhf-pre-built-images.yaml
+++ /dev/null
@@ -1,170 +0,0 @@
-- job:
-    name: ubuntu-armhf-pre-built-images
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: true
-    node: build
-    display-name: 'Linaro Ubuntu pre-built images (armhf)'
-    scm:
-        - git:
-            url: git://git.linaro.org/ci/pre-built-images.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches: 
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: user-defined
-            name: hwpack
-            values:
-                - arndale
-                - lsk-vexpress
-                - panda
-                - vexpress
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-    builders:
-        - copyartifact:
-            project: ubuntu-armhf-rootfs
-            filter: 'out/linaro-vivid-*.tar.gz'
-            target: artifacts
-        - copyartifact:
-            project: ubuntu-armhf-hwpacks/hwpack=${hwpack},label=build
-            filter: 'out/hwpack_linaro-${hwpack}*.tar.gz'
-            target: artifacts
-            parameter-filters: 'hwpack=${hwpack},label=build'
-        - shell: |
-            #!/bin/bash
-
-            test -d out || mkdir out
-            sudo mount -t tmpfs -o size=6G tmpfs out
-
-            case "${hwpack}" in
-              snowball)
-                # XXX Hook to accept ST-Ericsson Limited License Agreement
-                export LIT="lp:~fboudra/linaro-image-tools/ste-license-agreement"
-                ;;
-              lsk-vexpress|vexpress)
-                export BOOTLOADER="uefi"
-                ;;
-            esac
-
-            export PYTHONUNBUFFERED=1
-            export HWPACK_JOB_NAME="${JOB_NAME}"
-            export TMPDIR="${WORKSPACE}/out"
-
-            case "${hwpack}" in
-              arndale|arndale-octa|highbank|midway|lsk-vexpress|panda|snowball|vexpress)
-                export ROOTFS_TYPE="developer nano"
-                python pre-built-images.py ${hwpack} -b developer -b nano
-                ;;
-            esac
-        - ssh:
-            site: 'snapshots.linaro.org'
-            target: '${JOB_NAME}/${BUILD_NUMBER}'
-            source: 'out/**/*.txt, out/**/*.img.gz*'
-            timeout: 120000
-            remove-prefix: 'out'
-            always-publish-from-master: true
-        - ssh:
-            site: 'snapshots.linaro.org file-move'
-            target: ''
-            source: ''
-            command: 'reshuffle-files --job-type prebuilt --job-name ${JOB_NAME} --build-num ${BUILD_NUMBER}'
-            timeout: 120000
-            always-publish-from-master: true
-        - shell: |
-            #!/bin/bash
-
-            export PYTHONUNBUFFERED=1
-            export HWPACK_JOB_NAME="${JOB_NAME}"
-
-            case "${hwpack}" in
-              arndale|arndale-octa|highbank|midway)
-                export DEVICE_TYPE=${hwpack}
-                ;;
-              panda)
-                export DEVICE_TYPE=panda-es
-
-                export ROOTFS_TYPE=developer
-                export HWPACK_FILE_NAME=`find out -type f -name '*_developer_*.img.gz' |xargs basename`
-                export HWPACK_BUILD_NUMBER=`echo ${HWPACK_FILE_NAME} |cut -d'_' -f3 |cut -d'-' -f2`
-                export HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER%%.img.gz}
-                python lava-submit.py
-
-                export ROOTFS_TYPE=nano
-                export HWPACK_FILE_NAME=`find out -type f -name '*_nano_*.img.gz' |xargs basename`
-                export HWPACK_BUILD_NUMBER=`echo ${HWPACK_FILE_NAME} |cut -d'_' -f3 |cut -d'-' -f2`
-                export HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER%%.img.gz}
-                python lava-submit.py
-
-                export DEVICE_TYPE=panda
-                ;;
-              snowball)
-                export DEVICE_TYPE=snowball_sd
-                ;;
-              lsk-vexpress)
-                export DEVICE_TYPE=vexpress-a9
-                ;;
-              vexpress)
-                export DEVICE_TYPE=vexpress-a9
-                ;;
-            esac
-
-            case "${hwpack}" in
-              arndale|arndale-octa|highbank|lsk-vexpress|midway|panda|snowball|vexpress)
-                export ROOTFS_TYPE=developer
-                export HWPACK_FILE_NAME=`find out -type f -name '*_developer_*.img.gz' |xargs basename`
-                export HWPACK_BUILD_NUMBER=`echo ${HWPACK_FILE_NAME} |cut -d'_' -f3 |cut -d'-' -f2`
-                export HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER%%.img.gz}
-                python lava-submit.py
-
-                export ROOTFS_TYPE=nano
-                export HWPACK_FILE_NAME=`find out -type f -name '*_nano_*.img.gz' |xargs basename`
-                export HWPACK_BUILD_NUMBER=`echo ${HWPACK_FILE_NAME} |cut -d'_' -f3 |cut -d'-' -f2`
-                export HWPACK_BUILD_NUMBER=${HWPACK_BUILD_NUMBER%%.img.gz}
-                python lava-submit.py
-                ;;
-            esac
-
-            sudo umount out
-        - ssh:
-            site: 'snapshots.linaro.org'
-            target: '${JOB_NAME}/${BUILD_NUMBER}/vivid'
-            source: 'out/**/*.html'
-            timeout: 120000
-            remove-prefix: 'out'
-            always-publish-from-master: true
-        - ssh:
-            site: 'snapshots.linaro.org file-move'
-            target: ''
-            source: ''
-            command: 'reshuffle-files --job-type prebuilt --job-name ${JOB_NAME} --build-num ${BUILD_NUMBER}'
-            timeout: 120000
-            always-publish-from-master: true
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/ubuntu-armhf-rootfs.yaml b/ubuntu-armhf-rootfs.yaml
deleted file mode 100644
index 9f26f37dc5..0000000000
--- a/ubuntu-armhf-rootfs.yaml
+++ /dev/null
@@ -1,94 +0,0 @@
-- job:
-    name: ubuntu-armhf-rootfs
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-        artifactNumToKeep: 1
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-build
-                - job-cancel
-    disabled: true
-    node: build
-    child-workspace: .
-    display-name: 'Linaro Ubuntu armhf rootfs'
-    scm:
-        - git:
-            url: git://git.linaro.org/ci/ubuntu-build-service.git
-            refspec: +refs/heads/master:refs/remotes/origin/master
-            name: origin
-            branches:
-                - refs/heads/master
-            skip-tag: true
-            shallow-clone: true
-            clean:
-                after: true
-            wipe-workspace: false
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-armhf
-        - axis:
-            type: user-defined
-            name: rootfs
-            values:
-                - alip
-                - developer
-                - gnome
-                - nano
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: build
-        - timeout:
-            timeout: 120
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            trap cleanup_exit INT TERM EXIT
-
-            cleanup_exit()
-            {
-              cd ${WORKSPACE}
-              sudo umount builddir
-            }
-
-            sudo apt-get update
-            sudo apt-get install -y --no-install-recommends cpio debootstrap live-build python-requests uuid-runtime
-            sudo dpkg -i --force-all packages/live-build_3.0.5-1linaro1_all.deb
-
-            dpkg -s qemu-user-static |grep '^Version'
-            dpkg -s live-build |grep '^Version'
-
-            test -d builddir || mkdir builddir
-            sudo mount -t tmpfs -o size=6G tmpfs builddir
-            cp -a vivid-armhf-${rootfs} builddir/
-            cd builddir/vivid-armhf-${rootfs}
-            ./configure
-            make
-
-            cd ${WORKSPACE}
-            sudo rm -rf out && mkdir out
-            sudo mv builddir/vivid-armhf-${rootfs}/linaro-vivid-* out
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py --api_version 3 --link-latest out ubuntu/images/${rootfs}/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/linaro-vivid-${rootfs}-*'
-        - email:
-            recipients: 'fathi.boudra@linaro.org riku.voipio@linaro.org'
diff --git a/upload-deb-package.yaml b/upload-deb-package.yaml
new file mode 100644
index 0000000000..9852e93714
--- /dev/null
+++ b/upload-deb-package.yaml
@@ -0,0 +1,53 @@
+- job:
+    name: upload-deb-package
+    description: upload packages to new repository
+    project-type: freestyle
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+    parameters:
+        - string:
+            name: source
+            description: 'zip or dsc source url'
+        - string:
+            name: zip
+            description: 'is source a zip?'
+            default: false
+        - string:
+            name: repo
+            description: 'repository to upload to'
+            default: 'linaro-staging-sid'
+    disabled: false
+    node: deb.ctt.linaro.org
+    display-name: 'Upload packages to repositories'
+    wrappers:
+        - timestamps
+        - build-name:
+            name: '#${BUILD_NUMBER}: ${ENV,var="source"}'
+    builders:
+        - shell:
+            !include-raw: build-package/upload-deb.sh
+    publishers:
+        - email-ext:
+            recipients: '$DEFAULT_RECIPIENTS, linaro-infrastructure-errors@lists.linaro.org'
+            attach-build-log: true
+            failure: true
+            still-failing: true
+            subject: 'build-package: ${ENV,var="source"} failed'
+            body: |
+                Build ${BUILD_NUMBER} for ${ENV,var="source"} failed
+                Build Log: ${BUILD_URL}/consoleText
+                Build URL: ${BUILD_URL}
+            send-to:
+                - requester
diff --git a/xen-packages.yaml b/xen-packages.yaml
deleted file mode 100644
index 4d19f96ec4..0000000000
--- a/xen-packages.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-- job:
-    name: xen-packages
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 30
-        numToKeep: 30
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-    disabled: true
-    display-name: 'Linaro Xen binary build'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-jessie-arm64
-                - docker-jessie-armhf
-    triggers:
-        - timed: 'H(0-30) H(9-11) * * *'
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: master
-    builders:
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            set -ex
-
-            sudo apt-get update
-            sudo apt-get -y install build-essential libncurses-dev uuid-dev libglib2.0-dev libssl-dev libaio-dev libyajl-dev gettext git python-dev libfdt-dev libpixman-1-dev wget fakeroot lsb-release e2fslibs-dev liblzma-dev pkg-config zlib1g-dev iasl python-requests u-boot-tools
-
-            rm -rf xen
-            git clone -b staging git://xenbits.xen.org/xen.git
-
-            arch=`dpkg-architecture -qDEB_HOST_ARCH`
-            case "${arch}" in
-              armhf)
-                personality=linux32
-                xenarch=arm32
-                ;;
-              arm64)
-                xenarch=arm64
-                ;;
-              amd64)
-                xenarch=x86_64
-                ;;
-            esac
-
-            cd xen
-            git log --oneline -n1
-            $personality ./configure --prefix=/usr --with-system-qemu
-            $personality make -j`getconf _NPROCESSORS_ONLN` debug=y dist-xen tools XEN_TARGET_ARCH=${xenarch}
-            $personality make debball debug=y XEN_TARGET_ARCH=${xenarch}
-
-            mkdir ${WORKSPACE}/out
-            cp -L dist/xen*.deb ${WORKSPACE}/out/xen-${arch}.deb
-            cp -L dist/install/boot/xen ${WORKSPACE}/out/xen-${arch}
-            if [ ${arch} == arm64 ]
-            then
-                mkimage -A arm -C none -T kernel -a 0x0200000 -e 0x00200000 -n Xen -d ${WORKSPACE}/out/xen-arm64 ${WORKSPACE}/out/uXen-arm64
-            fi
-            cd ..
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              out components/platform/xen/${BUILD_NUMBER}/${arch}
-            python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --make-link \
-              components/platform/xen/${BUILD_NUMBER}
-    publishers:
-        - archive:
-            artifacts: 'out/*'
-            latest-only: true
-        - email:
-            recipients: 'riku.voipio@linaro.org wookey@linaro.org Ian.Campbell@citrix.com fathi.boudra@linaro.org'
diff --git a/ynk-lof-test.yaml b/ynk-lof-test.yaml
deleted file mode 100644
index e25e5e4419..0000000000
--- a/ynk-lof-test.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-- job:
-    name: ynk-lof-test
-    project-type: matrix
-    defaults: global
-    logrotate:
-        daysToKeep: 15
-        numToKeep: 15
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-            linaro:
-                - job-build
-                - job-cancel
-                - job-configure
-    disabled: false
-    node: build
-    display-name: 'LHG test builds'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - lhg
-        - axis:
-            type: user-defined
-            name: image_type
-            values:
-                - media-weston
-        - axis:
-            type: user-defined
-            name: board_type
-            values:
-                - db410c
-    execution-strategy:
-        sequential: true
-    wrappers:
-        - timestamps
-        - matrix-tie-parent:
-            node: lhg
-    builders:
-        - shell: |
-            #!/bin/bash
-
-            set -x
-
-            export PATH="$HOME/bin:$PATH"
-
-            manifest_branch=my.jethro.testing
-            manifest_repository=https://github.com/andrey-konovalov/lhg-oe-manifests.git
-
-            rm -rf build
-
-            repo init -u $manifest_repository -b $manifest_branch -m ${image_type}-${board_type}.xml --repo-url=git://android-git.linaro.org/tools/repo
-            repo sync
-
-            MACHINE=dragonboard-410c source meta-lhg/script/envsetup.sh
-            bitbake lof-mm-image
-
-            # just try the build - don't publish anything for now
-    publishers:
-        - email:
-            recipients: 'andrey.konovalov@linaro.org'
diff --git a/yocto-check-layer.yaml b/yocto-check-layer.yaml
new file mode 100644
index 0000000000..1006c9ead1
--- /dev/null
+++ b/yocto-check-layer.yaml
@@ -0,0 +1,32 @@
+- job:
+    name: yocto-check-layer
+    project-type: freestyle
+    defaults: global
+    logrotate:
+        daysToKeep: 30
+        numToKeep: 30
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            linaro-qualcomm-ci:
+                - job-build
+                - job-cancel
+    parameters:
+        - string:
+            name: BRANCH
+            default: 'master'
+        - string:
+            name: LAYER_URL
+            default: ''
+        - string:
+            name: LAYER_BRANCH
+            default: ''
+    disabled: true
+    node: docker-stretch-amd64
+    display-name: 'Yocto Project Compatible Program Check'
+    builders:
+        - shell:
+            !include-raw: yocto/check-layer.sh
diff --git a/yocto/check-layer.sh b/yocto/check-layer.sh
new file mode 100644
index 0000000000..555fcfa89a
--- /dev/null
+++ b/yocto/check-layer.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+
+set -e
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update; then
+  echo "INFO: apt update error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 update || true
+fi
+pkg_list="gawk diffstat unzip texinfo gcc-multilib build-essential chrpath socat cpio python python-pip python-pexpect python3 python3-pip python3-pexpect xz-utils debianutils iputils-ping"
+
+if ! sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}; then
+  echo "INFO: apt install error - try again in a moment"
+  sleep 15
+  sudo DEBIAN_FRONTEND=noninteractive apt-get -q=2 install -y ${pkg_list}
+fi
+
+# Install ruamel.yaml==0.16.13
+pip install --user --force-reinstall ruamel.yaml==0.16.13
+
+git clone --depth=1 https://git.yoctoproject.org/git/poky -b ${BRANCH} && (cd poky && git log -1)
+git clone --depth=1 ${LAYER_URL} -b ${LAYER_BRANCH:-$BRANCH} layer && (cd layer && git log -1)
+
+cd poky
+source oe-init-build-env
+
+yocto-check-layer ${WORKSPACE}/layer
diff --git a/zephyr-aeolus.yaml b/zephyr-aeolus.yaml
deleted file mode 100644
index e3bd08adb1..0000000000
--- a/zephyr-aeolus.yaml
+++ /dev/null
@@ -1,78 +0,0 @@
-- job:
-    name: zephyr-aeolus
-    project-type: matrix
-    defaults: global
-    properties:
-        - authorization:
-            anonymous:
-                - job-read
-                - job-extended-read
-                - job-workspace
-            linaro:
-                - job-read
-                - job-extended-read
-                - job-build
-                - job-cancel
-        - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-    disabled: true
-    node: master
-    child-workspace: .
-    display-name: 'Zephyr Aeolus'
-    axes:
-        - axis:
-            type: slave
-            name: label
-            values:
-                - docker-xenial-amd64-13
-        - axis:
-            type: user-defined
-            name: ZEPHYR_GCC_VARIANT
-            values:
-#                - gccarmemb
-                - zephyr
-        - axis:
-            type: user-defined
-            name: PLATFORM
-            values:
-                - 96b_carbon
-                - cc3200_launchxl
-                - frdm_k64f
-                - nucleo_l476rg
-                - qemu_cortex_m3
-                - qemu_x86
-                - v2m_beetle
-        - axis:
-            type: user-defined
-            name: PROJECT
-            values:
-                - jerryscript
-                - micropython
-                - zephyr.js
-    wrappers:
-        - timestamps
-    builders:
-        - shell:
-            !include-raw: zephyr-aeolus/builders.sh
-        - inject:
-            properties-file: env_var_parameters
-        - build-name-setter:
-            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
-            macro: true
-        - linaro-publish-token
-        - shell: |
-            #!/bin/bash
-
-            # Publish
-            test -d ${HOME}/bin || mkdir ${HOME}/bin
-            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
-              --api_version 3 \
-              --link-latest \
-              out/${PLATFORM} components/kernel/aeolus/${ZEPHYR_GCC_VARIANT}/${PROJECT}/${PLATFORM}/${BUILD_NUMBER}
-
-            rm -rf out
-    publishers:
-        - email:
-            recipients: 'fathi.boudra@linaro.org kumar.gala@linaro.org paul.sokolovsky@linaro.org'
diff --git a/zephyr-aeolus/builders.sh b/zephyr-aeolus/builders.sh
index 28e40ff7e3..9d9869b1d1 100755
--- a/zephyr-aeolus/builders.sh
+++ b/zephyr-aeolus/builders.sh
@@ -27,13 +27,13 @@ git clean -fdx
 echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters
 
 # Toolchains are pre-installed and come from:
-# https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
+# https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/7-2018q2/gcc-arm-none-eabi-7-2018-q2-update-linux.tar.bz2
 # https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.2/zephyr-sdk-0.9.2-setup.run
 # To install Zephyr SDK: ./zephyr-sdk-0.9.2-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.2"
 
-case "${ZEPHYR_GCC_VARIANT}" in
+case "${ZEPHYR_TOOLCHAIN_VARIANT}" in
   gccarmemb)
-    export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-6-2017-q2-update"
+    export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-7-2018-q2-update"
   ;;
   zephyr)
     mkdir -p ${HOME}/opt
diff --git a/zephyr-net.yaml b/zephyr-net.yaml
new file mode 100644
index 0000000000..4563d043aa
--- /dev/null
+++ b/zephyr-net.yaml
@@ -0,0 +1,149 @@
+- job:
+    name: zephyr-net
+    project-type: matrix
+    defaults: global
+    properties:
+        - authorization:
+            anonymous:
+                - job-read
+                - job-extended-read
+                - job-workspace
+            everyone-flat:
+                - job-read
+                - job-extended-read
+                - job-build
+                - job-cancel
+            paul.sokolovsky@linaro.org:
+                - job-build
+                - job-read
+                - job-extended-read
+                - job-configure
+                - job-cancel
+        - build-discarder:
+            days-to-keep: 30
+            num-to-keep: 30
+            artifact-num-to-keep: 30
+        - throttle:
+            option: category
+            categories: [lite-zephyr]
+            matrix-builds: false
+            matrix-configs: true
+    parameters:
+        - string:
+            name: BRANCH
+            default: 'main'
+        - string:
+            name: GIT_COMMIT
+            default: 'HEAD'
+        - string:
+            name: LAVA_SERVER
+            default: 'validation.linaro.org/RPC2/'
+        - string:
+            name: QA_SERVER
+            default: 'https://qa-reports.linaro.org'
+        - string:
+            name: QA_SERVER_GROUP
+            default: 'lite'
+        - string:
+            name: QA_SERVER_PROJECT
+            default: 'zephyr-net'
+        - string:
+            name: USE_QA_SERVER
+            default: '1'
+        - string:
+            name: CCACHE_CTRL
+            default: ''
+#        - string:
+#            name: TWISTER_EXTRA
+#            default: '--testsuite-root samples/net/sockets/dumb_http_server'
+    disabled: false
+    node: master
+    child-workspace: .
+    display-name: "Zephyr networking tests"
+    triggers:
+        - timed: 'H H/12 * * *'
+    axes:
+        - axis:
+            type: slave
+            name: label
+            values:
+                - docker-focal-amd64-lite
+        - axis:
+            type: user-defined
+            name: ZEPHYR_TOOLCHAIN_VARIANT
+            values:
+#                - gnuarmemb
+                - zephyr
+        - axis:
+            type: user-defined
+            name: PLATFORM
+            values:
+                # - 96b_carbon
+                # - 96b_nitrogen
+                # - arduino_101
+                # - arduino_101_ble
+                # - arduino_due
+                # - bbc_microbit
+                # - cc3200_launchxl
+                # - cc3220sf_launchxl
+                # - disco_l475_iot1
+                - frdm_k64f
+                # - frdm_kw41z
+    execution-strategy:
+        combination-filter: |
+             ZEPHYR_TOOLCHAIN_VARIANT=="zephyr" || (ZEPHYR_TOOLCHAIN_VARIANT=="gnuarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86"))
+    wrappers:
+        - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_USER
+                variable: LAVA_USER
+        - credentials-binding:
+            - text:
+                credential-id: LAVA_TOKEN
+                variable: LAVA_TOKEN
+        - credentials-binding:
+            - text:
+                credential-id: QA_REPORTS_TOKEN
+                variable: QA_REPORTS_TOKEN
+    builders:
+        - shell:
+            !include-raw: lite-common/header.sh
+        - shell:
+            !include-raw: lite-common/install-toolchains.sh
+        - shell: |
+            echo TWISTER_EXTRA="--testsuite-root samples/net/sockets/dumb_http_server --testsuite-root samples/net/sockets/dumb_http_server_mt -x=BUILD_VERSION=ci_build_version" >env_var_parameters
+        - inject:
+            properties-file: env_var_parameters
+        - shell:
+            !include-raw: zephyr-net/builders.sh
+        - inject:
+            properties-file: env_var_parameters
+        - build-name-setter:
+            template: '#${BUILD_NUMBER}-${GIT_COMMIT_ID}'
+            macro: true
+        - linaro-publish-token
+        - inject:
+            properties-file: env_var_parameters
+        - shell: |
+            #!/bin/bash
+
+            # Publish
+            test -d ${HOME}/bin || mkdir ${HOME}/bin
+            wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
+            time python3 ${HOME}/bin/linaro-cp.py \
+              --api_version 3 \
+              --link-latest \
+              out/${PLATFORM} components/kernel/zephyr-net/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+
+        - shell: |
+            #!/bin/bash -ex
+
+            rm -rf configs
+            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
+            git clone --depth 1 https://github.com/pfalcon/lite-build-tools
+            ./configs/zephyr-net/submit-test.sh
+
+#    publishers:
+#        - email:
+#            recipients: 'first.last@linaro.org'
diff --git a/zephyr-net/builders.sh b/zephyr-net/builders.sh
new file mode 100755
index 0000000000..a38f45e4b8
--- /dev/null
+++ b/zephyr-net/builders.sh
@@ -0,0 +1,102 @@
+#!/bin/bash
+
+sudo apt-get -q=2 update
+
+# gcc-arm-none-eabi
+sudo apt-get -q=2 -y install ninja-build gperf python3-ply \
+    rsync device-tree-compiler \
+    python3-pip python3-serial python3-setuptools python3-wheel \
+    python3-requests python3-pyelftools util-linux rename
+
+set -ex
+
+sudo pip3 install west psutil
+west --version
+
+git clone -b ${BRANCH} https://github.com/zephyrproject-rtos/zephyr.git
+west init -l zephyr/
+west update
+
+cd zephyr
+git clean -fdx
+if [ -n "${GIT_COMMIT}" ]; then
+  git checkout ${GIT_COMMIT}
+fi
+echo "GIT_COMMIT_ID=$(git rev-parse --short=8 HEAD)" > ${WORKSPACE}/env_var_parameters
+echo "EXTERNAL_BUILD_ID=$(git rev-parse --short=8 HEAD)-${BUILD_NUMBER}" >> ${WORKSPACE}/env_var_parameters
+
+# Toolchains are downloaded once (per release) and cached in a persistent
+# docker volume under ${HOME}/srv/toolchain/.
+# Note that Zephyr SDK is needed even when building with the gnuarmemb
+# toolchain, ZEPHYR_SDK_INSTALL_DIR is needed to find things like conf.
+export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.15.0"
+export GNUARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-8-2019-q3-update"
+
+# Set build environment variables
+export LANG=C.UTF-8
+ZEPHYR_BASE=${WORKSPACE}/zephyr
+PATH=${ZEPHYR_BASE}/scripts:${PATH}
+OUTDIR=${WORKSPACE}/zephyr-build/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}
+export LANG ZEPHYR_BASE PATH
+CCACHE_DIR="${HOME}/srv/ccache-zephyr/${BRANCH}"
+CCACHE_UNIFY=1
+CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
+USE_CCACHE=1
+export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS USE_CCACHE
+env |grep '^ZEPHYR'
+mkdir -p "${CCACHE_DIR}"
+rm -rf ${OUTDIR}
+
+if [ -n "${CCACHE_CTRL}" ]; then
+    time CCACHE_DIR=${CCACHE_DIR} ccache ${CCACHE_CTRL}
+fi
+
+echo ""
+echo "########################################################################"
+echo "    build (twister)"
+echo "########################################################################"
+
+# Show ccache stats both before and after build.
+CCACHE_DIR=${CCACHE_DIR} ccache --show-stats
+
+time ${ZEPHYR_BASE}/scripts/twister \
+  --platform ${PLATFORM} \
+  --inline-logs \
+  --verbose \
+  --build-only \
+  --outdir ${OUTDIR} \
+  --enable-slow \
+  -x=USE_CCACHE=${USE_CCACHE} \
+  ${TWISTER_EXTRA}
+
+CCACHE_DIR=${CCACHE_DIR} ccache --show-stats
+
+# Put report where rsync below will pick it up.
+cp ${OUTDIR}/twister.json ${OUTDIR}/${PLATFORM}/
+
+cd ${ZEPHYR_BASE}
+# OUTDIR is already per-platform, but it may get contaminated with unrelated
+# builds e.g. due to bugs in twister script. It however stores builds in
+# per-platform named subdirs under its --outdir (${OUTDIR} in our case), so
+# we use ${OUTDIR}/${PLATFORM} paths below.
+find ${OUTDIR}/${PLATFORM} -type f -name '.config' -exec rename 's/.config/zephyr.config/' {} +
+rsync -avm \
+  --include=zephyr.bin \
+  --include=zephyr.config \
+  --include=zephyr.elf \
+  --include='twister.*' \
+  --include='*/' \
+  --exclude='*' \
+  ${OUTDIR}/${PLATFORM} ${WORKSPACE}/out/
+find ${OUTDIR}/${PLATFORM} -type f -name 'zephyr.config' -delete
+# If there are support files, ship them.
+BOARD_CONFIG=$(find "${ZEPHYR_BASE}/boards/" -type f -name "${PLATFORM}_defconfig")
+BOARD_DIR=$(dirname ${BOARD_CONFIG})
+test -d "${BOARD_DIR}/support" && rsync -avm "${BOARD_DIR}/support" "${WORKSPACE}/out/${PLATFORM}"
+
+cd ${WORKSPACE}/
+echo "=== contents of ${WORKSPACE}/out/ ==="
+find out
+echo "=== end of contents of ${WORKSPACE}/out/ ==="
+
+CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
diff --git a/zephyr-net/lava-job-definitions/arduino101/template.yaml b/zephyr-net/lava-job-definitions/arduino101/template.yaml
new file mode 100644
index 0000000000..c6bd729bc0
--- /dev/null
+++ b/zephyr-net/lava-job-definitions/arduino101/template.yaml
@@ -0,0 +1,50 @@
+# Zephyr JOB definition for Arduino101
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 5
+  actions:
+    lava-test-monitor:
+      seconds: 300
+    wait-usb-device:
+      seconds: 20
+    flash-dfu:
+      seconds: 60
+  connections:
+    lava-test-monitor:
+      seconds: 300
+
+priority: medium
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        app:
+          image_arg: --alt x86_app --download {app}
+          url: '$test_url'
+
+- boot:
+    method: dfu
+    timeout:
+      minutes: 10
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
diff --git a/zephyr-net/lava-job-definitions/disco-l475-iot1/template.yaml b/zephyr-net/lava-job-definitions/disco-l475-iot1/template.yaml
new file mode 100644
index 0000000000..6d55c397c8
--- /dev/null
+++ b/zephyr-net/lava-job-definitions/disco-l475-iot1/template.yaml
@@ -0,0 +1,42 @@
+# Zephyr JOB definition for disco-l475-iot1
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 3
+  actions:
+    wait-usb-device:
+      seconds: 40
+
+priority: medium
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          url: '$test_url'
+
+- boot:
+    method: cmsis-dap
+    timeout:
+      minutes: 10
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
diff --git a/zephyr-net/lava-job-definitions/frdm-k64f/template.yaml b/zephyr-net/lava-job-definitions/frdm-k64f/template.yaml
new file mode 100644
index 0000000000..8a5cdc7362
--- /dev/null
+++ b/zephyr-net/lava-job-definitions/frdm-k64f/template.yaml
@@ -0,0 +1,42 @@
+# Zephyr JOB definition for frdm-k64f
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 3
+  actions:
+    wait-usb-device:
+      seconds: 40
+
+priority: medium
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          url: '$test_url'
+
+- boot:
+    method: cmsis-dap
+    timeout:
+      minutes: 10
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
diff --git a/zephyr-net/lava-job-definitions/frdm-kw41z/template.yaml b/zephyr-net/lava-job-definitions/frdm-kw41z/template.yaml
new file mode 100644
index 0000000000..8b24ef030d
--- /dev/null
+++ b/zephyr-net/lava-job-definitions/frdm-kw41z/template.yaml
@@ -0,0 +1,42 @@
+# Zephyr JOB definition for frdm-kw41z
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 3
+  actions:
+    wait-usb-device:
+      seconds: 40
+
+priority: medium
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          url: '$test_url'
+
+- boot:
+    method: pyocd
+    timeout:
+      minutes: 10
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
diff --git a/zephyr-net/lava-job-definitions/qemu/template.yaml b/zephyr-net/lava-job-definitions/qemu/template.yaml
new file mode 100644
index 0000000000..c01025c78b
--- /dev/null
+++ b/zephyr-net/lava-job-definitions/qemu/template.yaml
@@ -0,0 +1,48 @@
+# Zephyr JOB definition for QEMU
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 2
+priority: medium
+visibility: public
+
+context:
+  arch: arm
+  cpu: cortex-m3
+  machine: lm3s6965evb
+  model: 'model=stellaris'
+  serial: '-serial mon:stdio'
+  vga: '-vga none'
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          image_arg: '-kernel {zephyr}'
+          url: '$test_url'
+
+- boot:
+    method: qemu
+    timeout:
+      minutes: 2
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
+
diff --git a/zephyr-net/submit-test.sh b/zephyr-net/submit-test.sh
new file mode 100755
index 0000000000..5e81547f50
--- /dev/null
+++ b/zephyr-net/submit-test.sh
@@ -0,0 +1,66 @@
+#!/bin/sh
+set -ex
+
+export PATH=$HOME/.local/bin:$PATH
+dir=$(dirname $0)
+
+sudo apt-get -qq -y install jq python3-pip
+# "yq" the Python version, https://github.com/kislyuk/yq, requires jq
+# Used to replace image url in the job template.
+pip3 install yq
+
+# "yq" the Go version, https://github.com/mikefarah/yq
+#wget -q https://github.com/mikefarah/yq/releases/download/3.1.0/yq_linux_amd64
+#chmod +x yq_linux_amd64
+#./yq_linux_amd64 w lite-lava-docker-compose/example/docker-xilinx-qemu-openamp-echo_test.job actions[1].boot.command $IMAGE_URL > lava.job
+
+# For now, always check out latest version
+rm -rf lite-lava-docker-compose
+if [ ! -d lite-lava-docker-compose ]; then
+    git clone --depth 1 https://github.com/Linaro/lite-lava-docker-compose
+fi
+
+# Tool to template LAVA jobs.
+LAVAJOBTPL="python3 $dir/../../lite-build-tools/lava_job_tpl.py"
+
+ARTIFACT_URL="http://snapshots.linaro.org/components/kernel/zephyr-net/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}"
+
+BASE="${ARTIFACT_URL}/samples/net/sockets"
+
+IMAGE_URL="${BASE}/dumb_http_server/sample.net.sockets.dumb_http_server/zephyr/zephyr.bin"
+JOB_TEMPLATE="lite-lava-docker-compose/example/zephyr-net-ping-frdm_k64f.job"
+#yq -y ".actions[0].deploy.images.zephyr.url=\"$IMAGE_URL\"" $JOB_TEMPLATE > lava.job
+$LAVAJOBTPL $JOB_TEMPLATE \
+    metadata.job_name=@job_name \
+    .actions[0].deploy.images.zephyr.url=$IMAGE_URL \
+    metadata.test-binary-url=$IMAGE_URL \
+    metadata.git-commit=$GIT_COMMIT_ID \
+    >lava.job
+python3 $dir/../../lite-build-tools/lava_submit.py lava.job
+echo
+
+IMAGE_URL="${BASE}/dumb_http_server/sample.net.sockets.dumb_http_server/zephyr/zephyr.bin"
+JOB_TEMPLATE="lite-lava-docker-compose/example/zephyr-net-http-ab-frdm_k64f.job"
+#yq -y ".actions[0].deploy.images.zephyr.url=\"$IMAGE_URL\"" $JOB_TEMPLATE > lava.job
+$LAVAJOBTPL $JOB_TEMPLATE \
+    job_name=zephyr-net-http-ab \
+    metadata.job_name=@job_name \
+    .actions[0].deploy.images.zephyr.url=$IMAGE_URL \
+    metadata.test-binary-url=$IMAGE_URL \
+    metadata.git-commit=$GIT_COMMIT_ID \
+    >lava.job
+python3 $dir/../../lite-build-tools/lava_submit.py lava.job
+echo
+
+IMAGE_URL="${BASE}/dumb_http_server_mt/sample.net.sockets.dumb_http_server_mt/zephyr/zephyr.bin"
+JOB_TEMPLATE="lite-lava-docker-compose/example/zephyr-net-http-ab-frdm_k64f.job"
+#yq -y ".actions[0].deploy.images.zephyr.url=\"$IMAGE_URL\"" $JOB_TEMPLATE > lava.job
+$LAVAJOBTPL $JOB_TEMPLATE \
+    job_name=zephyr-net-http-mt-ab \
+    metadata.job_name=@job_name \
+    .actions[0].deploy.images.zephyr.url=$IMAGE_URL \
+    metadata.test-binary-url=$IMAGE_URL \
+    metadata.git-commit=$GIT_COMMIT_ID \
+    >lava.job
+python3 $dir/../../lite-build-tools/lava_submit.py lava.job
+echo
diff --git a/zephyr-upstream-arm.yaml b/zephyr-upstream-arm.yaml
index 2398f17af6..9247cb6ea6 100644
--- a/zephyr-upstream-arm.yaml
+++ b/zephyr-upstream-arm.yaml
@@ -8,7 +8,7 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
@@ -35,7 +35,7 @@
         - string:
             name: GIT_COMMIT
             default: 'master'
-    disabled: false
+    disabled: true
     node: master
     child-workspace: .
     display-name: 'Zephyr project (arm)'
@@ -47,9 +47,9 @@
                 - docker-xenial-amd64-13
         - axis:
             type: user-defined
-            name: ZEPHYR_GCC_VARIANT
+            name: ZEPHYR_TOOLCHAIN_VARIANT
             values:
-                - gccarmemb
+                - gnuarmemb
                 - zephyr
         - axis:
             type: user-defined
@@ -71,8 +71,8 @@
                 # - nrf51_blenano
                 # - nrf51_pca10028
                 # - nrf52_pca10040
-                # - nucleo_f103rb
-                # - nucleo_f401re
+                - nucleo_f103rb
+                - nucleo_f401re
                 # - nucleo_l476rg
                 # - olimexino_stm32
                 - qemu_cortex_m3
@@ -82,7 +82,7 @@
                 # - v2m_beetle
     execution-strategy:
         combination-filter: |
-             ZEPHYR_GCC_VARIANT=="zephyr" || (ZEPHYR_GCC_VARIANT=="gccarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86"))
+             ZEPHYR_TOOLCHAIN_VARIANT=="zephyr" || (ZEPHYR_TOOLCHAIN_VARIANT=="gnuarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86"))
     wrappers:
         - timestamps
         - credentials-binding:
@@ -112,13 +112,13 @@
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
               --link-latest \
-              out/${PLATFORM} components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+              out/${PLATFORM} components/kernel/zephyr/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
 
         - shell: |
-            #!/bin/bash -e
+            #!/bin/bash -ex
 
             case "${PLATFORM}" in
               frdm_k64f)
@@ -127,6 +127,9 @@
               frdm_kw41z)
                 export DEVICE_TYPE=frdm-kw41z
                 ;;
+              disco_l475_iot1)
+                export DEVICE_TYPE=disco-l475-iot1
+                ;;
               qemu_cortex_m3)
                 export DEVICE_TYPE=qemu
                 ;;
@@ -150,12 +153,11 @@
                 --qa-server ${QA_SERVER} \
                 --qa-server-team lite \
                 --qa-server-project zephyr-upstream-arm \
-                --gcc-variant ${ZEPHYR_GCC_VARIANT} \
-                --git-commit ${GIT_COMMIT} \
-                --build-url ${BUILD_URL} \
+                --gcc-variant ${ZEPHYR_TOOLCHAIN_VARIANT} \
+                --git-commit ${GIT_COMMIT}
 
     publishers:
         - archive:
             artifacts: 'scripts/sanity_chk/last_sanity.csv'
         - email:
-            recipients: 'fathi.boudra@linaro.org kumar.gala@linaro.org'
+            recipients: 'fathi.boudra@linaro.org kumar.gala@linaro.org gpitney@ti.com vincent.wan@linaro.org'
diff --git a/zephyr-upstream.yaml b/zephyr-upstream.yaml
index 2000e94ded..7f96298f2a 100644
--- a/zephyr-upstream.yaml
+++ b/zephyr-upstream.yaml
@@ -8,15 +8,15 @@
                 - job-read
                 - job-extended-read
                 - job-workspace
-            linaro:
+            everyone-flat:
                 - job-read
                 - job-extended-read
                 - job-build
                 - job-cancel
         - build-discarder:
-            days-to-keep: 30
-            num-to-keep: 30
-            artifact-num-to-keep: 30
+            days-to-keep: 60
+            num-to-keep: 60
+            artifact-num-to-keep: 60
         - throttle:
             option: category
             categories: [lite-zephyr]
@@ -25,7 +25,7 @@
     parameters:
         - string:
             name: BRANCH
-            default: 'master'
+            default: 'main'
         - string:
             name: LAVA_SERVER
             default: 'validation.linaro.org/RPC2/'
@@ -34,55 +34,55 @@
             default: 'https://qa-reports.linaro.org'
         - string:
             name: GIT_COMMIT
-            default: 'master'
-    disabled: false
+            default: 'HEAD'
+        - string:
+            name: TWISTER_EXTRA
+            default: '--enable-slow -x=BUILD_VERSION=ci_build_version'
+    disabled: true
     node: master
     child-workspace: .
-    display-name: 'Zephyr project (master)'
+    display-name: 'Zephyr project (main)'
+# We should avoid starting this job "on its own". That's because default
+# Git revision it builds is main/HEAD, and as this is a matrix job,
+# different sub-builds may get different actual HEAD revision (e.g. if
+# the tree is actively committed to). Instead, it should be triggered
+# externally, with GIT_COMMIT parameter set to a specific SHA1 revision
+# to build. This is achieved using "trigger-zephyr-upstream" trigger
+# job.
+#    triggers:
+#        - timed: 'H H/12 * * *'
     axes:
         - axis:
             type: slave
             name: label
             values:
-                - docker-xenial-amd64-13
+                - docker-focal-amd64-lite
         - axis:
             type: user-defined
-            name: ZEPHYR_GCC_VARIANT
+            name: ZEPHYR_TOOLCHAIN_VARIANT
             values:
-                - gccarmemb
+                - gnuarmemb
                 - zephyr
         - axis:
             type: user-defined
             name: PLATFORM
             values:
-                # - 96b_carbon
-                # - 96b_nitrogen
-                # - arduino_101
-                # - arduino_101_ble
-                # - arduino_due
-                # - bbc_microbit
-                # - cc3200_launchxl
-                - cc3220sf_launchxl
+                # Jenkins runs these configurations in non-obvious, but
+                # mostly stable manner. Configurations are ordered to
+                # get frdm_k64f built first, as it's both a "default"
+                # test target, and easily contains more tests than other
+                # targets (== could make whole job longer if run last).
                 - disco_l475_iot1
-                - frdm_k64f
                 - frdm_kw41z
-                # - hexiwear_k64
-                # - mps2_an385
-                # - nrf51_blenano
-                # - nrf51_pca10028
-                # - nrf52_pca10040
-                # - nucleo_f103rb
-                # - nucleo_f401re
-                # - nucleo_l476rg
-                # - olimexino_stm32
+                - lpcxpresso55s69_cpu0
+                - mps2_an385
+                - nucleo_f103rb
+                - frdm_k64f
+                - nucleo_f401re
                 - qemu_cortex_m3
-                # - qemu_x86
-                # - quark_se_c1000_ble
-                # - stm32_mini_a15
-                # - v2m_beetle
     execution-strategy:
         combination-filter: |
-             ZEPHYR_GCC_VARIANT=="zephyr" || (ZEPHYR_GCC_VARIANT=="gccarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86"))
+             ZEPHYR_TOOLCHAIN_VARIANT=="zephyr" || (ZEPHYR_TOOLCHAIN_VARIANT=="gnuarmemb" && !(PLATFORM=="arduino_101" || PLATFORM=="qemu_x86"))
     wrappers:
         - timestamps
         - credentials-binding:
@@ -99,27 +99,34 @@
                 variable: QA_REPORTS_TOKEN
     builders:
         - shell:
+            !include-raw: lite-common/header.sh
+        - shell:
+            !include-raw: lite-common/install-toolchains.sh
+        - shell:
             !include-raw: zephyr-upstream/builders.sh
         - inject:
             properties-file: env_var_parameters
         - build-name-setter:
-            template: '#${BUILD_NUMBER}-${GIT_COMMIT}'
+            template: '#${BUILD_NUMBER}-${GIT_COMMIT_ID}'
             macro: true
         - linaro-publish-token
+        - inject:
+            properties-file: env_var_parameters
         - shell: |
             #!/bin/bash
 
             # Publish
             test -d ${HOME}/bin || mkdir ${HOME}/bin
             wget -q https://git.linaro.org/ci/publishing-api.git/blob_plain/HEAD:/linaro-cp.py -O ${HOME}/bin/linaro-cp.py
-            time python ${HOME}/bin/linaro-cp.py \
+            time python3 ${HOME}/bin/linaro-cp.py \
               --api_version 3 \
-              --link-latest \
-              out/${PLATFORM} components/kernel/zephyr/${BRANCH}/${ZEPHYR_GCC_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+              out/${PLATFORM} components/kernel/zephyr/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}
+            echo "Build artifacts download URL: https://snapshots.linaro.org/components/kernel/zephyr/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}/${BUILD_NUMBER}/"
 
         - shell: |
-            #!/bin/bash -e
+            #!/bin/bash -ex
 
+            # Remap Zephyr platform/board name to LAVA device type name.
             case "${PLATFORM}" in
               frdm_k64f)
                 export DEVICE_TYPE=frdm-k64f
@@ -127,20 +134,33 @@
               frdm_kw41z)
                 export DEVICE_TYPE=frdm-kw41z
                 ;;
+              disco_l475_iot1)
+                export DEVICE_TYPE=disco-l475-iot1
+                ;;
+              lpcxpresso55s69_cpu0)
+                export DEVICE_TYPE=lpcxpresso55s69
+                #LAVA_SERVER="staging.validation.linaro.org/RPC2/"
+                ;;
               qemu_cortex_m3)
                 export DEVICE_TYPE=qemu
                 ;;
               *)
-                echo "Skip DEVICE_TYPE for ${PLATFORM}"
+                echo "Skipping LAVA testing for ${PLATFORM} (no LAVA device type mapping)"
                 ;;
             esac
 
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
 
-            [ "${GIT_COMMIT}" = "master" ] && unset DEVICE_TYPE
-            [ -z "${DEVICE_TYPE}" ] || \
-            python configs/zephyr-upstream/submit_for_testing.py \
+            # 2021-04-28 - try to submit all (== ~2 builds per day) to LAVA.
+            #if [ "${ROOT_BUILD_CAUSE}" = "SCMTRIGGER" ]; then
+            #    echo "Skipping LAVA testing for SCM Trigger builds (to not overload LAVA)"
+            #    unset DEVICE_TYPE
+            #fi
+
+            if [ -n "${DEVICE_TYPE}" ]; then
+                rm -rf configs
+                git clone --depth 1 --single-branch http://git.linaro.org/ci/job/configs.git
+
+                python3 configs/zephyr-upstream/submit_for_testing.py \
                 --board-name ${PLATFORM} \
                 --device-type ${DEVICE_TYPE} \
                 --build-number ${BUILD_NUMBER} \
@@ -150,12 +170,10 @@
                 --qa-server ${QA_SERVER} \
                 --qa-server-team lite \
                 --qa-server-project zephyr-upstream \
-                --gcc-variant ${ZEPHYR_GCC_VARIANT} \
-                --git-commit ${GIT_COMMIT} \
-                --build-url ${BUILD_URL} \
+                --gcc-variant ${ZEPHYR_TOOLCHAIN_VARIANT} \
+                --git-commit ${GIT_COMMIT_ID}
+            fi
 
     publishers:
-        - archive:
-            artifacts: 'scripts/sanity_chk/last_sanity.csv'
         - email:
-            recipients: 'fathi.boudra@linaro.org kumar.gala@linaro.org'
+            recipients: 'fathi.boudra@linaro.org erwan.gouriou@linaro.org'
diff --git a/zephyr-upstream/builders.sh b/zephyr-upstream/builders.sh
index 77d91beacc..89030f3797 100755
--- a/zephyr-upstream/builders.sh
+++ b/zephyr-upstream/builders.sh
@@ -1,71 +1,85 @@
 #!/bin/bash
 
+echo "Going to build:"
+echo "git branch: ${BRANCH}"
+echo "git revision: ${GIT_COMMIT}"
+echo "Root build cause: ${ROOT_BUILD_CAUSE}"
+echo
+
 sudo apt-get -q=2 update
-sudo apt-get -q=2 -y install git ninja-build g++ g++-multilib gperf python3-ply \
-    python3-yaml gcc-arm-none-eabi python-requests rsync device-tree-compiler \
-    python3-pip python3-setuptools python3-wheel
+
+# gcc-arm-none-eabi
+sudo apt-get -q=2 -y install git ninja-build g++ gperf python3-ply \
+    rsync device-tree-compiler \
+    python3-pip python3-serial python3-setuptools python3-wheel \
+    python3-requests util-linux rename srecord \
+    protobuf-compiler python3-protobuf
 
 set -ex
 
-# Distro package is too old for Zephyr
-sudo pip3 install pyelftools pykwalify
-# CMake is pre-installed
-#cmake_version=3.9.5
-#wget -q https://cmake.org/files/v3.9/cmake-${cmake_version}-Linux-x86_64.tar.gz
-#tar xf cmake-${cmake_version}-Linux-x86_64.tar.gz
-#cp -a cmake-${cmake_version}-Linux-x86_64/bin/* /usr/local/bin/
-#cp -a cmake-${cmake_version}-Linux-x86_64/share/* /usr/local/share/
-#rm -rf cmake-${cmake_version}-Linux-x86_64
-#cmake -version
-
-git clone -b ${BRANCH} https://git.linaro.org/lite/zephyr.git ${WORKSPACE}
+sudo pip3 install west pyelftools psutil cryptography pyasn1 pyyaml cbor>=1.0.0 imgtool>=1.9.0 jinja2 click
+west --version
+
+git clone -b ${BRANCH} https://github.com/zephyrproject-rtos/zephyr.git
+west init -l zephyr/
+west update
+
+cd zephyr
 git clean -fdx
 if [ -n "${GIT_COMMIT}" ]; then
   git checkout ${GIT_COMMIT}
 fi
-echo "GIT_COMMIT=$(git rev-parse --short=8 HEAD)" > env_var_parameters
-
-head -5 Makefile
+echo "GIT_COMMIT_ID=$(git rev-parse --short=8 HEAD)" > ${WORKSPACE}/env_var_parameters
 
-# Toolchains are pre-installed and come from:
-# https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/6-2017q2/gcc-arm-none-eabi-6-2017-q2-update-linux.tar.bz2
-# https://github.com/zephyrproject-rtos/meta-zephyr-sdk/releases/download/0.9.2/zephyr-sdk-0.9.2-setup.run
-# To install Zephyr SDK: ./zephyr-sdk-0.9.2-setup.run --quiet --nox11 -- <<< "${HOME}/srv/toolchain/zephyr-sdk-0.9.2"
-
-export GCCARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-6-2017-q2-update"
-# We building with the gccarmemb toolchain, we need ZEPHYR_SDK_INSTALL_DIR to find things like conf
-export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.9.2"
+# Toolchains are downloaded once (per release) and cached in a persistent
+# docker volume under ${HOME}/srv/toolchain/.
+# Note that Zephyr SDK is needed even when building with the gnuarmemb
+# toolchain, ZEPHYR_SDK_INSTALL_DIR is needed to find things like conf.
+export ZEPHYR_SDK_INSTALL_DIR="${HOME}/srv/toolchain/zephyr-sdk-0.15.0"
+export GNUARMEMB_TOOLCHAIN_PATH="${HOME}/srv/toolchain/gcc-arm-none-eabi-9-2019-q4-major"
 
 # Set build environment variables
-LANG=C
-ZEPHYR_BASE=${WORKSPACE}
+export LANG=C.UTF-8
+ZEPHYR_BASE=${WORKSPACE}/zephyr
 PATH=${ZEPHYR_BASE}/scripts:${PATH}
-OUTDIR=${HOME}/srv/zephyr/${ZEPHYR_GCC_VARIANT}/${PLATFORM}
+#OUTDIR=${HOME}/srv/zephyr/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}
+OUTDIR=${WORKSPACE}/zephyr-out/${BRANCH}/${ZEPHYR_TOOLCHAIN_VARIANT}/${PLATFORM}
 export LANG ZEPHYR_BASE PATH
-CCACHE_DIR="${HOME}/srv/ccache"
+CCACHE_DIR="${HOME}/srv/ccache-zephyr/${BRANCH}"
 CCACHE_UNIFY=1
 CCACHE_SLOPPINESS=file_macro,include_file_mtime,time_macros
 USE_CCACHE=1
 export CCACHE_DIR CCACHE_UNIFY CCACHE_SLOPPINESS USE_CCACHE
 env |grep '^ZEPHYR'
+mkdir -p "${CCACHE_DIR}"
+rm -rf ${OUTDIR}
 
 echo ""
 echo "########################################################################"
-echo "    sanitycheck"
+echo "    mass-build (twister)"
 echo "########################################################################"
 
-time ${WORKSPACE}/scripts/sanitycheck \
+# Show ccache stats both before and after build.
+CCACHE_DIR=${CCACHE_DIR} ccache --show-stats
+
+time ${ZEPHYR_BASE}/scripts/twister \
   --platform ${PLATFORM} \
   --inline-logs \
+  --verbose \
   --build-only \
   --outdir ${OUTDIR} \
-  --no-clean \
-  --enable-slow \
-  -x=USE_CCACHE=${USE_CCACHE}
+  -x=USE_CCACHE=${USE_CCACHE} \
+  --jobs 2 \
+  ${TWISTER_EXTRA}
+
+CCACHE_DIR=${CCACHE_DIR} ccache --show-stats
 
-cd ${WORKSPACE}
+# Put report where rsync below will pick it up.
+cp ${OUTDIR}/twister.json ${OUTDIR}/${PLATFORM}/
+
+cd ${ZEPHYR_BASE}
 # OUTDIR is already per-platform, but it may get contaminated with unrelated
-# builds e.g. due to bugs in sanitycheck script. It however stores builds in
+# builds e.g. due to bugs in twister script. It however stores builds in
 # per-platform named subdirs under its --outdir (${OUTDIR} in our case), so
 # we use ${OUTDIR}/${PLATFORM} paths below.
 find ${OUTDIR}/${PLATFORM} -type f -name '.config' -exec rename 's/.config/zephyr.config/' {} +
@@ -73,10 +87,19 @@ rsync -avm \
   --include=zephyr.bin \
   --include=zephyr.config \
   --include=zephyr.elf \
+  --include='twister.*' \
   --include='*/' \
   --exclude='*' \
-  ${OUTDIR}/${PLATFORM} out/
+  ${OUTDIR}/${PLATFORM} ${WORKSPACE}/out/
 find ${OUTDIR}/${PLATFORM} -type f -name 'zephyr.config' -delete
+# If there are support files, ship them.
+BOARD_CONFIG=$(find "${ZEPHYR_BASE}/boards/" -type f -name "${PLATFORM}_defconfig")
+BOARD_DIR=$(dirname ${BOARD_CONFIG})
+test -d "${BOARD_DIR}/support" && rsync -avm "${BOARD_DIR}/support" "${WORKSPACE}/out/${PLATFORM}"
+
+cd ${WORKSPACE}/
+echo "=== contents of ${WORKSPACE}/out/ ==="
+find out
+echo "=== end of contents of ${WORKSPACE}/out/ ==="
 
 CCACHE_DIR=${CCACHE_DIR} ccache -M 30G
-CCACHE_DIR=${CCACHE_DIR} ccache -s
diff --git a/zephyr-upstream/lava-job-definitions/arduino101/template.yaml b/zephyr-upstream/lava-job-definitions/arduino101/template.yaml
index 67d15ebf65..29520c7f93 100644
--- a/zephyr-upstream/lava-job-definitions/arduino101/template.yaml
+++ b/zephyr-upstream/lava-job-definitions/arduino101/template.yaml
@@ -18,7 +18,10 @@ timeouts:
     lava-test-monitor:
       seconds: 300
 
-priority: medium
+# We submit gazillion of Zephyr test jobs, so set priority to low, to
+# allow e.g. manually submitted job to preempt such a flow and run sooner
+# than in a few hours.
+priority: low
 visibility: public
 
 actions:
@@ -39,14 +42,7 @@ actions:
 - test:
     timeout:
       minutes: 10
-    monitors:
-    - name: '$test_name'
-      start: (tc_start\(\)|starting .*test|BOOTING ZEPHYR OS)
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
-      fixupdict:
-        PASS: pass
-        FAIL: fail
+$test_action
 
 metadata:
   build-url: $build_url
diff --git a/zephyr-upstream/lava-job-definitions/disco-l475-iot1/template.yaml b/zephyr-upstream/lava-job-definitions/disco-l475-iot1/template.yaml
new file mode 100644
index 0000000000..6e890a3148
--- /dev/null
+++ b/zephyr-upstream/lava-job-definitions/disco-l475-iot1/template.yaml
@@ -0,0 +1,45 @@
+# Zephyr JOB definition for disco-l475-iot1
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 3
+  actions:
+    wait-usb-device:
+      seconds: 40
+
+# We submit gazillion of Zephyr test jobs, so set priority to low, to
+# allow e.g. manually submitted job to preempt such a flow and run sooner
+# than in a few hours.
+priority: low
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          url: '$test_url'
+
+- boot:
+    method: cmsis-dap
+    timeout:
+      minutes: 3
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
diff --git a/zephyr-upstream/lava-job-definitions/frdm-k64f/template.yaml b/zephyr-upstream/lava-job-definitions/frdm-k64f/template.yaml
index f0c44244aa..222aaf8bf3 100644
--- a/zephyr-upstream/lava-job-definitions/frdm-k64f/template.yaml
+++ b/zephyr-upstream/lava-job-definitions/frdm-k64f/template.yaml
@@ -11,7 +11,10 @@ timeouts:
     wait-usb-device:
       seconds: 40
 
-priority: medium
+# We submit gazillion of Zephyr test jobs, so set priority to low, to
+# allow e.g. manually submitted job to preempt such a flow and run sooner
+# than in a few hours.
+priority: low
 visibility: public
 
 actions:
@@ -24,21 +27,15 @@ actions:
           url: '$test_url'
 
 - boot:
-    method: cmsis-dap
+    method: pyocd
+    failure_retry: 3
     timeout:
-      minutes: 10
+      minutes: 3
 
 - test:
     timeout:
       minutes: 10
-    monitors:
-    - name: '$test_name'
-      start: (tc_start\(\)|starting .*test|BOOTING ZEPHYR OS)
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
-      fixupdict:
-        PASS: pass
-        FAIL: fail
+$test_action
 
 metadata:
   build-url: $build_url
diff --git a/zephyr-upstream/lava-job-definitions/frdm-kw41z/template.yaml b/zephyr-upstream/lava-job-definitions/frdm-kw41z/template.yaml
index 6165856a05..bb7ad836dc 100644
--- a/zephyr-upstream/lava-job-definitions/frdm-kw41z/template.yaml
+++ b/zephyr-upstream/lava-job-definitions/frdm-kw41z/template.yaml
@@ -4,14 +4,17 @@ job_name: 'zephyr-upstream $test_name'
 
 timeouts:
   job:
-    minutes: 30
+    minutes: 5
   action:
     minutes: 3
   actions:
     wait-usb-device:
       seconds: 40
 
-priority: medium
+# We submit gazillion of Zephyr test jobs, so set priority to low, to
+# allow e.g. manually submitted job to preempt such a flow and run sooner
+# than in a few hours.
+priority: low
 visibility: public
 
 actions:
@@ -25,20 +28,14 @@ actions:
 
 - boot:
     method: pyocd
+    failure_retry: 3
     timeout:
-      minutes: 10
+      minutes: 3
 
 - test:
     timeout:
-      minutes: 10
-    monitors:
-    - name: '$test_name'
-      start: (tc_start\(\)|starting .*test|BOOTING ZEPHYR OS)
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
-      fixupdict:
-        PASS: pass
-        FAIL: fail
+      minutes: 3
+$test_action
 
 metadata:
   build-url: $build_url
diff --git a/zephyr-upstream/lava-job-definitions/lpcxpresso55s69/template.yaml b/zephyr-upstream/lava-job-definitions/lpcxpresso55s69/template.yaml
new file mode 100644
index 0000000000..faafce95df
--- /dev/null
+++ b/zephyr-upstream/lava-job-definitions/lpcxpresso55s69/template.yaml
@@ -0,0 +1,45 @@
+device_type: '$device_type'
+job_name: 'zephyr-upstream $test_name'
+
+timeouts:
+  job:
+    minutes: 30
+  action:
+    minutes: 3
+  actions:
+    wait-usb-device:
+      seconds: 40
+
+# We submit gazillion of Zephyr test jobs, so set priority to low, to
+# allow e.g. manually submitted job to preempt such a flow and run sooner
+# than in a few hours.
+priority: low
+visibility: public
+
+actions:
+- deploy:
+    timeout:
+      minutes: 3
+    to: tmpfs
+    images:
+        zephyr:
+          url: '$test_url'
+
+- boot:
+    method: pyocd
+    failure_retry: 3
+    timeout:
+      minutes: 3
+
+- test:
+    timeout:
+      minutes: 10
+$test_action
+
+metadata:
+  build-url: $build_url
+  build-log: $build_url/consoleText
+  zephyr-gcc-variant: $gcc_variant
+  platform: $board_name
+  git-url: https://git.linaro.org/zephyrproject-org/zephyr.git
+  git-commit: $git_commit
diff --git a/zephyr-upstream/lava-job-definitions/qemu/template.yaml b/zephyr-upstream/lava-job-definitions/qemu/template.yaml
index 38a3d33061..c01025c78b 100644
--- a/zephyr-upstream/lava-job-definitions/qemu/template.yaml
+++ b/zephyr-upstream/lava-job-definitions/qemu/template.yaml
@@ -36,14 +36,7 @@ actions:
 - test:
     timeout:
       minutes: 10
-    monitors:
-    - name: '$test_name'
-      start: (tc_start\(\)|starting .*test|BOOTING ZEPHYR OS)
-      end: PROJECT EXECUTION
-      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+)\.
-      fixupdict:
-        PASS: pass
-        FAIL: fail
+$test_action
 
 metadata:
   build-url: $build_url
diff --git a/zephyr-upstream/submit_for_testing.py b/zephyr-upstream/submit_for_testing.py
index e744091170..bf36d396d8 100644
--- a/zephyr-upstream/submit_for_testing.py
+++ b/zephyr-upstream/submit_for_testing.py
@@ -5,14 +5,20 @@ import sys
 import fnmatch
 import yaml
 import shutil
+import itertools
 from string import Template
+import xmlrpc.client as xmlrpclib
 
 try:
     from urllib.parse import urlsplit
 except ImportError:
     from urlparse import urlsplit
 
-excluded_tests = [
+
+# Dump all YAML job definitions as submitted to LAVA
+DEBUG_DUMP_JOBDEFS = False
+
+old_excluded_tests = [
     # Leads to HARD FAULT.
     'tests/kernel/common/test/zephyr/zephyr.bin',
     # Doesn't run, no output.
@@ -46,8 +52,21 @@ excluded_tests = [
     'tests/kernel/mem_protect/app_memory/test/zephyr.bin',
     'tests/kernel/fatal/test/zephyr.bin',
     'tests/bluetooth/shell/test_nble/zephyr.bin',
+    'tests/drivers/watchdog/wdt_basic_api/zephyr.bin',
 ]
 
+# Can exclude both by base source path and specific test configuration
+# path, e.g.:
+# tests/drivers/watchdog/wdt_basic_api/drivers.watchdog
+# tests/drivers/watchdog/wdt_basic_api
+excluded_tests = {
+    # This test includes watchdog reset, so the output is peculiar (startup
+    # banners appear over and over again), and isn't handled by current
+    # test job.
+    "tests/drivers/watchdog/wdt_basic_api": "Output doesn't match LAVA test monitor patterns",
+    "zephyr/tests/boot/test_mcuboot/boot.mcuboot": "Sysbuild apps aren't yet supported",
+}
+
 # Templates base path
 template_base_path = 'configs/zephyr-upstream/lava-job-definitions'
 # Snapshots base URL
@@ -68,23 +87,23 @@ def file_list(path, fname):
 def build_only():
     # Parse testcase.yaml to exclude build only tests.
     # testcase.yaml file path example: tests/drivers/build_all/testcase.yaml
-    testcases_yaml = file_list('tests', 'testcase.yaml')
+    testcases_yaml = file_list('zephyr/tests', 'testcase.yaml')
     build_only_tests = []
     for testcase_yaml in testcases_yaml:
-        with open(testcase_yaml) as f:
-            data = yaml.load(f)
+        with open(testcase_yaml, encoding='utf-8') as f:
+            data = yaml.safe_load(f)
 
         try:
-            testcase_dir = os.path.dirname(testcase_yaml)
+            testcase_dir = os.path.dirname(testcase_yaml).split("/", 1)[-1]
             # Example: tests/bluetooth/init/testcase.yaml
             if 'common' in data.keys() and data['common'].get('build_only'):
                 for test in data['tests'].keys():
-                    build_only_tests.append(os.path.join(testcase_dir, test, 'zephyr.bin'))
+                    build_only_tests.append(os.path.join(testcase_dir, test, 'zephyr/zephyr.bin'))
             else:
                 # Eaxmple: tests/drivers/build_all/testcase.yaml
                 for test, properties in data['tests'].items():
                     if properties.get('build_only'):
-                        build_only_tests.append(os.path.join(testcase_dir, test, 'zephyr.bin'))
+                        build_only_tests.append(os.path.join(testcase_dir, test, 'zephyr/zephyr.bin'))
         except KeyError as e:
             print('ERROR: {} is missing in {}'.format(str(e), testcase_yaml))
 
@@ -93,13 +112,13 @@ def build_only():
 
 def generate_test_list(platform, device_type):
     build_only_tests = build_only()
-    fixed_excluded_tests = set(excluded_tests).union(set(build_only_tests))
+    fixed_excluded_tests = set(old_excluded_tests).union(set(build_only_tests))
     print('\n=== tests will be excluded ===')
     print('--- build only tests ---')
     for test in build_only_tests:
         print(test)
-    print('--- tests from excluded_tests list ---')
-    for test in excluded_tests:
+    print('--- tests from old_excluded_tests list ---')
+    for test in old_excluded_tests:
         print(test)
 
     test_list = file_list('out/{}/tests'.format(platform), 'zephyr.bin')
@@ -122,6 +141,110 @@ def generate_test_list(platform, device_type):
 
     return test_list
 
+def get_yaml(zephyr_bin_path):
+    # Return contents of testcase.yaml file corresponding to the test binary.
+    # Test binary path is of form: 'tests/shell/shell/zephyr/zephyr.bin'
+    #     and testcase.yaml is located at 'tests/shell', meaning we
+    #     should discard the last 3 items.
+    path = zephyr_bin_path.split('/')
+    assert (len(path) >= 4), "Unexpected directory structure encountered."
+    path = path[0:-3]
+    path.append("testcase.yaml")
+    path.insert(0, "zephyr")
+    testcase_yaml = "/".join(path)
+    with open(testcase_yaml, encoding="utf-8") as f:
+        try:
+            data = yaml.safe_load(f)
+        except:
+            print("ERROR: unable to load %s" % f)
+            sys.exit(1)
+    
+    return data
+
+def permutations_of_regexes(regexes):
+    # Create a string with the permutations of all the regular expressions.
+    # .* is inserted between each of the expressions in a given permutation,
+    # and | is used to separate the permutations.
+    # E.g. if we have this set of regular expressions
+    #     - dog
+    #     - cat
+    #     - fish
+    # The result would be a string like this (ordering of the permutations might vary)
+    # dog.*cat.*fish|cat.*dog.*fish|dog.*fish.*cat|fish.*dog.*cat|fish.*cat.*dog|cat.*fish.*dog
+    l = list(itertools.permutations(regexes))
+    regex_list = []
+    for item in l:
+        regex_list.append(".*".join(item))
+    return "|".join(regex_list)
+
+def parse_yaml_harness_config(yaml_node):
+    # Return a string with the actual regular expression to look for in the LAVA job.
+    # We can then use LAVA's interactive test action to look for it.
+    if yaml_node.get("harness") == "console":
+        config = yaml_node.get("harness_config", {})
+        if config.get("type") == "one_line":
+            return config["regex"][0]
+        elif config.get("type") == "multi_line":
+            if "ordered" not in config or config["ordered"] in ("true", True):
+                # For ordered regular expressions, we can simply join them into one,
+                # while allowing any character in between via (.*)
+                return ".*".join(config["regex"])
+            else:
+                # For non-ordered case, we need to look for all permutations of
+                # the regexes, since they can occur in any order.
+                return permutations_of_regexes(config["regex"])
+    else:
+        return None
+
+# Get a node with "harness" directive from testcase.yaml, which is either
+# "common" node, or node for a specific test name
+def get_section_with_harness(test_path, yaml):
+    for key in yaml:
+        if key == "common":
+            yaml_node = yaml["common"]
+            if "harness" in yaml_node:
+                return yaml_node
+        elif key == "tests":
+            path = test_path.split('/')
+            if len(path) < 4:
+                print("Unexpected directory structure encountered. Aborting...")
+                sys.exit(1)
+            test_name = path[-3]
+            yaml_node = yaml["tests"][test_name]
+            if "harness" in yaml_node:
+                return yaml_node
+
+    return None
+
+def get_regex(test, yaml):
+    # Parse yaml data to extract list of regular expressions to be searched,
+    # if present. Otherwise return None.
+
+    yaml_node = get_section_with_harness(test, yaml)
+    if not yaml_node:
+        return None
+    return parse_yaml_harness_config(yaml_node)
+
+
+def should_skip_test(test, yaml_config):
+    # As of now, LAVA lab doesn't have boards with special harnesses,
+    # so skip tests which require something beyond basic "console".
+    harness_section = get_section_with_harness(test, yaml_config)
+    if harness_section and harness_section["harness"] != "console":
+        print("SKIP %s: requires harness '%s'" % (
+            test, harness_section["harness"]
+        ))
+        return True
+
+    assert test.endswith("/zephyr/zephyr.bin")
+    test_path = test.rsplit("/", 2)[0]
+    # Can exclude both by base source path and specific test configuration path.
+    if test_path in excluded_tests or test_path.rsplit("/", 1)[0] in excluded_tests:
+        reason = excluded_tests.get(test_path)
+        reason = reason or excluded_tests.get(test_path.rsplit("/", 1)[0])
+        print("SKIP %s: %s" % (test, reason))
+        return True
+
 
 def main():
     parser = argparse.ArgumentParser()
@@ -144,11 +267,11 @@ def main():
     parser.add_argument("--qa-server-team",
                         help="Team in QA Reports service",
                         dest="qa_server_team",
-                        required=True)
+                        default=None)
     parser.add_argument("--qa-server-project",
                         help="Project in QA Reports service",
                         dest="qa_server_project",
-                        required=True)
+                        default=None)
     parser.add_argument("--qa-server",
                         help="QA Reports server",
                         dest="qa_server",
@@ -157,6 +280,11 @@ def main():
                         help="QA Reports token",
                         dest="qa_token",
                         default=os.environ.get('QA_REPORTS_TOKEN'))
+    parser.add_argument("--direct-to-lava",
+                        action='store_true',
+                        help="submit to LAVA without using QA server",
+                        dest="direct_lava",
+                        default=False)
     parser.add_argument("--lava-server",
                         help="LAVA server URL",
                         dest="lava_server",
@@ -173,76 +301,161 @@ def main():
                         help="Jenkins build url",
                         dest="build_url",
                         required=True)
-
+    parser.add_argument("--lava-token",
+                        help="LAVA API token. Only necessary when directly using LAVA server instead of QA server",
+                        dest="lava_token",
+                        default=None)
+    parser.add_argument("--lava-user",
+                        help="LAVA user. Only necessary when directly using LAVA server instead of QA server",
+                        dest="lava_user",
+                        default=None)
+    parser.add_argument("--bin-suffix",
+                        help="Suffix of test binaries",
+                        dest="bin_suffix",
+                        default="bin")
     args = parser.parse_args()
 
     template_file_name = "%s/%s/template.yaml" % (template_base_path, args.device_type)
     test_template = None
     if os.path.exists(template_file_name):
-        test_template_file = open(template_file_name, "r")
+        test_template_file = open(template_file_name, encoding="utf-8")
         test_template = test_template_file.read()
         test_template_file.close()
     else:
+        print("{} not found!".format(template_file_name))
         sys.exit(1)
 
-    qa_server_base = args.qa_server
-    if not (qa_server_base.startswith("http://") or qa_server_base.startswith("https://")):
-        qa_server_base = "https://" + qa_server_base
-    qa_server_team = args.qa_server_team
-    qa_server_project = args.qa_server_project
-    qa_server_build = args.git_commit
-    qa_server_env = '{0}-{1}'.format(args.board_name, args.gcc_variant)
-    qa_server_api = "%s/api/submitjob/%s/%s/%s/%s" % (
-        qa_server_base,
-        qa_server_team,
-        qa_server_project,
-        qa_server_build,
-        qa_server_env)
     lava_server = args.lava_server
     if not (lava_server.startswith("http://") or lava_server.startswith("https://")):
         lava_server = "https://" + lava_server
-    lava_url_base = "%s://%s/" % (urlsplit(lava_server).scheme, urlsplit(lava_server).netloc)
+    if args.direct_lava:
+        lava_server_base = urlsplit(lava_server).netloc + urlsplit(lava_server).path
+        lava_user = args.lava_user
+        if lava_user is None:
+            print("Must provide a LAVA user when using LAVA server.")
+            sys.exit(1)
+        lava_token = args.lava_token
+        if lava_token is None:
+            print("Must provide a LAVA token when using LAVA server.")
+            sys.exit(1)
+    else:
+        qa_server_base = args.qa_server
+        if not (qa_server_base.startswith("http://") or qa_server_base.startswith("https://")):
+            qa_server_base = "https://" + qa_server_base
+        qa_server_team = args.qa_server_team
+        if qa_server_team is None:
+            print("Must provide QA server team when using a QA server.")
+            sys.exit(1)
+        qa_server_project = args.qa_server_project
+        # SQUAD build ID should be unique for each actual build (or results of
+        # different actual builds will be mixed on SQUAD side), so well, include
+        # build # in it.
+        qa_server_build = "{0}-{1}".format(args.git_commit, args.build_number)
+        qa_server_env = '{0}-{1}'.format(args.board_name, args.gcc_variant)
+        qa_server_api = "%s/api/submitjob/%s/%s/%s/%s" % (
+            qa_server_base,
+            qa_server_team,
+            qa_server_project,
+            qa_server_build,
+            qa_server_env)
+        lava_url_base = "%s://%s/" % (urlsplit(lava_server).scheme, urlsplit(lava_server).netloc)
+        headers = {
+            "Auth-Token": args.qa_token
+        }
+
     test_url_prefix = "%s/%s/%s/%s/%s/" % (
         snapshots_url, args.branch_name, args.gcc_variant, args.board_name, args.build_number)
-
-    headers = {
-        "Auth-Token": args.qa_token
-    }
     os.chdir(os.getenv('WORKSPACE'))
     print('CWD: {}'.format(os.getcwd()))
     print(os.listdir('.'))
+
     test_list = generate_test_list(args.board_name, args.device_type)
+    tests_submitted = 0
     for test in test_list:
+        yaml_config = get_yaml(test)
+
+        if should_skip_test(test, yaml_config):
+            continue
+
+        re = get_regex(test, yaml_config)
+        test_name = test.rsplit('/zephyr.bin')[0].replace('/', '-').replace('.', '-')
+        if re is None:
+            test_action = \
+                "    monitors:\n" + \
+                "    - name: " + test_name + "\n" + \
+                "      start: (tc_start\(\)|starting .*test|Running test suite|Booting Zephyr OS)\n" + \
+                "      end: PROJECT EXECUTION\n" + \
+                "      pattern: (?P<result>(PASS|FAIL))\s-\s(?P<test_case_id>\w+).*?\\r\\n\n" + \
+                "      fixupdict:\n" + \
+                "        PASS: pass\n" + \
+                "        FAIL: fail\n"
+        else:
+            test_action = \
+                "    interactive:\n" + \
+                "    - name: " + test_name + "\n" + \
+                "      prompts: [\"" + re + "\"]\n" + \
+                "      script:\n" + \
+                "      - command:\n" + \
+                "        name: " + test_name + "\n"
+        if args.bin_suffix != "bin":
+            test = test.rsplit('.', 1)[0] + '.' + args.bin_suffix
         replace_dict = dict(
             # Test name example: kernel-pthread-test
-            test_name=test.rsplit('/zephyr.bin')[0].replace('/', '-'),
+            test_name=test_name,
             test_url="%s%s" % (test_url_prefix, test),
             build_url=args.build_url,
             gcc_variant=args.gcc_variant,
             git_commit=args.git_commit,
             device_type=args.device_type,
-            board_name=args.board_name
+            board_name=args.board_name,
+            test_action=test_action
         )
         template = Template(test_template)
         lava_job = template.substitute(replace_dict)
-        try:
-            data = {
-                "definition": lava_job,
-                "backend": urlsplit(lava_url_base).netloc  # qa-reports backends are named as lava instances
-            }
-            results = requests.post(qa_server_api, data=data, headers=headers)
-            if results.status_code < 300:
-                print("%s/testjob/%s" % (qa_server_base, results.text))
-            else:
-                print(results.status_code)
-                print(results.text)
-        except xmlrpclib.ProtocolError as err:  # nopep8
-            print("QA Reports submission failed")
-            print("offending job definition:")
+
+        if DEBUG_DUMP_JOBDEFS:
             print(lava_job)
-            print("Error code: %d" % err.errcode)
-            print("Error message: %s" % err.errmsg)
 
+        if args.direct_lava:
+            try:
+                server = xmlrpclib.ServerProxy("%s://%s:%s@%s" % (urlsplit(lava_server).scheme, lava_user, lava_token, lava_server_base))
+                job_id = server.scheduler.submit_job(lava_job)
+                print(test + ":", "%s/scheduler/job/%d" % (lava_server, job_id))
+                tests_submitted += 1
+            except xmlrpclib.ProtocolError as err:
+                print(lava_job)
+                print("A protocol error occurred")
+                print("URL: %s" % err.url)
+                print("HTTP/HTTPS headers: %s" % err.headers)
+                print("Error code: %d" % err.errcode)
+                print("Error message: %s" % err.errmsg)
+            except xmlrpclib.Fault as err:
+                print(lava_job)
+                print("A fault occurred")
+                print("Fault code: %d" % err.faultCode)
+                print("Fault string: %s" % err.faultString)
+        else:
+            try:
+                data = {
+                    "definition": lava_job,
+                    "backend": urlsplit(lava_url_base).netloc  # qa-reports backends are named as lava instances
+                }
+                results = requests.post(qa_server_api, data=data, headers=headers)
+                if results.status_code < 300:
+                    print(test + ":", "%s/testjob/%s" % (qa_server_base, results.text))
+                    tests_submitted += 1
+                else:
+                    print(lava_job)
+                    print("status code: %s" % results.status_code)
+                    print(results.text)
+            except requests.exceptions.RequestException as err:  # nopep8
+                print("QA Reports submission failed")
+                print("offending job definition:")
+                print(lava_job)
+                print("Error code: %d" % err.errcode)
+                print("Error message: %s" % err.errmsg)
+
+    print("Total successfully submitted test jobs: %d" % tests_submitted)
 
 if __name__ == "__main__":
     main()