From: Andrew Grimberg Date: Fri, 24 May 2019 17:24:29 +0000 (+0000) Subject: Merge "Fix info-vote job" X-Git-Tag: v0.38.0~5 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=d8dc21c3ef89f62b0f58a4ad16616f304b2643d5;hp=efd86ed2c7b8ff308628d5c6e83a7eeab18ff442;p=releng%2Fglobal-jjb.git Merge "Fix info-vote job" --- diff --git a/jjb/lf-c-cpp-jobs.yaml b/jjb/lf-c-cpp-jobs.yaml index 9dfc4473..e49a4377 100644 --- a/jjb/lf-c-cpp-jobs.yaml +++ b/jjb/lf-c-cpp-jobs.yaml @@ -99,7 +99,7 @@ server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(stage-release)$' + comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -262,7 +262,7 @@ server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(stage-release)$' + comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$' projects: - project-compare-type: 'ANT' project-pattern: '{project}' @@ -339,7 +339,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' gerrit_trigger_file_paths: - compare-type: REG_EXP diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index b2eb383b..2545a6be 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -287,7 +287,7 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -430,7 +430,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -620,7 +620,7 @@ submodule-disable: false gerrit_jjb_deploy_job_triggers: - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(jjb-deploy[:]* (?!\*+$).+$)' + comment-contains-value: '^Patch Set\s+\d+:\s+(jjb-deploy[:]* (?!\*+$).+$)' ##################### # Job Configuration # @@ -737,7 +737,7 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' ##################### # Job Configuration # @@ -852,7 +852,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # @@ -1018,7 +1018,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' projects: - project-compare-type: ANT project-pattern: 'releng/global-jjb' @@ -1128,7 +1128,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: recheck$ + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' projects: - project-compare-type: ANT project-pattern: '{project-pattern}' @@ -1187,7 +1187,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # @@ -1463,7 +1463,7 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' ##################### # Job Configuration # @@ -1588,7 +1588,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -1772,7 +1772,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # diff --git a/jjb/lf-info-vote.yaml b/jjb/lf-info-vote.yaml index 6e5f4d0d..1f6876f1 100644 --- a/jjb/lf-info-vote.yaml +++ b/jjb/lf-info-vote.yaml @@ -53,7 +53,7 @@ gerrit_verify_triggers: - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(vote)$' + comment-contains-value: '^Patch Set\s+\d+:\s+vote\s*$' - comment-added-event: approval-category: 'Code-Review' approval-value: 2 diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml index 7c47aece..abbf66e4 100644 --- a/jjb/lf-maven-jobs.yaml +++ b/jjb/lf-maven-jobs.yaml @@ -161,7 +161,7 @@ gerrit_clm_triggers: - comment-added-contains-event: - comment-contains-value: run-clm$ + comment-contains-value: '^Patch Set\s+\d+:\s+run-clm\s*$' parameters: - lf-infra-parameters: @@ -312,7 +312,7 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' ##################### # Job Configuration # @@ -445,7 +445,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # @@ -564,7 +564,7 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' gerrit_trigger_file_paths: - compare-type: REG_EXP @@ -832,7 +832,7 @@ gerrit_release_triggers: - comment-added-contains-event: - comment-contains-value: stage-release$ + comment-contains-value: '^Patch Set\s+\d+:\s+stage-release\s*$' gerrit_trigger_file_paths: - compare-type: ANT @@ -992,12 +992,12 @@ - lf-provide-maven-settings: global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' - - shell: !include-raw-escape: ../shell/maven-patch-release.sh - lf-maven-versions-plugin: maven-versions-plugin: '{maven-versions-plugin}' mvn-version: '{mvn-version}' mvn-pom: '{mvn-pom}' mvn-settings: '{mvn-settings}' + - shell: !include-raw-escape: ../shell/maven-patch-release.sh - inject: properties-content: | CONTAINER_PULL_REGISTRY={container-public-registry} @@ -1118,7 +1118,7 @@ gerrit_sonar_triggers: - comment-added-contains-event: - comment-contains-value: run-sonar$ + comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$' ##################### # Job Configuration # @@ -1331,7 +1331,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' gerrit_trigger_file_paths: - compare-type: REG_EXP diff --git a/jjb/lf-node-jobs.yaml b/jjb/lf-node-jobs.yaml index b1e0cbd1..d7d50d6a 100644 --- a/jjb/lf-node-jobs.yaml +++ b/jjb/lf-node-jobs.yaml @@ -82,7 +82,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # diff --git a/jjb/lf-python-jobs.yaml b/jjb/lf-python-jobs.yaml index 61bb5d2d..12512d23 100644 --- a/jjb/lf-python-jobs.yaml +++ b/jjb/lf-python-jobs.yaml @@ -132,7 +132,7 @@ gerrit_clm_triggers: - comment-added-contains-event: - comment-contains-value: run-clm$ + comment-contains-value: '^Patch Set\s+\d+:\s+run-clm\s*$' ##################### # Job Configuration # @@ -317,7 +317,7 @@ gerrit_sonar_triggers: - comment-added-contains-event: - comment-contains-value: run-sonar$ + comment-contains-value: '^Patch Set\s+\d+:\s+run-sonar\s*$' ##################### # Job Configuration # @@ -479,7 +479,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 110f4ba4..b252626d 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -78,7 +78,7 @@ gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: '^Patch Set\s+\d+:\s+remerge\s*$' - ref-updated-event ##################### @@ -178,7 +178,7 @@ exclude-no-code-change: false - draft-published-event - comment-added-contains-event: - comment-contains-value: '^Patch Set[ ]+[0-9]+:([ ]+|[\n]+)(recheck|reverify)$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify)\s*$' ##################### # Job Configuration # diff --git a/jjb/lf-whitesource-jobs.yaml b/jjb/lf-whitesource-jobs.yaml index 8fade15b..77434a87 100644 --- a/jjb/lf-whitesource-jobs.yaml +++ b/jjb/lf-whitesource-jobs.yaml @@ -163,7 +163,7 @@ gerrit_wss_triggers: - comment-added-contains-event: - comment-contains-value: run-whitesource$ + comment-contains-value: '^Patch Set\s+\d+:\s+(run-whitesource)\s*$' ##################### # Job Configuration # diff --git a/releasenotes/notes/handle-unbound-arrays-9a31a444687d18ce.yaml b/releasenotes/notes/handle-unbound-arrays-9a31a444687d18ce.yaml new file mode 100644 index 00000000..1be44d82 --- /dev/null +++ b/releasenotes/notes/handle-unbound-arrays-9a31a444687d18ce.yaml @@ -0,0 +1,14 @@ +--- +fixes: + - | + Fix error with handling unbound arrays for search extensions, when using + `set -u`. The correct way of using this. + + .. code-block:: bash + + set -u + arr=() + echo "output: '${arr[@]}'" + bash: arr[@]: unbound variable + echo "output: '${arr[@]:-}'" + foo: '' diff --git a/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml b/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml new file mode 100644 index 00000000..d00cb25e --- /dev/null +++ b/releasenotes/notes/lf-maven-docker-versions-fix-b57870964f161873.yaml @@ -0,0 +1,9 @@ +--- +fixes: + - | + lf-maven-versions-plugin builder step needs to run before maven-patch-release.sh + as this second script contains a condition to confirm if the maven vesions + plugin was selected as a way to remove the 'SNAPSHOT' pattern from the pom.xml + files. + lf-maven-docker-stage was based on lf-maven-stage and it seems that these particular + builder steps were switched in place accidentally. diff --git a/releasenotes/notes/pin-requests-v2.21.0-fe39ad342472bee5.yaml b/releasenotes/notes/pin-requests-v2.21.0-fe39ad342472bee5.yaml new file mode 100644 index 00000000..c5dbe16e --- /dev/null +++ b/releasenotes/notes/pin-requests-v2.21.0-fe39ad342472bee5.yaml @@ -0,0 +1,5 @@ +--- +fixes: + - | + request-2.22.0 does not work with python-3.4.9, so pin requests + to v2.21.0 to address the tox failures. diff --git a/releasenotes/notes/update-gerrit-trigger-comments-469ffad2c2d8770a.yaml b/releasenotes/notes/update-gerrit-trigger-comments-469ffad2c2d8770a.yaml new file mode 100644 index 00000000..936facfe --- /dev/null +++ b/releasenotes/notes/update-gerrit-trigger-comments-469ffad2c2d8770a.yaml @@ -0,0 +1,7 @@ +--- +upgrade: + - | + Update gerrit comment trigger to use a more standard regex and avoid triggering + jobs, when these keywords are intended to be used as code review comments + between users. Also improve the regexs to make them more succinct and + readable. diff --git a/shell/logs-deploy.sh b/shell/logs-deploy.sh index a00f0a7a..23660d7a 100644 --- a/shell/logs-deploy.sh +++ b/shell/logs-deploy.sh @@ -21,9 +21,10 @@ else # Handle multiple search extensions as separate values to '-p|--pattern' set -f # Disable pathname expansion + search_exts=() IFS=' ' read -r -a search_exts <<< "${ARCHIVE_ARTIFACTS:-}" pattern_opts=() - for search_ext in "${search_exts[@]}"; + for search_ext in "${search_exts[@]:-}"; do pattern_opts+=("-p" "$search_ext") done diff --git a/tox.ini b/tox.ini index 3adfbc21..fa58f859 100644 --- a/tox.ini +++ b/tox.ini @@ -18,6 +18,8 @@ deps = coala coala-bears pygments~=2.3.1 + # request-2.22.0 does not work with python-3.4.9 + requests~=2.21.0 # Markdown lint requires nodejs nodeenv commands =