From e3ce3b696047b3d002cc22086fe782040fff5f9f Mon Sep 17 00:00:00 2001
From: Oliver Smith <osmith@sysmocom.de>
Date: Wed, 27 May 2020 11:31:06 +0200
Subject: repo-install-test: update jenkins job

Rename osmocom-debian-install.yml to repo-install-test.yml to get debian
out of the name. Extend it with a new distro parameter and update the
description. Adjust the shell section to run the script from its new
location (in osmo-ci.git, not docker-playground.git). Turn it into a
matrix job, so we can have two parameters (distro, feed) for each job.

Related: OS#4563
Change-Id: I777098f19d75f7efbd68b837ccdcd83309429c39
---
 jobs/osmocom-debian-install.yml | 44 --------------------------
 jobs/repo-install-test.yml      | 68 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 68 insertions(+), 44 deletions(-)
 delete mode 100644 jobs/osmocom-debian-install.yml
 create mode 100644 jobs/repo-install-test.yml

diff --git a/jobs/osmocom-debian-install.yml b/jobs/osmocom-debian-install.yml
deleted file mode 100644
index 26b7fa0..0000000
--- a/jobs/osmocom-debian-install.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
-    name: Osmocom-Debian-install
-    jobs:
-      - Osmocom-Debian-install-{type}
-    type:
-      - nightly
-      - latest
-
-- job-template:
-    name: 'Osmocom-Debian-install-{type}'
-
-    project-type: freestyle
-    defaults: global
-    description: |
-        <ul>
-          <li> Install all Osmocom debian packages (<a href="https://osmocom.org/issues/3176">OS#3176</a>)
-          <li> Check if Osmocom systemd services start properly (<a href="https://osmocom.org/issues/3369">OS#3369</a>)
-        </ul>
-    node: osmocom-master-debian9
-    parameters:
-      - string:
-          name: BRANCH
-          description: |
-                docker-playground.git branch
-          default: '*/master'
-    builders:
-      - shell:
-          cd debian-repo-install-test && FEED={type} ./jenkins.sh
-    scm:
-      - git:
-          branches:
-            - '$BRANCH'
-          url: git://git.osmocom.org/docker-playground
-          git-config-name: 'Jenkins Builder'
-          git-config-email: 'jenkins@osmocom.org'
-    triggers:
-      - timed: "H 04 * * *" # run after osmocom-obs.yml
-    publishers:
-      - email:
-          notify-every-unstable-build: true
-          recipients: 'jenkins-notifications@lists.osmocom.org'
-
-# vim: expandtab tabstop=2 shiftwidth=2
diff --git a/jobs/repo-install-test.yml b/jobs/repo-install-test.yml
new file mode 100644
index 0000000..19a0b5f
--- /dev/null
+++ b/jobs/repo-install-test.yml
@@ -0,0 +1,68 @@
+---
+- project:
+    name: Osmocom-repo-install
+    jobs:
+      - Osmocom-repo-install-{distro}
+    distro:
+      - debian:
+          feeds: !!python/tuple [nightly, latest]
+      - centos:
+          feeds: !!python/tuple [next, nightly]
+
+- job-template:
+    name: Osmocom-repo-install-{distro}
+    project-type: matrix
+    defaults: global
+    description: |
+        Install {distro} packages from the
+          <a href="https://osmocom.org/projects/cellular-infrastructure/wiki/Binary_Packages">
+            Osmocom binary packages repositories</a>, test if binaries and systemd services can be started.<br>
+        <br>
+        Related:<br>
+        <ul>
+          <li> <a href="https://osmocom.org/issues/3176">OS#3176</a>: install all Osmocom debian packages
+          <li> <a href="https://osmocom.org/issues/3369">OS#3369</a>: check if systemd services start properly
+          <li> <a href="https://osmocom.org/issues/4563">OS#4563</a>: extend for centos
+        </ul>
+    node: osmocom-master-debian9
+    parameters:
+      - string:
+          name: BRANCH_CI
+          description: |
+                osmo-ci.git branch
+          default: 'master'
+      - string:
+          name: BRANCH_DP
+          description: |
+                docker-playground.git branch
+          default: 'master'
+    axes:
+      - axis:
+          type: slave
+          name: label
+          values: !!python/tuple [osmocom-master-debian9]
+      - axis:
+          type: user-defined
+          name: feed
+          values: '{obj:feeds}'
+    builders:
+      - shell: |
+          export OSMO_BRANCH_DOCKER_PLAYGROUND="$BRANCH_DP"
+          export FEED="$feed"
+          scripts/repo-install-test.sh "{distro}"
+    scm:
+      - git:
+          branches:
+            - '$BRANCH_CI'
+          url: git://git.osmocom.org/osmo-ci
+          git-config-name: 'Jenkins Builder'
+          git-config-email: 'jenkins@osmocom.org'
+    triggers:
+      - timed: "H 04 * * *" # run after osmocom-obs.yml
+
+    publishers:
+      - email:
+          notify-every-unstable-build: true
+          recipients: 'jenkins-notifications@lists.osmocom.org'
+
+# vim: expandtab tabstop=2 shiftwidth=2
-- 
cgit v1.2.3