laforge has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ci/+/32231 )
(
1 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the submitted
one.
)Change subject: jobs/osmocom-obs: drop obs.osmocom.org suffix
......................................................................
jobs/osmocom-obs: drop obs.osmocom.org suffix
Having the OBS URL at the end of the jenkins job was useful when we were
uploading to obs.osmocom.org and build.opensuse.org at the same time
during the transitional phase. Remove the URL from the job name as this
isn't the case anymore, and so the jobs look consistent with new
Osmocom_OBS jobs.
Change-Id: I460f9e6a508421773e300eee6c5c5654e5760cdb
---
M jobs/master-builds.yml
M jobs/osmocom-obs.yml
2 files changed, 20 insertions(+), 8 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, approved
Jenkins Builder: Verified
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 01e5ac0..828bf52 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -581,7 +581,7 @@
- trigger:
project: '{obj:trigger}'
- trigger:
- project: 'Osmocom_OBS_master_obs.osmocom.org'
+ project: 'Osmocom_OBS_master'
- email:
recipients: '{obj:email}'
send-to-individuals: true
diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml
index b0e0e62..4870066 100644
--- a/jobs/osmocom-obs.yml
+++ b/jobs/osmocom-obs.yml
@@ -2,7 +2,7 @@
- project:
name: Osmocom_OBS
jobs:
- - Osmocom_OBS_{type}_{server}
+ - Osmocom_OBS_{type}
type:
- master:
conflict_version: ""
@@ -12,12 +12,9 @@
conflict_version: "$(date +%Y%m%d%H%M)"
- latest:
conflict_version: ""
- server:
- - obs.osmocom.org:
- proj: "osmocom"
- job-template:
- name: 'Osmocom_OBS_{type}_{server}'
+ name: 'Osmocom_OBS_{type}'
project-type: freestyle
concurrent: false
defaults: global
@@ -39,12 +36,12 @@
export PYTHONUNBUFFERED=1
./scripts/obs/update_obs_project.py \
- --apiurl {server} \
+ --apiurl https://obs.osmocom.org \
--conflict-version {conflict_version} \
--docker \
--feed {type} \
--meta \
- {proj}:{type}
+ osmocom:{type}
scm:
- git:
branches:
--
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/32231
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I460f9e6a508421773e300eee6c5c5654e5760cdb
Gerrit-Change-Number: 32231
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
Gerrit-MessageType: merged
