<p>osmith has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-ci/+/15585">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gerrit, master builds: make all jobs concurrent<br><br>Now that everything runs in docker, we don't need to worry about<br>problems with running VTY/CTRL tests in parallel.<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, 6 insertions(+), 23 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/85/15585/1</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 0b05e8b..b821541 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>@@ -44,10 +44,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>@@ -71,7 +68,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>@@ -87,8 +83,7 @@</span><br><span> -e GTP="$GTP" \</span><br><span> osmocom:amd64 /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>@@ -131,16 +126,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>@@ -161,7 +153,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>@@ -186,7 +177,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>@@ -205,7 +195,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: |</span><br><span>diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml</span><br><span>index f952ac2..1604594 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: ''</span><br><span> # axes related defaults</span><br><span> slave_axis: !!python/tuple [osmocom-master-debian9]</span><br><span>@@ -162,7 +162,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>@@ -170,8 +169,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>@@ -232,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>@@ -240,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>@@ -266,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>@@ -286,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></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: 1 </div>
<div style="display:none"> Gerrit-Owner: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>