openembedded-lkft: stop submitting LAVA v1 jobs

Submit only LAVA v2 jobs to lkft.validation.linaro.org instance.

Change-Id: I909d14247c67601daf869be55d6ec8b67f1d9bb6
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Signed-off-by: Milosz Wasilewski <milosz.wasilewski@linaro.org>

20 files changed, 19 insertions, 777 deletions

diff --git a/openembedded-lkft-android-common-4.4-n-release.yaml b/openembedded-lkft-android-common-4.4-n-release.yaml
index ff4eeb6211..127c9979ee 100644
--- a/openembedded-lkft-android-common-4.4-n-release.yaml
+++ b/openembedded-lkft-android-common-4.4-n-release.yaml
@@ -41,11 +41,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -118,36 +115,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-android-common-4.4-n.yaml b/openembedded-lkft-android-common-4.4-n.yaml
index 99c3699c0a..9d5e210cc4 100644
--- a/openembedded-lkft-android-common-4.4-n.yaml
+++ b/openembedded-lkft-android-common-4.4-n.yaml
@@ -41,11 +41,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -118,36 +115,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-android-common-4.4-o-release.yaml b/openembedded-lkft-android-common-4.4-o-release.yaml
index e80c694b9b..e553ce2bf5 100644
--- a/openembedded-lkft-android-common-4.4-o-release.yaml
+++ b/openembedded-lkft-android-common-4.4-o-release.yaml
@@ -41,11 +41,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -118,36 +115,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-android-common-4.4-o.yaml b/openembedded-lkft-android-common-4.4-o.yaml
index a16f7ff3d6..79f90fbbca 100644
--- a/openembedded-lkft-android-common-4.4-o.yaml
+++ b/openembedded-lkft-android-common-4.4-o.yaml
@@ -41,11 +41,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -118,36 +115,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-android-common-4.9-o-release.yaml b/openembedded-lkft-android-common-4.9-o-release.yaml
index 47b7109ac6..fab25573b4 100644
--- a/openembedded-lkft-android-common-4.9-o-release.yaml
+++ b/openembedded-lkft-android-common-4.9-o-release.yaml
@@ -41,11 +41,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -118,36 +115,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-android-common-4.9-o.yaml b/openembedded-lkft-android-common-4.9-o.yaml
index 3662f1134b..e14f69ed08 100644
--- a/openembedded-lkft-android-common-4.9-o.yaml
+++ b/openembedded-lkft-android-common-4.9-o.yaml
@@ -41,11 +41,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -118,36 +115,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-aosp-4.4.yaml b/openembedded-lkft-aosp-4.4.yaml
index ddbc717286..14b902e579 100644
--- a/openembedded-lkft-aosp-4.4.yaml
+++ b/openembedded-lkft-aosp-4.4.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -125,36 +122,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-aosp-4.9.yaml b/openembedded-lkft-aosp-4.9.yaml
index c88c98aabb..b2afbd6798 100644
--- a/openembedded-lkft-aosp-4.9.yaml
+++ b/openembedded-lkft-aosp-4.9.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -125,36 +122,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linaro-hikey-stable-4.4.yaml b/openembedded-lkft-linaro-hikey-stable-4.4.yaml
index d2897ba562..76ba93f3b9 100644
--- a/openembedded-lkft-linaro-hikey-stable-4.4.yaml
+++ b/openembedded-lkft-linaro-hikey-stable-4.4.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -120,36 +117,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml b/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
index 4c29521240..bffc240f08 100644
--- a/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
+++ b/openembedded-lkft-linaro-hikey-stable-rc-4.4.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -120,36 +117,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linux-mainline.yaml b/openembedded-lkft-linux-mainline.yaml
index cec2a103c1..c8af85706b 100644
--- a/openembedded-lkft-linux-mainline.yaml
+++ b/openembedded-lkft-linux-mainline.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -130,69 +127,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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: |
-            #!/bin/bash
-
-            export PTABLE_URL=${SNAPSHOTS_URL}/${BASE_URL}/bootloader/ptable-linux-8g.img
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${PTABLE_URL}|${PTABLE_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|" \
-                -e "s|\${KERNEL_VERSION}|${KERNEL_VERSION}|" \
-                -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|" \
-                -e "s|\${KERNEL_COMMIT}|${SRCREV_kernel}|" \
-            < configs/openembedded-lkft/lava-job-definitions/${DEVICE_TYPE}/template.yaml \
-            > custom_lava_job_definition.yaml
-
-            sed -i "#CUSTOM_JSON_URL=.*#d" ${WORKSPACE}/post_build_lava_parameters
-            sed -i "#LAVA_SERVER=.*#d" ${WORKSPACE}/post_build_lava_parameters
-            cat << EOF > post_build_lava_parameters
-            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
-            LAVA_SERVER=lkft.${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linux-next.yaml b/openembedded-lkft-linux-next.yaml
index 1750a5114f..ec3e97a3c1 100644
--- a/openembedded-lkft-linux-next.yaml
+++ b/openembedded-lkft-linux-next.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -130,69 +127,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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: |
-            #!/bin/bash
-
-            export PTABLE_URL=${SNAPSHOTS_URL}/${BASE_URL}/bootloader/ptable-linux-8g.img
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${PTABLE_URL}|${PTABLE_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUILD_NUMBER}|${BUILD_NUMBER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-                -e "s|\${KERNEL_BRANCH}|${KERNEL_BRANCH}|" \
-                -e "s|\${KERNEL_VERSION}|${KERNEL_VERSION}|" \
-                -e "s|\${KERNEL_REPO}|${KERNEL_REPO}|" \
-                -e "s|\${KERNEL_COMMIT}|${SRCREV_kernel}|" \
-            < configs/openembedded-lkft/lava-job-definitions/${DEVICE_TYPE}/template.yaml \
-            > custom_lava_job_definition.yaml
-
-            sed -i "#CUSTOM_JSON_URL=.*#d" ${WORKSPACE}/post_build_lava_parameters
-            sed -i "#LAVA_SERVER=.*#d" ${WORKSPACE}/post_build_lava_parameters
-            cat << EOF > post_build_lava_parameters
-            CUSTOM_YAML_URL=${JOB_URL}/ws/custom_lava_job_definition.yaml
-            LAVA_SERVER=lkft.${LAVA_SERVER}
-            EOF
-        - trigger-builds:
-            - project: 'post-build-lava'
-              property-file: post_build_lava_parameters
-              block: true
         - shell:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linux-stable-4.4.yaml b/openembedded-lkft-linux-stable-4.4.yaml
index 73a2fb8f12..f22b55211f 100644
--- a/openembedded-lkft-linux-stable-4.4.yaml
+++ b/openembedded-lkft-linux-stable-4.4.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -125,36 +122,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linux-stable-4.9.yaml b/openembedded-lkft-linux-stable-4.9.yaml
index 463d337dfe..f641ae9fa2 100644
--- a/openembedded-lkft-linux-stable-4.9.yaml
+++ b/openembedded-lkft-linux-stable-4.9.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -130,36 +127,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linux-stable-rc-4.4.yaml b/openembedded-lkft-linux-stable-rc-4.4.yaml
index 4fe7a0ee7d..f72b4cc128 100644
--- a/openembedded-lkft-linux-stable-rc-4.4.yaml
+++ b/openembedded-lkft-linux-stable-rc-4.4.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -125,36 +122,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-linux-stable-rc-4.9.yaml b/openembedded-lkft-linux-stable-rc-4.9.yaml
index 44d3292f3f..e44c4275f8 100644
--- a/openembedded-lkft-linux-stable-rc-4.9.yaml
+++ b/openembedded-lkft-linux-stable-rc-4.9.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -130,36 +127,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-lsk-4.4.yaml b/openembedded-lkft-lsk-4.4.yaml
index 5a7ef7f418..c10321c3ad 100644
--- a/openembedded-lkft-lsk-4.4.yaml
+++ b/openembedded-lkft-lsk-4.4.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -120,36 +117,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft-lsk-4.9.yaml b/openembedded-lkft-lsk-4.9.yaml
index f4a0b46d45..4007d9c8c3 100644
--- a/openembedded-lkft-lsk-4.9.yaml
+++ b/openembedded-lkft-lsk-4.9.yaml
@@ -43,11 +43,8 @@
             name: MANIFEST_BRANCH
             default: 'morty'
         - string:
-            name: BUNDLE_STREAM_NAME
-            default: '/public/team/linaro/openembedded-lkft-${MANIFEST_BRANCH}/'
-        - string:
             name: LAVA_SERVER
-            default: 'validation.linaro.org/RPC2/'
+            default: 'https://lkft.validation.linaro.org/RPC2/'
         - string:
             name: QA_SERVER
             default: 'https://qa-reports.linaro.org'
@@ -120,36 +117,6 @@
               --server ${PUBLISH_SERVER} \
               --link-latest \
               ${DEPLOY_DIR_IMAGE}/ ${BASE_URL}
-        - shell: |
-            #!/bin/bash
-
-            rm -rf configs
-            git clone --depth 1 http://git.linaro.org/ci/job/configs.git
-
-            # Unset device type for all machines except hikey
-            # We submit with post-build-lava only for Hikey
-            [ "${MACHINE}" != "hikey" ] && unset DEVICE_TYPE
-
-            [ -z "${DEVICE_TYPE}" ] || \
-            sed -e "s|\${BOOT_URL}|${BOOT_URL}|" \
-                -e "s|\${SYSTEM_URL}|${SYSTEM_URL}|" \
-                -e "s|\${BUILD_URL}|${BUILD_URL}|" \
-                -e "s|\${BUNDLE_STREAM_NAME}|${BUNDLE_STREAM_NAME}|" \
-                -e "s|\${LAVA_SERVER}|${LAVA_SERVER}|" \
-                -e "s|\${DEVICE_TYPE}|${DEVICE_TYPE}|" \
-            < configs/openembedded-lkft/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:
             !include-raw: openembedded-lkft/submit_for_testing.sh
     publishers:
diff --git a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template.json b/openembedded-lkft/lava-job-definitions/hi6220-hikey/template.json
deleted file mode 100644
index 55bc00eb96..0000000000
--- a/openembedded-lkft/lava-job-definitions/hi6220-hikey/template.json
+++ /dev/null
@@ -1,98 +0,0 @@
-{
-  "actions": [
-    {
-      "command": "deploy_linaro_android_image",
-      "parameters": {
-        "images": [
-          {
-            "partition": "ptable",
-            "url": "http://releases.linaro.org/reference-platform/embedded/hikey/16.12/rpb/bootloader/ptable-linux-8g.img"
-          },
-          {
-            "partition": "boot",
-            "url": "${BOOT_URL}"
-          },
-          {
-            "partition": "system",
-            "url": "${SYSTEM_URL}"
-          }
-        ],
-        "login_prompt": "hikey login",
-        "username": "root",
-        "target_type": "ubuntu"
-      }
-    },
-    {
-      "command": "boot_linaro_image",
-      "parameters": {
-        "boot_cmds": [
-          "expect Start:",
-          "sendline 2",
-          "expect CE Reference Platform",
-          "sendline c",
-          "expect grub>",
-          "sendline search.fs_label rootfs root",
-          "expect grub>",
-          "sendline linux ($root)/boot/Image console=tty0 console=ttyAMA3,115200 root=/dev/mmcblk0p9 rootwait rw efi=noruntime backend=ramoops ramoops.mem_address=0x30000000 ramoops.mem_size=0x10000",
-          "expect grub>",
-          "sendline devicetree ($root)/boot/hi6220-hikey.dtb",
-          "expect grub>",
-          "sendline boot"
-        ],
-	"test_image_prompt": "hikey:~#"
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "automated/linux/kselftest/kselftest.yaml"
-          }
-        ],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "parameters": {
-               "SKIPFILE": "skipfile-lkft-hikey",
-               "TST_CMDFILES": "syscalls",
-               "SKIP_INSTALL": "true",
-               "TIMEOUT_MULTIPLIER": 3
-            },
-            "testdef": "automated/linux/ltp/ltp.yaml"
-          }
-        ],
-        "timeout": 5400
-      }
-    },
-    {
-      "command": "lava_test_shell",
-      "parameters": {
-        "testdef_repos": [
-          {
-            "git-repo": "git://git.linaro.org/qa/test-definitions.git",
-            "testdef": "automated/linux/libhugetlbfs/libhugetlbfs.yaml"
-          }
-        ],
-        "timeout": 1800
-      }
-    },
-    {
-      "command": "submit_results",
-      "parameters": {
-        "stream": "${BUNDLE_STREAM_NAME}",
-        "server": "http://${LAVA_SERVER}"
-      }
-    }
-  ],
-  "device_type": "${DEVICE_TYPE}",
-  "job_name": "${BUILD_URL}",
-  "timeout": 9000
-}
diff --git a/openembedded-lkft/submit_for_testing.sh b/openembedded-lkft/submit_for_testing.sh
index 4a51a96392..9f6f83fdb7 100755
--- a/openembedded-lkft/submit_for_testing.sh
+++ b/openembedded-lkft/submit_for_testing.sh
@@ -17,7 +17,7 @@ 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 https://lkft.${LAVA_SERVER} \
+  --lava-server ${LAVA_SERVER} \
   --qa-server ${QA_SERVER} \
   --qa-server-team lkft \
   --qa-server-project ${QA_SERVER_PROJECT} \