<p>osmith <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15585">View Change</a></p><div style="white-space:pre-wrap">Approvals:
osmith: Looks good to me, approved; Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: default to concurrent: true<br><br>Now that almost everything runs in docker, we don't need to worry about<br>problems with running VTY/CTRL tests in parallel for these projects.<br><br>Related: OS#3726<br>Change-Id: I5fdf759faf47ec7e4f9cb2657bd004585a667add<br>---<br>M jobs/gerrit-verifications.yml<br>M jobs/master-builds.yml<br>2 files changed, 12 insertions(+), 24 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml</span><br><span>index 83c7169..5f4385a 100644</span><br><span>--- a/jobs/gerrit-verifications.yml</span><br><span>+++ b/jobs/gerrit-verifications.yml</span><br><span>@@ -5,7 +5,7 @@</span><br><span> name: gerrit</span><br><span> # following default values can be overridden by each repo</span><br><span> disabled: false</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: false</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: true</span><br><span> node: osmocom-gerrit-debian8</span><br><span> # axes related defaults</span><br><span> slave_axis: !!python/tuple [osmocom-gerrit-debian9]</span><br><span>@@ -46,10 +46,7 @@</span><br><span> # in alphabetical order</span><br><span> repos:</span><br><span> - asn1c</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- - cellmgr-ng:</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ - cellmgr-ng</span><br><span> - libasn1c</span><br><span> - libgtpnl</span><br><span> - libosmo-abis</span><br><span>@@ -73,7 +70,6 @@</span><br><span> a2: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding]</span><br><span> a3_name: IU</span><br><span> a3: !!python/tuple [--disable-iu]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> cmd: |</span><br><span> {docker_run} \</span><br><span> -e IU="$IU" \</span><br><span>@@ -84,10 +80,10 @@</span><br><span> - openggsn:</span><br><span> a1_name: GTP</span><br><span> a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: false</span><br><span> cmd: ./contrib/jenkins.sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-bsc:</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-bsc</span><br><span> </span><br><span> - osmo-bts:</span><br><span> a1_name: FIRMWARE_VERSION</span><br><span>@@ -107,6 +103,7 @@</span><br><span> (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: false</span><br><span> cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span> - osmo-ggsn:</span><br><span>@@ -126,16 +123,13 @@</span><br><span> - osmo-gsm-manuals</span><br><span> - osmo-hlr</span><br><span> - osmo-iuh</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-mgw:</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-mgw</span><br><span> </span><br><span> - osmo-msc:</span><br><span> a1_name: IU</span><br><span> a1: !!python/tuple [--enable-iu, --disable-iu]</span><br><span> a2_name: WITH_MANUALS</span><br><span> a2: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span>@@ -156,7 +150,6 @@</span><br><span> a3: !!python/tuple [sysmo, lc15, oc2g, none]</span><br><span> a4_name: WITH_MANUALS</span><br><span> a4: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span>@@ -181,7 +174,6 @@</span><br><span> a1: !!python/tuple [--enable-iu, --disable-iu]</span><br><span> a2_name: WITH_MANUALS</span><br><span> a2: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span>@@ -200,7 +192,6 @@</span><br><span> a1: !!python/tuple [--with-sse]</span><br><span> a2_name: WITH_MANUALS</span><br><span> a2: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (INSTR == "--with-sse" && WITH_MANUALS == "1")</span><br><span> cmd: 'ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'</span><br><span>@@ -217,11 +208,13 @@</span><br><span> </span><br><span> - pysim:</span><br><span> slave_axis: !!python/tuple [simtester]</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: false</span><br><span> cmd: './contrib/jenkins.sh'</span><br><span> </span><br><span> - osmo-ttcn3-hacks:</span><br><span> repos_url: 'https://gerrit.osmocom.org/{repos}'</span><br><span> slave_axis: !!python/tuple [ttcn3]</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: false</span><br><span> cmd: |</span><br><span> set -e</span><br><span> make deps; make clean; make compile</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index 138807e..beebf31 100644</span><br><span>--- a/jobs/master-builds.yml</span><br><span>+++ b/jobs/master-builds.yml</span><br><span>@@ -4,7 +4,7 @@</span><br><span> name: master_build</span><br><span> # following default values can be overridden by each repo</span><br><span> disabled: false</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: false</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: true</span><br><span> node: 'osmocom-master-debian8'</span><br><span> # axes related defaults</span><br><span> slave_axis: !!python/tuple [osmocom-master-debian9]</span><br><span>@@ -165,7 +165,6 @@</span><br><span> a2: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding]</span><br><span> a3_name: IU</span><br><span> a3: !!python/tuple [--disable-iu]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> cmd: |</span><br><span> {docker_run} \</span><br><span> -e IU="$IU" \</span><br><span>@@ -173,8 +172,7 @@</span><br><span> -e MGCP="$MGCP" \</span><br><span> {docker_img} /build/contrib/jenkins.sh</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- - osmo-bsc:</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span style="color: hsl(120, 100%, 40%);">+ - osmo-bsc</span><br><span> </span><br><span> - osmo-bts:</span><br><span> a1_name: FIRMWARE_VERSION</span><br><span>@@ -193,6 +191,7 @@</span><br><span> (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && WITH_MANUALS == "0") ||</span><br><span> (FIRMWARE_VERSION == "origin/nrw/oc2g" && BTS_MODEL == "oc2g" && WITH_MANUALS == "0")</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: false</span><br><span> cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'</span><br><span> </span><br><span> - osmo-ggsn:</span><br><span>@@ -231,7 +230,6 @@</span><br><span> master-osmo-sgsn</span><br><span> </span><br><span> - osmo-mgw:</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> trigger: master-osmo-msc, master-osmo-bsc</span><br><span> </span><br><span> - osmo-msc:</span><br><span>@@ -239,7 +237,6 @@</span><br><span> a1: !!python/tuple [--enable-iu, --disable-iu]</span><br><span> a2_name: WITH_MANUALS</span><br><span> a2: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span>@@ -265,7 +262,6 @@</span><br><span> a3: !!python/tuple [sysmo, lc15, none]</span><br><span> a4_name: WITH_MANUALS</span><br><span> a4: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span> (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "0") ||</span><br><span>@@ -285,7 +281,6 @@</span><br><span> a1: !!python/tuple [--enable-iu, --disable-iu]</span><br><span> a2_name: WITH_MANUALS</span><br><span> a2: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (IU == "--enable-iu" && WITH_MANUALS == "0") ||</span><br><span> (IU == "--disable-iu" && WITH_MANUALS == "1")</span><br><span>@@ -308,7 +303,6 @@</span><br><span> a1: !!python/tuple [--with-sse]</span><br><span> a2_name: WITH_MANUALS</span><br><span> a2: !!python/tuple ["1", "0"]</span><br><span style="color: hsl(0, 100%, 40%);">- concurrent: true</span><br><span> combination_filter: ></span><br><span> (INSTR == "--with-sse" && WITH_MANUALS == "1")</span><br><span> cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh'</span><br><span>@@ -327,6 +321,7 @@</span><br><span> email: laforge@gnumonks.org steve@steve-m.de</span><br><span> </span><br><span> - sysmo-usim-tool:</span><br><span style="color: hsl(120, 100%, 40%);">+ concurrent: false</span><br><span> cmd: cd ./tests; ./run-tests</span><br><span> slave_axis: !!python/tuple [simtester]</span><br><span> git_base_url: git.sysmocom.de</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-ci/+/15585">change 15585</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-ci/+/15585"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-ci </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I5fdf759faf47ec7e4f9cb2657bd004585a667add </div>
<div style="display:none"> Gerrit-Change-Number: 15585 </div>
<div style="display:none"> Gerrit-PatchSet: 8 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>