osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/40441?usp=email )

Change subject: jobs: make references to master branch consistent ......................................................................

jobs: make references to master branch consistent

Use "master" instead of: - "refs/remotes/origin/master" - "origin/master" - "*/master"

This improves consistency and makes clear what should be used when adding new jobs. It also fixes the problem with */master that it may actually not only use the master branch, but also e.g. osmith/master which can lead to unintentionally building and publishing artifacts from the wrong branch. If we want to run a job on a different branch intentionally, such a job should have an extra argument for branch that can be changed when starting the job.

Change-Id: I7389585165bf3a790c7a338d10f5f7fe2311ee69 --- M jobs/coverity-status.yml M jobs/coverity.yml M jobs/octsim_osmo-ccid-firmware.yml M jobs/osmo-gsm-manuals-trigger.yml M jobs/osmo-gsm-tester-runner.yml M jobs/osmocom-build-tags-against-master.yml M jobs/osmocom-depcheck.yml M jobs/osmocom-list-commits.yml M jobs/osmocom-obs-check-builders.yml M jobs/osmocom-obs-nightly-asan.yml M jobs/osmocom-obs.yml M jobs/registry-rebuild-upload-fpga-build.yml M jobs/registry-triggers.yml M jobs/simtester-sanitize.yml M jobs/ttcn3-testsuites-kernel-git.yml M jobs/ttcn3-testsuites.yml M jobs/update-containers-osmo-python-tests.yml M jobs/update-osmo-ci-on-slaves.yml 18 files changed, 18 insertions(+), 18 deletions(-)

Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, approved

diff --git a/jobs/coverity-status.yml b/jobs/coverity-status.yml index cb7522e..4e1ade8 100644 --- a/jobs/coverity-status.yml +++ b/jobs/coverity-status.yml @@ -30,7 +30,7 @@ - string: name: BRANCH description: osmo-ci.git branch - default: 'origin/master' + default: 'master' scm: - git: url: https://gerrit.osmocom.org/osmo-ci diff --git a/jobs/coverity.yml b/jobs/coverity.yml index d7492c4..c70f1d1 100644 --- a/jobs/coverity.yml +++ b/jobs/coverity.yml @@ -34,7 +34,7 @@ - string: name: BRANCH description: osmo-ci.git branch - default: 'origin/master' + default: 'master' scm: - git: url: https://gerrit.osmocom.org/osmo-ci diff --git a/jobs/octsim_osmo-ccid-firmware.yml b/jobs/octsim_osmo-ccid-firmware.yml index 7db1039..24e8d3b 100644 --- a/jobs/octsim_osmo-ccid-firmware.yml +++ b/jobs/octsim_osmo-ccid-firmware.yml @@ -27,7 +27,7 @@ git-config-email: 'jenkins@osmocom.org' skip-tag: true branches: - - 'origin/master' + - 'master' properties: - build-blocker: block-level: GLOBAL diff --git a/jobs/osmo-gsm-manuals-trigger.yml b/jobs/osmo-gsm-manuals-trigger.yml index 29882e3..1f59de8 100644 --- a/jobs/osmo-gsm-manuals-trigger.yml +++ b/jobs/osmo-gsm-manuals-trigger.yml @@ -26,7 +26,7 @@ git-config-email: 'jenkins@osmocom.org' skip-tag: true branches: - - 'origin/master' + - 'master' triggers: - pollscm: cron: "H/5 * * * *" diff --git a/jobs/osmo-gsm-tester-runner.yml b/jobs/osmo-gsm-tester-runner.yml index 57652ac..0a9d824 100644 --- a/jobs/osmo-gsm-tester-runner.yml +++ b/jobs/osmo-gsm-tester-runner.yml @@ -102,7 +102,7 @@ parameters: - string: name: "OSMO_GSM_TESTER_BRANCH" - default: "origin/master" + default: "master" description: "Which branch/sha should be used for testing" - string: name: "OSMO_GSM_TESTER_OPTS" diff --git a/jobs/osmocom-build-tags-against-master.yml b/jobs/osmocom-build-tags-against-master.yml index 39d4b2b..c3bbea2 100644 --- a/jobs/osmocom-build-tags-against-master.yml +++ b/jobs/osmocom-build-tags-against-master.yml @@ -21,7 +21,7 @@ name: BRANCH description: | osmo-ci.git branch where the osmocom-build-old-tags-against-master.sh gets pulled from - default: '*/master' + default: 'master' builders: - shell: | docker run \ diff --git a/jobs/osmocom-depcheck.yml b/jobs/osmocom-depcheck.yml index 5e9d247..f5cca1d 100644 --- a/jobs/osmocom-depcheck.yml +++ b/jobs/osmocom-depcheck.yml @@ -50,7 +50,7 @@ description: | Branch where the osmo-depcheck.py script gets pulled from. Only modify this if you are hacking on osmo-depcheck.py. - default: '*/master' + default: 'master' builders: - shell: | # Build the arguments diff --git a/jobs/osmocom-list-commits.yml b/jobs/osmocom-list-commits.yml index 5084879..482e3d0 100644 --- a/jobs/osmocom-list-commits.yml +++ b/jobs/osmocom-list-commits.yml @@ -21,7 +21,7 @@ name: BRANCH description: | osmo-ci.git branch where the osmocom-list-commits.sh gets pulled from - default: '*/master' + default: 'master' builders: - shell: | scripts/osmocom-list-commits.sh > commits.txt diff --git a/jobs/osmocom-obs-check-builders.yml b/jobs/osmocom-obs-check-builders.yml index 01fdba5..9069043 100644 --- a/jobs/osmocom-obs-check-builders.yml +++ b/jobs/osmocom-obs-check-builders.yml @@ -21,7 +21,7 @@ scm: - git: branches: - - 'origin/master' + - 'master' url: https://gerrit.osmocom.org/osmo-ci triggers: - timed: "@hourly" diff --git a/jobs/osmocom-obs-nightly-asan.yml b/jobs/osmocom-obs-nightly-asan.yml index bd5480e..7d4cf44 100644 --- a/jobs/osmocom-obs-nightly-asan.yml +++ b/jobs/osmocom-obs-nightly-asan.yml @@ -15,7 +15,7 @@ - string: name: BRANCH description: osmo-ci.git branch - default: 'refs/remotes/origin/master' + default: 'master' builders: - shell: | export PYTHONUNBUFFERED=1 diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml index fd11055..fd0c1fe 100644 --- a/jobs/osmocom-obs.yml +++ b/jobs/osmocom-obs.yml @@ -43,7 +43,7 @@ - string: name: BRANCH description: osmo-ci.git branch - default: 'refs/remotes/origin/master' + default: 'master' - string: name: EMAIL_NOTIFICATIONS description: For failed job notifications, set to empty to disable diff --git a/jobs/registry-rebuild-upload-fpga-build.yml b/jobs/registry-rebuild-upload-fpga-build.yml index 9efa0ce..fc158c6 100644 --- a/jobs/registry-rebuild-upload-fpga-build.yml +++ b/jobs/registry-rebuild-upload-fpga-build.yml @@ -18,7 +18,7 @@ url: https://gerrit.osmocom.org/docker-playground skip-tag: true branches: - - 'origin/master' + - 'master'

builders: - shell: | diff --git a/jobs/registry-triggers.yml b/jobs/registry-triggers.yml index 8154ff6..9a4dddc 100644 --- a/jobs/registry-triggers.yml +++ b/jobs/registry-triggers.yml @@ -20,7 +20,7 @@ - git: url: https://gerrit.osmocom.org/%7Brepos%7D branches: - - 'origin/master' + - 'master' trigger: email: jenkins-notifications@lists.osmocom.org triggers: diff --git a/jobs/simtester-sanitize.yml b/jobs/simtester-sanitize.yml index fce678a..9c19665 100644 --- a/jobs/simtester-sanitize.yml +++ b/jobs/simtester-sanitize.yml @@ -20,7 +20,7 @@ - string: name: BRANCH description: pysim.git branch - default: 'origin/master' + default: 'master' - string: name: EMAIL_NOTIFICATIONS description: For failed build notifications, set to empty to disable diff --git a/jobs/ttcn3-testsuites-kernel-git.yml b/jobs/ttcn3-testsuites-kernel-git.yml index 6ce8fe8..f757628 100644 --- a/jobs/ttcn3-testsuites-kernel-git.yml +++ b/jobs/ttcn3-testsuites-kernel-git.yml @@ -67,7 +67,7 @@ Branch of <code>docker-playground.git</code> (for development of the test infrastructure, don't change this when testing kernel trees). - default: '*/master' + default: 'master'

builders: - shell: |- diff --git a/jobs/ttcn3-testsuites.yml b/jobs/ttcn3-testsuites.yml index 0ea8a96..5125038 100644 --- a/jobs/ttcn3-testsuites.yml +++ b/jobs/ttcn3-testsuites.yml @@ -92,7 +92,7 @@ description: | Branch of <code>docker-playground.git</code>. Only modify if you are hacking on the docker-playground scripts. - default: '*/master' + default: 'master' builders: - shell: |- export REGISTRY_HOST="registry.osmocom.org" diff --git a/jobs/update-containers-osmo-python-tests.yml b/jobs/update-containers-osmo-python-tests.yml index 63b2929..0994dc1 100644 --- a/jobs/update-containers-osmo-python-tests.yml +++ b/jobs/update-containers-osmo-python-tests.yml @@ -10,7 +10,7 @@ - git: url: https://gerrit.osmocom.org/python/osmo-python-tests branches: - - 'origin/master' + - 'master' skip-tag: true wipe-workspace: true triggers: diff --git a/jobs/update-osmo-ci-on-slaves.yml b/jobs/update-osmo-ci-on-slaves.yml index 24e67b1..ea72086 100644 --- a/jobs/update-osmo-ci-on-slaves.yml +++ b/jobs/update-osmo-ci-on-slaves.yml @@ -73,7 +73,7 @@ git-config-email: 'jenkins@osmocom.org' skip-tag: true branches: - - 'origin/master' + - 'master' triggers: - pollscm: cron: "H/5 * * * *"