lkft builds: clean disabled builds and fix hikey premerge builds name

delete the builds for lkft hikey aosp builds
and x15 aosp build as we use aosp master tracking build now.

update the hikey premerge ci build names to have
premerge word

Change-Id: I5e02225eeddda458bf9ef6c57a7fe7326dda3386
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

7 files changed, 3 insertions, 503 deletions

diff --git a/lkft-hikey-aosp-4.14-premerge-ci.yaml b/lkft-hikey-aosp-4.14-premerge-ci.yaml
index 8c3954bb97..e5fb06ce05 100644
--- a/lkft-hikey-aosp-4.14-premerge-ci.yaml
+++ b/lkft-hikey-aosp-4.14-premerge-ci.yaml
@@ -54,7 +54,7 @@
             name: SRCREV_kernel
     disabled: false
     node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP 4.14 (Android)'
+    display-name: 'LKFT - AOSP 4.14 premerge CI'
     scm:
         - git:
             url: ${KERNEL_REPO}
diff --git a/lkft-hikey-aosp-4.14.yaml b/lkft-hikey-aosp-4.14.yaml
deleted file mode 100644
index e509cfdf38..0000000000
--- a/lkft-hikey-aosp-4.14.yaml
+++ /dev/null
@@ -1,130 +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: ANDROID_VERSION
-           default: 'aosp-master-10152018'
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - 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: TOOLCHAIN
-            default: 'clang-r328903'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - string:
-            name: CONFIG_FRAGMENTS_PATH
-            default: 'android-4.14'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: true
-    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.19-premerge-ci.yaml b/lkft-hikey-aosp-4.19-premerge-ci.yaml
index e2d2bffbe2..3fcca3e703 100644
--- a/lkft-hikey-aosp-4.19-premerge-ci.yaml
+++ b/lkft-hikey-aosp-4.19-premerge-ci.yaml
@@ -54,7 +54,7 @@
             name: SRCREV_kernel
     disabled: false
     node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP 4.19 (Android)'
+    display-name: 'LKFT - AOSP 4.19 premerge CI'
     scm:
         - git:
             url: ${KERNEL_REPO}
diff --git a/lkft-hikey-aosp-4.4-premerge-ci.yaml b/lkft-hikey-aosp-4.4-premerge-ci.yaml
index 787bd6d8a1..7d79ce888c 100644
--- a/lkft-hikey-aosp-4.4-premerge-ci.yaml
+++ b/lkft-hikey-aosp-4.4-premerge-ci.yaml
@@ -54,7 +54,7 @@
             name: SRCREV_kernel
     disabled: false
     node: docker-xenial-aosp
-    display-name: 'LKFT - AOSP 4.4 (Android)'
+    display-name: 'LKFT - AOSP 4.4 premerge CI'
     scm:
         - git:
             url: ${KERNEL_REPO}
diff --git a/lkft-hikey-aosp-4.4.yaml b/lkft-hikey-aosp-4.4.yaml
deleted file mode 100644
index a80ca288b2..0000000000
--- a/lkft-hikey-aosp-4.4.yaml
+++ /dev/null
@@ -1,130 +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: ANDROID_VERSION
-            default: 'aosp-master-10152018'
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - 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: TOOLCHAIN
-            default: 'clang-r328903'
-        - string:
-            name: VTS_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - string:
-            name: CONFIG_FRAGMENTS_PATH
-            default: 'android-4.4'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: true
-    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 9646f2969b..0000000000
--- a/lkft-hikey-aosp-4.9.yaml
+++ /dev/null
@@ -1,130 +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: ANDROID_VERSION
-           default: 'aosp-master-10152018'
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - 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.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - string:
-            name: CTS_URL
-            default: 'http://testdata.linaro.org/lkft/aosp/aosp-master-10152018/'
-        - string:
-            name: TOOLCHAIN
-            default: 'clang-r328903'
-        - string:
-            name: CONFIG_FRAGMENTS_PATH
-            default: 'android-4.9'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-    disabled: true
-    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-x15-aosp-4.14.yaml b/lkft-x15-aosp-4.14.yaml
deleted file mode 100644
index 6ad3e12157..0000000000
--- a/lkft-x15-aosp-4.14.yaml
+++ /dev/null
@@ -1,110 +0,0 @@
-- job:
-    name: lkft-x15-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: KERNEL_BRANCH
-            default: 'android-beagle-x15-4.14'
-        - string:
-            name: KERNEL_REPO
-            default: 'https://android.googlesource.com/kernel/omap'
-        - string:
-            name: QA_SERVER
-            default: 'https://qa-reports.linaro.org'
-        - string:
-            name: QA_SERVER_PROJECT
-            default: 'ti-android-linux-4.14.y-aosp'
-        - string:
-            name: ANDROID_VERSION
-            default: 'aosp-master-08102018'
-        - string:
-            name: VTS_URL
-            default: 'http://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/885/'
-        - string:
-            name: REFERENCE_BUILD_URL
-            default: ''
-        - string:
-            name: CTS_URL
-            default: 'http://snapshots.linaro.org/96boards/hikey/linaro/aosp-master/885/'
-        - string:
-            name: TOOLCHAIN
-            default: 'GCC-7.2'
-        - string:
-            name: KERNEL_DESCRIBE
-        - string:
-            name: SRCREV_kernel
-        - string:
-            name: PUB_DEST
-            name: "android/lkft/${JOB_NAME}/${BUILD_NUMBER}"
-    disabled: true
-    node: docker-xenial-aosp
-    display-name: 'LKFT x15 - AOSP Master'
-    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/x15-aosp/builders.sh
-        - inject:
-            properties-file: publish_parameters
-        - linaro-publish-token
-        - shell:
-            !include-raw:
-                - android/linaro-publisher.sh
-        - shell:
-            !include-raw: lkft/x15-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: 'x15-aosp@linaro.org'
-            subject: '[CI] x15: ${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