Change in osmo-ci[master]: gerrit, master builds: default to concurrent: true

This is merely a historical archive of years 2008-2021, before the migration to mailman3.

A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.

osmith gerrit-no-reply at lists.osmocom.org
Fri Oct 18 08:45:33 UTC 2019


osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/15585 )

Change subject: gerrit, master builds: default to concurrent: true
......................................................................

gerrit, master builds: default to concurrent: true

Now that almost everything runs in docker, we don't need to worry about
problems with running VTY/CTRL tests in parallel for these projects.

Related: OS#3726
Change-Id: I5fdf759faf47ec7e4f9cb2657bd004585a667add
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 12 insertions(+), 24 deletions(-)

Approvals:
  osmith: Looks good to me, approved; Verified



diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 83c7169..5f4385a 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -5,7 +5,7 @@
     name: gerrit
     # following default values can be overridden by each repo
     disabled: false
-    concurrent: false
+    concurrent: true
     node: osmocom-gerrit-debian8
     # axes related defaults
     slave_axis: !!python/tuple [osmocom-gerrit-debian9]
@@ -46,10 +46,7 @@
     # in alphabetical order
     repos:
       - asn1c
-
-      - cellmgr-ng:
-          concurrent: true
-
+      - cellmgr-ng
       - libasn1c
       - libgtpnl
       - libosmo-abis
@@ -73,7 +70,6 @@
           a2: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding]
           a3_name: IU
           a3: !!python/tuple [--disable-iu]
-          concurrent: true
           cmd: |
             {docker_run} \
               -e IU="$IU" \
@@ -84,10 +80,10 @@
       - openggsn:
           a1_name: GTP
           a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]
+          concurrent: false
           cmd: ./contrib/jenkins.sh
 
-      - osmo-bsc:
-          concurrent: true
+      - osmo-bsc
 
       - osmo-bts:
           a1_name: FIRMWARE_VERSION
@@ -107,6 +103,7 @@
             (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")
+          concurrent: false
           cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
       - osmo-ggsn:
@@ -126,16 +123,13 @@
       - osmo-gsm-manuals
       - osmo-hlr
       - osmo-iuh
-
-      - osmo-mgw:
-          concurrent: true
+      - osmo-mgw
 
       - osmo-msc:
           a1_name: IU
           a1: !!python/tuple [--enable-iu, --disable-iu]
           a2_name: WITH_MANUALS
           a2: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (IU == "--enable-iu" && WITH_MANUALS == "0") ||
             (IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -156,7 +150,6 @@
           a3: !!python/tuple [sysmo, lc15, oc2g, none]
           a4_name: WITH_MANUALS
           a4: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
@@ -181,7 +174,6 @@
           a1: !!python/tuple [--enable-iu, --disable-iu]
           a2_name: WITH_MANUALS
           a2: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (IU == "--enable-iu" && WITH_MANUALS == "0") ||
             (IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -200,7 +192,6 @@
           a1: !!python/tuple [--with-sse]
           a2_name: WITH_MANUALS
           a2: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (INSTR == "--with-sse" && WITH_MANUALS == "1")
           cmd: 'ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'
@@ -217,11 +208,13 @@
 
       - pysim:
           slave_axis: !!python/tuple [simtester]
+          concurrent: false
           cmd: './contrib/jenkins.sh'
 
       - osmo-ttcn3-hacks:
           repos_url: 'https://gerrit.osmocom.org/{repos}'
           slave_axis: !!python/tuple [ttcn3]
+          concurrent: false
           cmd: |
             set -e
             make deps; make clean; make compile
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 138807e..beebf31 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -4,7 +4,7 @@
     name: master_build
     # following default values can be overridden by each repo
     disabled: false
-    concurrent: false
+    concurrent: true
     node: 'osmocom-master-debian8'
     # axes related defaults
     slave_axis: !!python/tuple [osmocom-master-debian9]
@@ -165,7 +165,6 @@
           a2: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding]
           a3_name: IU
           a3: !!python/tuple [--disable-iu]
-          concurrent: true
           cmd: |
             {docker_run} \
               -e IU="$IU" \
@@ -173,8 +172,7 @@
               -e MGCP="$MGCP" \
               {docker_img} /build/contrib/jenkins.sh
 
-      - osmo-bsc:
-          concurrent: true
+      - osmo-bsc
 
       - osmo-bts:
           a1_name: FIRMWARE_VERSION
@@ -193,6 +191,7 @@
             (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||
             (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")
+          concurrent: false
           cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
       - osmo-ggsn:
@@ -231,7 +230,6 @@
             master-osmo-sgsn
 
       - osmo-mgw:
-          concurrent: true
           trigger: master-osmo-msc, master-osmo-bsc
 
       - osmo-msc:
@@ -239,7 +237,6 @@
           a1: !!python/tuple [--enable-iu, --disable-iu]
           a2_name: WITH_MANUALS
           a2: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (IU == "--enable-iu" && WITH_MANUALS == "0") ||
             (IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -265,7 +262,6 @@
           a3: !!python/tuple [sysmo, lc15, none]
           a4_name: WITH_MANUALS
           a4: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
             (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||
@@ -285,7 +281,6 @@
           a1: !!python/tuple [--enable-iu, --disable-iu]
           a2_name: WITH_MANUALS
           a2: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (IU == "--enable-iu" && WITH_MANUALS == "0") ||
             (IU == "--disable-iu" && WITH_MANUALS == "1")
@@ -308,7 +303,6 @@
           a1: !!python/tuple [--with-sse]
           a2_name: WITH_MANUALS
           a2: !!python/tuple ["1", "0"]
-          concurrent: true
           combination_filter: >
             (INSTR == "--with-sse" && WITH_MANUALS == "1")
           cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'
@@ -327,6 +321,7 @@
           email: laforge at gnumonks.org steve at steve-m.de
 
       - sysmo-usim-tool:
+          concurrent: false
           cmd: cd ./tests; ./run-tests
           slave_axis: !!python/tuple [simtester]
           git_base_url: git.sysmocom.de

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/15585
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I5fdf759faf47ec7e4f9cb2657bd004585a667add
Gerrit-Change-Number: 15585
Gerrit-PatchSet: 8
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20191018/ea50637f/attachment.htm>


More information about the gerrit-log mailing list