laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35211?usp=email )
Change subject: jobs: fix undefined parameter log warnings ......................................................................
jobs: fix undefined parameter log warnings
Adjust all jobs in the gerrit verifications pipeline to use the same parameters from a new include file, to prevent undefined parameter warnings in the log.
Fixes: OS#6261 Change-Id: Iadc5cd8996eb4ed86634ceb35829a3e9239e598d --- M jobs/gerrit-binpkgs.yml M jobs/gerrit-lint.yml M jobs/gerrit-verifications-comment.yml A jobs/gerrit-verifications-parameters.yaml.inc M jobs/gerrit-verifications.yml 5 files changed, 74 insertions(+), 96 deletions(-)
Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified
diff --git a/jobs/gerrit-binpkgs.yml b/jobs/gerrit-binpkgs.yml index ecfbd52..7cf2230 100644 --- a/jobs/gerrit-binpkgs.yml +++ b/jobs/gerrit-binpkgs.yml @@ -24,26 +24,7 @@ Related issue: <a href="https://osmocom.org/issues/2385">OS#2385</a>
parameters: - - string: - name: BRANCH_CI - description: | - osmo-ci.git branch - default: 'master' - - string: - name: GERRIT_REPO_URL - description: set by gerrit verification pipeline job - - string: - name: GERRIT_BRANCH - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REFSPEC - description: set by gerrit verification pipeline job - - string: - name: PROJECT_NAME - description: project to test, e.g. 'libosmocore' (set by pipeline) - - string: - name: DISTRO - description: distribution to build for, e.g. 'debian:12' (set by pipeline) + !include: gerrit-verifications-parameters.yaml.inc
scm: - git: diff --git a/jobs/gerrit-lint.yml b/jobs/gerrit-lint.yml index 16377cd..3039829 100644 --- a/jobs/gerrit-lint.yml +++ b/jobs/gerrit-lint.yml @@ -23,38 +23,7 @@ Related issue: <a href="https://osmocom.org/issues/5087">OS#5087</a>
parameters: - - string: - name: BRANCH_CI - description: | - osmo-ci.git branch - default: 'master' - - string: - name: GERRIT_PROJECT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_CHANGE_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_BRANCH - description: set by gerrit verification pipeline job - - string: - name: GERRIT_HOST - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_REVISION - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PORT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REFSPEC - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REPO_URL - description: set by gerrit verification pipeline job + !include: gerrit-verifications-parameters.yaml.inc
scm: - git: diff --git a/jobs/gerrit-verifications-comment.yml b/jobs/gerrit-verifications-comment.yml index 6c8d90d..3ed54ad 100644 --- a/jobs/gerrit-verifications-comment.yml +++ b/jobs/gerrit-verifications-comment.yml @@ -22,44 +22,7 @@ Related issue: <a href="https://osmocom.org/issues/2385">OS#2385</a>
parameters: - - string: - name: BRANCH_CI - description: | - osmo-ci.git branch - default: 'master' - - string: - name: COMMENT_TYPE - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PROJECT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_CHANGE_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_NUMBER - description: set by gerrit verification pipeline job - - string: - name: GERRIT_BRANCH - description: set by gerrit verification pipeline job - - string: - name: GERRIT_HOST - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_REVISION - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PATCHSET_UPLOADER_NAME - description: set by gerrit verification pipeline job - - string: - name: GERRIT_PORT - description: set by gerrit verification pipeline job - - string: - name: GERRIT_REFSPEC - description: set by gerrit verification pipeline job - - string: - name: PIPELINE_BUILD_URL - description: set by gerrit verification pipeline job + !include: gerrit-verifications-parameters.yaml.inc
scm: - git: diff --git a/jobs/gerrit-verifications-parameters.yaml.inc b/jobs/gerrit-verifications-parameters.yaml.inc new file mode 100644 index 0000000..32df1b6 --- /dev/null +++ b/jobs/gerrit-verifications-parameters.yaml.inc @@ -0,0 +1,53 @@ +# This file gets included as parameters element of various jobs in the +# gerrit-verifications pipeline. All of these jobs have the same parameters +# and can be called from one run_job() function, without creating log entries +# about undefined parameters (OS#6261). See gerrit-verifications.yml for more +# information. + +- string: + name: BRANCH_CI + description: | + osmo-ci.git branch + default: 'master' +- string: + name: COMMENT_TYPE + description: set by gerrit verification pipeline job +- string: + name: DISTRO + description: set by gerrit verification pipeline job +- string: + name: GERRIT_BRANCH + description: set by gerrit verification pipeline job +- string: + name: GERRIT_CHANGE_NUMBER + description: set by gerrit verification pipeline job +- string: + name: GERRIT_HOST + description: set by gerrit verification pipeline job +- string: + name: GERRIT_PATCHSET_NUMBER + description: set by gerrit verification pipeline job +- string: + name: GERRIT_PATCHSET_REVISION + description: set by gerrit verification pipeline job +- string: + name: GERRIT_PATCHSET_UPLOADER_NAME + description: set by gerrit verification pipeline job +- string: + name: GERRIT_PORT + description: set by gerrit verification pipeline job +- string: + name: GERRIT_PROJECT + description: set by gerrit verification pipeline job +- string: + name: GERRIT_REFSPEC + description: set by gerrit verification pipeline job +- string: + name: GERRIT_REPO_URL + description: set by gerrit verification pipeline job +- string: + name: PIPELINE_BUILD_URL + description: set by gerrit verification pipeline job +- string: + name: PROJECT_NAME + description: set by gerrit verification pipeline job diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 07f07f4..90c5fb5 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -473,6 +473,9 @@ try {{ echo "pipeline_${{display_name}}: running job ${{job_name}}"
+ // IMPORTANT: Keep gerrit-verifications-parameters.yaml.inc in sync + // with the list of parameters here, and make sure all jobs passed + // to run_job() include the .yaml.inc file. (OS#6261) build job: job_name, parameters: [ string(name: "COMMENT_TYPE", value: comment_type), string(name: "DISTRO", value: distro), @@ -691,12 +694,7 @@ recursive: true
parameters: - - string: - name: GERRIT_BRANCH - description: set by gerrit-{repos} job - - string: - name: GERRIT_REFSPEC - description: set by gerrit-{repos} job + !include: gerrit-verifications-parameters.yaml.inc
builders: - shell: '{obj:cmd}'
-
laforge