diff options
-rw-r--r-- | lkft-hikey-merge-mirror-4.14.yaml | 2 | ||||
-rw-r--r-- | lkft-hikey-merge-mirror-4.19.yaml | 2 | ||||
-rw-r--r-- | lkft-hikey-merge-mirrors.yaml | 119 | ||||
-rw-r--r-- | trigger-lkft-aosp-hikey.yaml | 13 |
4 files changed, 127 insertions, 9 deletions
diff --git a/lkft-hikey-merge-mirror-4.14.yaml b/lkft-hikey-merge-mirror-4.14.yaml index a0f91fccf6..086ae68b32 100644 --- a/lkft-hikey-merge-mirror-4.14.yaml +++ b/lkft-hikey-merge-mirror-4.14.yaml @@ -23,7 +23,7 @@ name: SRCREV_kernel - string: name: MAKE_KERNELVERSION - disabled: false + disabled: true node: docker-xenial-android-lkft display-name: 'LKFT - merge changes from mirror-android-4.14 to android-hikey-linaro-4.14-lkft' scm: diff --git a/lkft-hikey-merge-mirror-4.19.yaml b/lkft-hikey-merge-mirror-4.19.yaml index 8cde0bb1d7..e9be384a18 100644 --- a/lkft-hikey-merge-mirror-4.19.yaml +++ b/lkft-hikey-merge-mirror-4.19.yaml @@ -23,7 +23,7 @@ name: SRCREV_kernel - string: name: MAKE_KERNELVERSION - disabled: false + disabled: true node: docker-xenial-android-lkft display-name: 'LKFT - merge changes from mirror-android-4.19 to android-hikey-linaro-4.19-lkft' scm: diff --git a/lkft-hikey-merge-mirrors.yaml b/lkft-hikey-merge-mirrors.yaml new file mode 100644 index 0000000000..e792f25a1a --- /dev/null +++ b/lkft-hikey-merge-mirrors.yaml @@ -0,0 +1,119 @@ +- job: + name: lkft-hikey-merge-mirrors + project-type: freestyle + defaults: global + properties: + - authorization: + anonymous: + - job-read + - job-extended-read + linaro: + - job-build + - job-cancel + - build-discarder: + days-to-keep: 180 + num-to-keep: 150 + artifact-num-to-keep: 1 + parameters: + - string: + name: KERNEL_BRANCH + - string: + name: KERNEL_DESCRIBE + - string: + name: SRCREV_kernel + - string: + name: MAKE_KERNELVERSION + disabled: false + node: docker-xenial-android-lkft + display-name: 'LKFT - merge changes from mirror branches for hikey-linaro kernels' + scm: + - git: + remotes: + - linaro: + url: ssh://ci-bot@android-review.linaro.org:29418/kernel/hikey-linaro.git + refspec: +refs/heads/android-hikey-linaro-4.14-stable-lkft:refs/remotes/linaro/android-hikey-linaro-4.14-stable-lkft +refs/heads/android-hikey-linaro-4.19lkft:refs/remotes/linaro/android-hikey-linaro-4.19-lkft +refs/heads/android-hikey-linaro-4.19-stable-lkft:refs/remotes/linaro/android-hikey-linaro-4.19-stable-lkft + credentials-id: 'CI_BOT_SSH_KEY' + - aosp: + url: https://android.googlesource.com/kernel/hikey-linaro + refspec: +refs/heads/mirror-android-4.14-stable:refs/remotes/aosp/mirror-android-4.14-stable +refs/heads/mirror-android-4.19:refs/remotes/aosp/mirror-android-4.19 +refs/heads/mirror-android-4.19-stable:refs/remotes/aosp/mirror-android-4.19-stable + branches: + - aosp/mirror-android-4.14-stable + - aosp/mirror-android-4.19 + - aosp/mirror-android-4.19-stable + git-config-name: 'Linaro CI' + git-config-email: 'ci-bot@linaro.org' + skip-tag: true + shallow-clone: false + wipe-workspace: false + wrappers: + - timestamps + - build-name: + name: '#${BUILD_NUMBER}-${ENV,var="KERNEL_DESCRIBE"}-${ENV,var="MAKE_KERNELVERSION"}' + - timeout: + timeout: 500 + - ssh-agent-credentials: + users: + - 'CI_BOT_SSH_KEY' + builders: + - shell: | + #!/bin/bash -ex + git clean -fdx + env + + ssh-keyscan -p 29418 android-review.linaro.org >> ~/.ssh/known_hosts + + git config --global user.name "Linaro CI" + git config --global user.email "ci-bot@linaro.org" + + case "X${KERNEL_BRANCH}" in + "Xmirror-android-4.14-stable") + target_branch="android-hikey-linaro-4.14-stable-lkft" + ;; + "Xmirror-android-4.19") + target_branch="android-hikey-linaro-4.19-lkft" + ;; + "Xmirror-android-4.19-stable") + target_branch="android-hikey-linaro-4.19-stable-lkft" + ;; + "X*") + target_branch="" + ;; + esac + + git checkout -B ${target_branch} linaro/${target_branch} + git merge --no-edit aosp/${KERNEL_BRANCH} + # push to the remote branch + git push linaro HEAD:${target_branch} + + # Apply tag + tag=${KERNEL_DESCRIBE}-$(date +"%Y%m%d")-${BUILD_NUMBER} + git tag ${tag} + + # Push tag + git push linaro ${tag} + + 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: openembedded-lkft/postbuild.groovy + - email: + recipients: 'yongqin.liu@linaro.org' + subject: '[CI] HiKey/HiKey960 merge chagnes from mirror builds: ${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/trigger-lkft-aosp-hikey.yaml b/trigger-lkft-aosp-hikey.yaml index 8e01bba724..4f1be480ed 100644 --- a/trigger-lkft-aosp-hikey.yaml +++ b/trigger-lkft-aosp-hikey.yaml @@ -22,8 +22,9 @@ 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/linux-4.14.y +refs/heads/linux-4.19.y:refs/remotes/linux-stable/linux-4.19.y branches: - - aosp-hikey/mirror-android-4.14 + - aosp-hikey/mirror-android-4.14-stable - aosp-hikey/mirror-android-4.19 + - aosp-hikey/mirror-android-4.19-stable skip-tag: true shallow-clone: false wipe-workspace: false @@ -33,7 +34,7 @@ wrappers: - timestamps - build-name: - name: '#${BUILD_NUMBER}-${PROPFILE,file="properties.txt",property="KERNEL_DESCRIBE"}' + name: '#${BUILD_NUMBER}-${PROPFILE,file="properties.txt",property="KERNEL_DESCRIBE"}-${GIT_BRANCH#aosp-hikey/}' builders: - shell: | #!/bin/bash -ex @@ -46,7 +47,7 @@ echo KERNEL_DESCRIBE=${KERNEL_DESCRIBE} > properties.txt echo KERNEL_BRANCH=${KERNEL_BRANCH} >> properties.txt - params=lkft-${KERNEL_BRANCH}.txt + params=lkft-parameters.txt echo KERNEL_DESCRIBE=${KERNEL_DESCRIBE} >> $params echo SRCREV_kernel=${GIT_COMMIT} >> $params echo MAKE_KERNELVERSION=$(make kernelversion) >> $params @@ -54,7 +55,5 @@ cat $params - trigger-builds: - - project: lkft-hikey-merge-mirror-4.14 - property-file: lkft-mirror-android-4.14.txt - - project: lkft-hikey-merge-mirror-4.19 - property-file: lkft-mirror-android-4.19.txt + - project: lkft-hikey-merge-mirrors + property-file: lkft-parameters.txt |