osmith has uploaded this change for review.

View Change

jobs/osmocom-obs: run against obs.osmocom.org too

Split the OBS related jenkins jobs into two, one that uploads to the
new obs.osmocom.org and one that uploads to build.opensuse.org.

Set an alias for "osc" that sets the right server, and set the
expand_aliases shopt so the bash scripts that source common-obs.sh will
not ignore the alias.

Related: OS#5557
Change-Id: Ib271e16e93ebc58ed1ecb0ea881e1f1370e40928
---
M jobs/osmocom-obs.yml
M scripts/common-obs.sh
2 files changed, 22 insertions(+), 9 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/15/28415/1

diff --git a/jobs/osmocom-obs.yml b/jobs/osmocom-obs.yml
index 3b8b1d8..cfd3bff 100644
--- a/jobs/osmocom-obs.yml
+++ b/jobs/osmocom-obs.yml
@@ -2,23 +2,24 @@
 - project:
     name: Osmocom_OBS
     jobs:
-      - Osmocom_OBS_{type}
+      - Osmocom_OBS_{type}_{server}
     type:
       - nightly
       - latest
     # - next (disabled: OS#5322)
+    server:
+      - build.opensuse.org:
+          proj: "network:osmocom"
+      - obs.osmocom.org:
+          proj: "osmocom"
 
 - job-template:
-    name: 'Osmocom_OBS_{type}'
+    name: 'Osmocom_OBS_{type}_{server}'
     project-type: freestyle
     defaults: global
     description: |
-        <ul>
-          <li><a href="https://build.opensuse.org/project/show/network:osmocom:{type}">osmocom:{type} home page</a>
-          <li><a href="https://build.opensuse.org/project/monitor/network:osmocom:{type}">osmocom:{type} build monitor</a>
-          <li><a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages">Wiki: binary packages</a>
-        </ul>
-        (Generated by job-builder)
+      See <a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages">Wiki: binary packages</a>
+      for more information.
     node: obs
     parameters:
       - string:
@@ -27,7 +28,9 @@
           default: 'refs/remotes/origin/master'
     builders:
       - shell: |
-          export PROJ=network:osmocom:{type}
+          export PROJ={proj}:{type}
+          export OBS_SERVER={server}
+
           ./scripts/osmocom-{type}-packages.sh
     scm:
       - git:
diff --git a/scripts/common-obs.sh b/scripts/common-obs.sh
index 91d54c9..4de2c55 100644
--- a/scripts/common-obs.sh
+++ b/scripts/common-obs.sh
@@ -29,6 +29,16 @@
 	exit 1
 fi
 
+if [ -z "$OBS_SERVER" ]; then
+	echo "OBS_SERVER environment variable is not set"
+	exit 1
+fi
+
+# Related configuration sections are in .oscrc (OS#5557)
+echo "Using OBS server: $OBS_SERVER"
+shopt -s expand_aliases
+alias osc="osc -A '$OBS_SERVER'"
+
 # Add dependency to all (sub)packages in debian/control and commit the change.
 # $1: path to debian/control file
 # $2: package name (e.g. "libosmocore")

To view, visit change 28415. To unsubscribe, or for help writing mail filters, visit settings.