diff options
author | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2024-01-12 20:25:33 +0200 |
---|---|---|
committer | Dmitry Baryshkov <dmitry.baryshkov@linaro.org> | 2024-01-12 20:26:19 +0200 |
commit | e255dbe3863388f6af78ebfa610cef6f1ad13a60 (patch) | |
tree | d5095588879b4453bc8d5195565da33d72571443 | |
parent | d009e912d3576fc753a07b5abc3f8eb67c5d8b40 (diff) |
lt-qcom-linux-automerge: drop automerge jobs
The integration tree has been deprecated. Stop even attempting to
rebuild it.
Cc: Vinod Koul <vinod.koul@linaro.org>
Change-Id: I60b5ffc810d6ffb6b42a5858d9ae98a98d60efac
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
-rwxr-xr-x | lt-qcom-linux-automerge-repo-manifest/builders.sh | 37 | ||||
-rw-r--r-- | lt-qcom-linux-automerge.yaml | 94 | ||||
-rwxr-xr-x | lt-qcom-linux-automerge/builders-kernel.sh | 58 | ||||
-rwxr-xr-x | lt-qcom-linux-automerge/builders.sh | 127 | ||||
-rw-r--r-- | lt-qcom-linux-automerge/presend-script.groovy | 3 | ||||
-rw-r--r-- | trigger-lt-qcom-linux-automerge-repo-manifest.yaml | 58 | ||||
-rw-r--r-- | trigger-lt-qcom-linux-automerge.yaml | 76 |
7 files changed, 0 insertions, 453 deletions
diff --git a/lt-qcom-linux-automerge-repo-manifest/builders.sh b/lt-qcom-linux-automerge-repo-manifest/builders.sh deleted file mode 100755 index bc45074980..0000000000 --- a/lt-qcom-linux-automerge-repo-manifest/builders.sh +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/bash - -set -ex - -git config --global user.name "Linaro CI" -git config --global user.email "ci_notify@linaro.org" -git config --global core.sshCommand "ssh -F ${HOME}/qcom.sshconfig" - -cat << EOF > ${HOME}/qcom.sshconfig -Host git.codelinaro.org - User qclt-bot - UserKnownHostsFile /dev/null - StrictHostKeyChecking no -EOF -chmod 0600 ${HOME}/qcom.sshconfig - -QCOMLT_CONFIG_PATH=${PWD}/$(basename ${QCOMLT_CONFIG_REPO_URL}) -git clone -v ${QCOMLT_CONFIG_REPO_URL} ${QCOMLT_CONFIG_PATH} - -cd ${QCOMLT_CONFIG_PATH} -CURRENT_REVISION=$(git rev-parse --short HEAD) -python ./bin/automerge2repo.py automerge-ci.conf automerge-ci.xml -git add automerge-ci.xml - -git commit -s -m "automerge-ci.xml: Update based on rev ${CURRENT_REVISION}" automerge-ci.xml -set +e -diff_msg=$(git diff HEAD..origin/${QCOMLT_CONFIG_BRANCH} -- automerge-ci.xml) -diff_status=$? -set -e - -# only commit when is not branch previously created or a change exists into automerge-ci.xml -if [ $diff_status -ne 0 ] || [ ! -z "$diff_msg" ]; then - echo "Pusing new version of automerge-ci.xml to ${QCOMLT_CONFIG_REPO_URL} ${QCOMLT_CONFIG_BRANCH}..." - git push ${QCOMLT_CONFIG_REPO_URL} master:${QCOMLT_CONFIG_BRANCH} -f -fi - -exit 0 diff --git a/lt-qcom-linux-automerge.yaml b/lt-qcom-linux-automerge.yaml deleted file mode 100644 index 28e5425b23..0000000000 --- a/lt-qcom-linux-automerge.yaml +++ /dev/null @@ -1,94 +0,0 @@ -- job: - name: lt-qcom-linux-automerge - project-type: freestyle - defaults: global - properties: - - authorization: - anonymous: - - job-read - - job-extended-read - linaro-qualcomm-ci: - - job-build - - job-cancel - - build-discarder: - days-to-keep: 30 - num-to-keep: 30 - artifact-num-to-keep: 1 - parameters: - - string: - name: AUTOMERGE_REPO_URL - default: 'https://git.linaro.org/power/automerge.git' - - string: - name: AUTOMERGE_BRANCH - default: 'master' - - string: - name: CONFIG_REPO_URL - default: 'https://git.codelinaro.org/linaro/qcomlt/configs.git' - - string: - name: CONFIG_BRANCH - default: 'master' - - string: - name: KERNEL_REPO_URL - default: 'git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git' - - string: - name: INTEGRATION_REPO_URL - default: 'git@git.codelinaro.org:linaro/qcomlt/kernel-integration.git' - - string: - name: INTEGRATION_BRANCH - default: 'integration-linux-qcomlt' - - string: - name: INTEGRATION_BRANCH_WIP - default: 'integration-linux-qcomlt-wip' - - string: - name: KERNEL_CI_REPO_URL - default: 'git@git.codelinaro.org:linaro/qcomlt/kernel.git' - - string: - name: KERNEL_CI_BRANCH - default: 'integration-linux-qcomlt' - - string: - name: RERERE_REPO_URL - default: 'https://git.codelinaro.org/linaro/qcomlt/automerge-rrcache.git' - disabled: true - node: docker-bullseye-amd64 - display-name: 'Qualcomm LT Linux kernel Automerge build' - wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'LT_QUALCOMM_CLO_PRIVATE_KEY_SSH' - builders: - - shell: - !include-raw: lt-qcom-linux/builders-deps.sh - - shell: - !include-raw: lt-qcom-linux-automerge/builders.sh - - inject: - properties-file: automerge_result_variables - - shell: - !include-raw: lt-qcom-linux-automerge/builders-kernel.sh - publishers: - - email-ext: - recipients: 'qcomlt-patches@lists.linaro.org' - always: true - failure: false - body: | - Build URL: ${PROJECT_URL}${BUILD_NUMBER}/ - Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText - - Automerge repo/branch: ${AUTOMERGE_REPO_URL} ${AUTOMERGE_BRANCH} - - Kernel upstream repository: ${KERNEL_REPO_URL} - Integration repo/branch: ${INTEGRATION_REPO_URL} ${INTEGRATION_BRANCH} - Kernel CI repo/branch: ${KERNEL_CI_REPO_URL} ${KERNEL_CI_BRANCH} - - ${AUTOMERGE_BRANCH_FAILED} - Automerge configuration: - ${AUTOMERGE_CONFIG} - - DTBS warnings: - ${FILE,path="dtbs_warnings.log"} - - ${PATCH_COUNT} patches in the integration branch - QCLT Wall Of Fame: - ${FILE,path="wall_of_fame.log"} - presend-script: - !include-raw: lt-qcom-linux-automerge/presend-script.groovy diff --git a/lt-qcom-linux-automerge/builders-kernel.sh b/lt-qcom-linux-automerge/builders-kernel.sh deleted file mode 100755 index 1a4de34123..0000000000 --- a/lt-qcom-linux-automerge/builders-kernel.sh +++ /dev/null @@ -1,58 +0,0 @@ -#!/bin/bash - -set -ex - -function build_integration_kernel() -{ - export ARCH=$1 - export KERNEL_CONFIGS=$2 - - source install-gcc-toolchain.sh - export CROSS_COMPILE="ccache $(basename $(ls -1 ${tcbindir}/*-gcc) gcc)" - export PATH=${tcbindir}:${HOME}/.local/bin:$PATH - - make distclean - make ${KERNEL_CONFIGS} - - # build QCOM DTBS with warnings - make W=1 $(for i in arch/$ARCH/boot/dts/qcom/*.dts ; do echo qcom/$(basename ${i%.dts}.dtb); done) 2>&1 | tee -a qcom-dtbs.log - make -j$(nproc) -} - -if [ ${AUTOMERGE_EXIT_CODE} -ne 0 ]; then - echo "ERROR: Automerge failed, returned ${AUTOMERGE_EXIT_CODE}" - if [ ! -z ${KERNEL_CI_REPO_URL} ]; then - echo "Pushing Automerge working progress branch to ${INTEGRATION_BRANCH_WIP}" - cd ${INTEGRATION_REPO_PATH} - git push -f ${KERNEL_CI_REPO_URL} ${INTEGRATION_BRANCH}:${INTEGRATION_BRANCH_WIP} - fi - exit ${AUTOMERGE_EXIT_CODE} -fi - -if [ ! -z "${AUTOMERGE_BRANCH_FAILED}" ]; then - echo "ERROR: Automerge failed," - echo "${AUTOMERGE_BRANCH_FAILED}" - exit 1 -fi - -pushd ${INTEGRATION_REPO_PATH} - -GIT_STATUS=$(git status -s) -if [ ! -z "${GIT_STATUS}" ]; then - echo "ERROR: Automerge repository isn't clean," - echo "${GIT_STATUS}" - exit 1 -fi - -wget https://git.linaro.org/ci/job/configs.git/plain/lt-qcom/install-gcc-toolchain.sh -build_integration_kernel "arm" "multi_v7_defconfig" -build_integration_kernel "arm64" "defconfig" - -# record QCOM DTBS warnings, for all builds -sed -n "s/.*: Warning (\(.*\)):.*/\1/p" qcom-dtbs.log | sort | uniq -c | sort -nr > ${WORKSPACE}/dtbs_warnings.log - -if [ ! -z ${KERNEL_CI_REPO_URL} ]; then - git push -f ${KERNEL_CI_REPO_URL} ${INTEGRATION_BRANCH}:${KERNEL_CI_BRANCH} -fi - -popd diff --git a/lt-qcom-linux-automerge/builders.sh b/lt-qcom-linux-automerge/builders.sh deleted file mode 100755 index 549e285a5e..0000000000 --- a/lt-qcom-linux-automerge/builders.sh +++ /dev/null @@ -1,127 +0,0 @@ -#!/bin/bash - -echo "Starting ${JOB_NAME} with the following parameters:" -echo "AUTOMERGE_REPO_URL: ${AUTOMERGE_REPO_URL}" -echo "AUTOMERGE_BRANCH: ${AUTOMERGE_BRANCH}" -echo "CONFIG_REPO_URL: ${CONFIG_REPO_URL}" -echo "CONFIG_BRANCH: ${CONFIG_BRANCH}" -echo "KERNEL_REPO_URL: ${KERNEL_REPO_URL}" -echo "INTEGRATION_REPO_URL: ${INTEGRATION_REPO_URL}" -echo "INTEGRATION_BRANCH: ${INTEGRATION_BRANCH}" -echo "KERNEL_CI_REPO_URL: ${KERNEL_CI_REPO_URL}" -echo "KERNEL_CI_BRANCH: ${KERNEL_CI_BRANCH}" - -set -ex - -git config --global user.name "Linaro CI" -git config --global user.email "ci_notify@linaro.org" -git config --global core.sshCommand "ssh -F ${HOME}/qcom.sshconfig" - -cat << EOF > ${HOME}/qcom.sshconfig -Host git.codelinaro.org - User qclt-bot - UserKnownHostsFile /dev/null - StrictHostKeyChecking no -EOF -chmod 0600 ${HOME}/qcom.sshconfig - -# Use a persistent storage to avoid clone every time the integration repository -PERSISTENT_PATH=${HOME}/srv/qcomlt/linux_automerge -mkdir -p ${PERSISTENT_PATH} -KERNEL_REPO_BARE_PATH=${PERSISTENT_PATH}/$(basename ${KERNEL_REPO_URL}) -if [ -d "${KERNEL_REPO_BARE_PATH}" ]; then - echo "Updating kernel bare repo ..." - pushd $(pwd) - cd ${KERNEL_REPO_BARE_PATH} - if [ -f "gc.log" ]; then - cat gc.log - git gc - git prune - rm -f gc.log - fi - git fetch --all -v - git update-server-info - popd -else - echo "Cloning integration bare repo ..." - git clone --bare ${KERNEL_REPO_URL} ${KERNEL_REPO_BARE_PATH} -fi -INTEGRATION_REPO_PATH=$(pwd)/$(basename ${INTEGRATION_REPO_URL}) -echo "Cloning integration repo ..." -git clone ${KERNEL_REPO_BARE_PATH} ${INTEGRATION_REPO_PATH} - -pushd $(pwd) -export INTG_REMOTE=automerge-intg -cd ${INTEGRATION_REPO_PATH} - -git remote add ${INTG_REMOTE} ${INTEGRATION_REPO_URL} -git fetch ${INTG_REMOTE} -set +e -git branch -a | grep "remotes/${INTG_REMOTE}/${INTEGRATION_BRANCH}$" -branch_exists=$? -set -e -if [ $branch_exists -ne 0 ]; then - echo "Creating initial integration branch ..." - git push ${INTG_REMOTE} HEAD:${INTEGRATION_BRANCH} - git fetch -v ${INTG_REMOTE} -fi -git checkout -b ${INTEGRATION_BRANCH} ${INTG_REMOTE}/${INTEGRATION_BRANCH} -popd - -echo "Initializing automerge execution ..." -pushd $(pwd) -AUTOMERGE_PATH=$(pwd)/automerge -git clone ${AUTOMERGE_REPO_URL} -b ${AUTOMERGE_BRANCH} ${AUTOMERGE_PATH} -export PATH=${AUTOMERGE_PATH}:$PATH - -cd ${AUTOMERGE_PATH} -export CONFIG_PATH='' -if [ ! -z ${CONFIG_REPO_URL} ]; then - export CONFIG_REPO_PATH=${AUTOMERGE_PATH}/$(basename ${CONFIG_REPO_URL}) - git clone ${CONFIG_REPO_URL} -b ${CONFIG_BRANCH} ${CONFIG_REPO_PATH} - - if [ -f ${CONFIG_REPO_PATH}/automerge-ci.conf ]; then - export CONFIG_PATH=${CONFIG_REPO_PATH}/automerge-ci.conf - fi -fi - -if [ -f ${CONFIG_PATH} ]; then - echo "Using configuration from repository" - cat ${CONFIG_PATH} -else - echo "Using default configuration" - cat <<EOF > automerge-ci.conf -baseline git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git master -EOF - - export CONFIG_PATH=${AUTOMERGE_PATH}/automerge-ci.conf -fi - -AUTOMERGE_CONFIG=$(sed '/^#/d;/^$/d' ${CONFIG_PATH} | sed ':a;N;$!ba;s/\n/\\n\\\n/g') - -# * Disable exit when fail to collect automerge_result_variables for builders-kernel.sh and email -# * TODO: Add support in ci-merge to create a log (instead of use tee) -set +e -set -o pipefail -ci-merge -l ${INTEGRATION_REPO_PATH} -r ${INTEGRATION_REPO_URL} -i ${INTEGRATION_BRANCH} -c ${RERERE_REPO_URL} -t ${AUTOMERGE_TRACK:-tag} | tee automerge.log -AUTOMERGE_EXIT_CODE=$? -set +o pipefail -AUTOMERGE_BRANCH_FAILED=$(grep 'Merge failed' automerge.log | sed ':a;N;$!ba;s/\n/\\n\\\n/g') -set -e - -cd ${INTEGRATION_REPO_PATH} - -# Extract baseline/master from the config rather than hardcoding it here -BASELINE=`sed -n -e '/^baseline/{s@[ \t].*[ \t]@/@gp}' ${CONFIG_PATH}` - -# Report some git stats -PATCH_COUNT=$(git log --oneline --no-merges ${BASELINE}.. |wc -l) -git shortlog -n --no-merges ${BASELINE}.. > ${WORKSPACE}/wall_of_fame.log - -popd - -echo "AUTOMERGE_CONFIG=${AUTOMERGE_CONFIG}" > automerge_result_variables -echo "AUTOMERGE_BRANCH_FAILED=${AUTOMERGE_BRANCH_FAILED}" >> automerge_result_variables -echo "AUTOMERGE_EXIT_CODE=${AUTOMERGE_EXIT_CODE}" >> automerge_result_variables -echo "INTEGRATION_REPO_PATH=${INTEGRATION_REPO_PATH}" >> automerge_result_variables -echo "PATCH_COUNT=${PATCH_COUNT}" >> automerge_result_variables diff --git a/lt-qcom-linux-automerge/presend-script.groovy b/lt-qcom-linux-automerge/presend-script.groovy deleted file mode 100644 index 41b1cd02f3..0000000000 --- a/lt-qcom-linux-automerge/presend-script.groovy +++ /dev/null @@ -1,3 +0,0 @@ -automerge_config = sprintf(build.envVars["AUTOMERGE_CONFIG"]) -automerge_branch_failed = sprintf(build.envVars["AUTOMERGE_BRANCH_FAILED"]) - diff --git a/trigger-lt-qcom-linux-automerge-repo-manifest.yaml b/trigger-lt-qcom-linux-automerge-repo-manifest.yaml deleted file mode 100644 index 58f7f048b9..0000000000 --- a/trigger-lt-qcom-linux-automerge-repo-manifest.yaml +++ /dev/null @@ -1,58 +0,0 @@ -- scm: - name: configs - scm: - - git: - url: https://git.codelinaro.org/linaro/qcomlt/configs.git - refspec: +refs/heads/*:refs/remotes/origin/* - name: origin - branches: - - refs/heads/master - skip-tag: true - shallow-clone: false - -- job: - name: trigger-lt-qcom-linux-automerge-repo-manifest - 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 - parameters: - - string: - name: QCOMLT_CONFIG_REPO_URL - default: 'git@git.codelinaro.org:linaro/qcomlt/configs.git' - - string: - name: QCOMLT_CONFIG_BRANCH - default: 'repo' - disabled: false - node: triggers - display-name: 'Qualcomm LT Integration Automerge Config Update' - scm: - - configs - triggers: - - pollscm: - cron: 'H/5 * * * *' - wrappers: - - timestamps - - ssh-agent-credentials: - users: - - 'LT_QUALCOMM_CLO_PRIVATE_KEY_SSH' - builders: - - shell: - !include-raw: lt-qcom-linux-automerge-repo-manifest/builders.sh - publishers: - - email-ext: - recipients: 'qcomlt-patches@lists.linaro.org' - always: true - body: | - Build URL: ${PROJECT_URL}${BUILD_NUMBER}/ - Full log: ${PROJECT_URL}${BUILD_NUMBER}/consoleText - - Changes: - ${CHANGES} diff --git a/trigger-lt-qcom-linux-automerge.yaml b/trigger-lt-qcom-linux-automerge.yaml deleted file mode 100644 index f045a40066..0000000000 --- a/trigger-lt-qcom-linux-automerge.yaml +++ /dev/null @@ -1,76 +0,0 @@ -- scm: - name: repo-manifest - scm: - - repo: - manifest-url: https://git.codelinaro.org/linaro/qcomlt/configs.git - manifest-branch: repo - manifest-file: automerge-ci.xml - -- scm: - name: rrcache - scm: - - git: - url: https://git.codelinaro.org/linaro/qcomlt/automerge-rrcache.git - refspec: +refs/heads/*:refs/remotes/origin/* - name: origin - basedir: rrcache - branches: - - refs/heads/master - skip-tag: true - shallow-clone: false - wipe-workspace: false - -- scm: - name: linux-tag - scm: - - git: - url: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git - refspec: +refs/tags/*:refs/remotes/origin/tags/* - name: origin - basedir: linus - branches: - - refs/tags/v4.* - - refs/tags/v5.* - - refs/tags/v6.* - skip-tag: true - shallow-clone: false - wipe-workspace: false - -- job: - name: trigger-lt-qcom-linux-automerge - project-type: freestyle - 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 - disabled: false - node: triggers - display-name: 'Trigger for Qualcomm LT Integration Tree Automerge' - scm: - - repo-manifest - - rrcache - - linux-tag - triggers: - - pollscm: - cron: 'H/5 * * * *' - wrappers: - - timestamps - builders: - - trigger-builds: - - project: 'lt-qcom-linux-automerge' - publishers: - - email-ext: - recipients: 'leonardo.sandoval@linaro.org dmitry.baryshkov@linaro.org' - failure: true - still-failing: true |