summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2019-09-18 10:31:13 +0200
committerOliver Smith <osmith@sysmocom.de>2019-09-19 10:48:18 +0200
commit5ca12a8359397aa31e68c697e18dc1db8827838f (patch)
tree1f4c4bd0f3db2af9138eee4d6a8940e3d7942e40
parentd3a5d51e47ecce419d8aa08d446205b7f0c06276 (diff)
gerrit, master builds: concurrent OsmoPCU builds
Re-enable concurrent builds for OsmoPCU, and run all builds in docker. This should prevent previous problems with VTY/CTRL test collisions, which lead to the concurrent builds being disabled in I23d5b75825a667e4f043d16a12b841cd8f01af5e. Related: OS#4204 Change-Id: I4f90a601e41dca18a6fcbab56bdf5663167d2353
-rw-r--r--jobs/gerrit-verifications.yml16
-rw-r--r--jobs/master-builds.yml20
2 files changed, 33 insertions, 3 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index abd8090..c5aae68 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -200,7 +200,7 @@
a3: !!python/tuple [sysmo, lc15, oc2g, none]
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
- sequential: true
+ 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") ||
@@ -208,6 +208,20 @@
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="litecell15" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "oc2g" && FIRMWARE_VERSION=="oc2g" && WITH_MANUALS == "0") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
+ cmd: |
+ docker run --rm=true \
+ -e HOME=/build \
+ -e MAKE=make \
+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+ -e with_vty="$with_vty" \
+ -e with_dsp="$with_dsp" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ -e PATH="$PATH:/build_bin" \
+ -w /build -i -u build \
+ -v "$PWD:/build" \
+ -v "$HOME/bin:/build_bin" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- osmo-python-tests:
repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}'
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index ed180a4..9374391 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -302,14 +302,30 @@
a3: !!python/tuple [sysmo, lc15, none]
a4_name: WITH_MANUALS
a4: !!python/tuple ["1", "0"]
- sequential: true
+ 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") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && WITH_MANUALS == "0") ||
(with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && WITH_MANUALS == "0") ||
(with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && WITH_MANUALS == "1")
- cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+ cmd: |
+ docker run --rm=true \
+ -e HOME=/build \
+ -e MAKE=make \
+ -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+ -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+ -e with_vty="$with_vty" \
+ -e with_dsp="$with_dsp" \
+ -e WITH_MANUALS="$WITH_MANUALS" \
+ -e PATH="$PATH:/build_bin" \
+ -e PUBLISH="1" \
+ -e ASCIIDOC_WARNINGS_CHECK="1" \
+ -w /build -i -u build \
+ -v "$PWD:/build" \
+ -v "$HOME/bin:/build_bin" \
+ -v "$HOME/.ssh:/home/build/.ssh:ro" \
+ osmocom:amd64 /build/contrib/jenkins.sh
- osmo-sgsn:
a1_name: IU