From f75d09a79e7fefca4589fe080edfa4bfec2e8074 Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Wed, 5 Apr 2023 11:52:05 +0200
Subject: 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
---
 jobs/master-builds.yml |  2 +-
 jobs/osmocom-obs.yml   | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

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:
-- 
cgit v1.2.3