Change in ...osmo-ci[master]: gerrit, master builds: build everything in docker

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 Sep 20 09:58:06 UTC 2019


osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/15584


Change subject: gerrit, master builds: build everything in docker
......................................................................

gerrit, master builds: build everything in docker

Instead of building some projects in docker, and some directly on the
build slave, build all of them in docker.

This has several advantages:
* build environment of master builds and gerrit verifications is the
  same, therefore the same build won't pass in gerrit and then fail in
  master
* all build environments are volatile
* no more conflicts while running VTY/CTRL tests

Related: OS#3726, OS#3598
Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 59 insertions(+), 46 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/84/15584/1

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 3a74dd9..0b05e8b 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -37,7 +37,7 @@
               -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
     docker_img: 'osmocom:deb9_amd64'
-    cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+    cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
     repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/{repos}'
     gerrit_project: '{repos}'
 
@@ -47,20 +47,18 @@
 
       - cellmgr-ng:
           concurrent: true
-          cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
 
       - libasn1c
       - libgtpnl
       - libosmo-abis
       - libosmo-netif
-      - libosmo-sccp:
-          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+      - libosmo-sccp
 
       - libosmocore:
           a1_name: arch
           a1: !!python/tuple [arm-none-eabi, amd64]
           combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")'
-          cmd: './contrib/jenkins_arch.sh "$arch"'
+          cmd: '{docker_run} osmocom:amd64 /build/contrib/jenkins_arch.sh "$arch"'
 
       - libsmpp34
       - libtelnet
@@ -84,11 +82,13 @@
       - openggsn:
           a1_name: GTP
           a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux]
-          cmd: ./contrib/jenkins.sh
+          cmd: |
+            {docker_run} \
+              -e GTP="$GTP" \
+              osmocom:amd64 /build/contrib/jenkins.sh
 
       - osmo-bsc:
           concurrent: true
-          cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
 
       - osmo-bts:
           a1_name: FIRMWARE_VERSION
@@ -108,7 +108,11 @@
             (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")
-          cmd: 'ASCIIDOC_WARNINGS_CHECK="1" ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
+          cmd: |
+            {docker_run} \
+              -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              osmocom:amd64 /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
       - osmo-ggsn:
           a1_name: GTP
@@ -118,19 +122,18 @@
           combination_filter: >
             (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||
             (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")
-          cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+          cmd: |
+            {docker_run} \
+              -e GTP="$GTP" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              osmocom:amd64 /build/contrib/jenkins.sh
 
       - osmo-gsm-manuals
-
-      - osmo-hlr:
-          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
-
-      - osmo-iuh:
-          cmd: WITH_MANUALS=1 ./contrib/jenkins.sh
+      - osmo-hlr
+      - osmo-iuh
 
       - osmo-mgw:
           concurrent: true
-          cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
 
       - osmo-msc:
           a1_name: IU
@@ -193,8 +196,7 @@
               -e WITH_MANUALS="$WITH_MANUALS" \
               {docker_img} /build/contrib/jenkins.sh
 
-      - osmo-sip-connector:
-          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+      - osmo-sip-connector
 
       - osmo-trx:
           a1_name: INSTR
@@ -206,9 +208,13 @@
           concurrent: true
           combination_filter: >
             (INSTR == "--with-sse" && WITH_MANUALS == "1")
+          cmd: |
+            {docker_run} \
+              -e INSTR="$INSTR" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              osmocom:amd64 /build/contrib/jenkins.sh
 
-      - osmocom-bb:
-          cmd: WITH_MANUALS=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+      - osmocom-bb
       - osmo-tetra
       - osmo-sysmon
       - osmo-remsim
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index c56f93f..f952ac2 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -18,7 +18,7 @@
     a4: !!python/tuple [default]
     combination_filter: ''
     sequential: false
-    # most common build invocation (PUBLISH=1 is prepended to publish manual PDFs)
+    # most common build invocation (PUBLISH=1: publish manual PDFs)
     docker_run: |
             ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
             mkdir -p "$ARTIFACT_STORE"
@@ -38,7 +38,7 @@
               -v "$ARTIFACT_STORE:/artifact_store" \
               -v "$HOME/.ssh:/home/build/.ssh:ro" \
     docker_img: 'osmocom:deb9_amd64'
-    cmd: ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+    cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
     wrappers: []
     trigger:
     email: jenkins-notifications at lists.osmocom.org laforge at gnumonks.org
@@ -70,10 +70,12 @@
 
       - libosmo-dsp:
           cmd: |
-            autoreconf --install --force
-            ./configure
-            $MAKE $PARALLEL_MAKE
-            $MAKE distcheck
+            {docker_run} \
+              osmocom:amd64 sh -ex -c \
+                "autoreconf -fi; \
+                 ./configure; \
+                 $MAKE $PARALLEL_MAKE; \
+                 $MAKE distcheck"
           trigger: master-osmo-gmr
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com
 
@@ -102,13 +104,12 @@
             master-osmo-iuh,
             master-osmo-msc,
             master-osmo-sgsn
-          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - libosmocore:
           a1_name: arch
           a1: !!python/tuple [arm-none-eabi, amd64]
           combination_filter: '!(arch=="arm-none-eabi" && label=="FreeBSD_amd64")'
-          cmd: './contrib/jenkins_arch.sh "$arch"'
+          cmd: '{docker_run} osmocom:amd64 /build/contrib/jenkins_arch.sh "$arch"'
           # Full triggers would be:
           # trigger: >
           #   master-libosmo-abis, master-libosmo-netif, master-libosmo-sccp, master-openbsc,
@@ -171,7 +172,6 @@
 
       - osmo-bsc:
           concurrent: true
-          cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
 
       - osmo-bts:
           a1_name: FIRMWARE_VERSION
@@ -190,7 +190,11 @@
             (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")
-          cmd: 'PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins_bts_model.sh "$BTS_MODEL"'
+          cmd: |
+            {docker_run} \
+              -e FIRMWARE_VERSION="$FIRMWARE_VERSION" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              osmocom:amd64 /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"'
 
       - osmo-ggsn:
           a1_name: GTP
@@ -200,7 +204,11 @@
           combination_filter: >
             (GTP == "--enable-gtp-linux" && WITH_MANUALS == "0") ||
             (GTP == "--disable-gtp-linux" && WITH_MANUALS == "1")
-          cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+          cmd: |
+            {docker_run} \
+              -e GTP="$GTP" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              osmocom:amd64 /build/contrib/jenkins.sh
           trigger: master-osmo-sgsn
 
       - osmo-gmr:
@@ -208,17 +216,13 @@
 
       - osmo-gsm-manuals:
           node: 'osmocom-master-debian9'
-          cmd: |
-            ./contrib/jenkins.sh
 
       - osmo-gsm-tester:
-          cmd: PUBLISH=1 ./contrib/jenkins-build-manuals.sh
+          cmd: '{docker_run} osmocom:amd64 /build/contrib/jenkins-build-manuals.sh'
 
-      - osmo-hlr:
-          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+      - osmo-hlr
 
       - osmo-iuh:
-          cmd: WITH_MANUALS=1 PUBLISH=1 ./contrib/jenkins.sh
           # Full triggers would be:
           # trigger: master-osmo-msc, master-osmo-sgsn
           # Optimized:
@@ -229,7 +233,6 @@
 
       - osmo-mgw:
           concurrent: true
-          cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
           trigger: master-osmo-msc, master-osmo-bsc
 
       - osmo-msc:
@@ -295,7 +298,6 @@
 
       - osmo-sip-connector:
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org holger at freyther.de
-          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
 
       - osmo-tetra:
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org 246tnt at gmail.com
@@ -310,17 +312,18 @@
           concurrent: true
           combination_filter: >
             (INSTR == "--with-sse" && WITH_MANUALS == "1")
-          cmd: PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
+          cmd: |
+            {docker_run} \
+              -e INSTR="$INSTR" \
+              -e WITH_MANUALS="$WITH_MANUALS" \
+              osmocom:amd64 /build/contrib/jenkins.sh
 
-      - osmocom-bb:
-          cmd: WITH_MANUALS=1 PUBLISH=1 ASCIIDOC_WARNINGS_CHECK=1 ./contrib/jenkins.sh
-
+      - osmocom-bb
       - osmo-sysmon
       - osmo-remsim
       - osmo-asf4-dfu
       - simtrace2:
-          cmd: |
-            ./contrib/jenkins.sh --publish
+          cmd: '{docker_run} osmocom:amd64 /build/contrib/jenkins.sh --publish'
           email: gerrit-log at lists.osmocom.org laforge at gnumonks.org kredon at sysmocom.de
 
       - gapk
@@ -329,7 +332,11 @@
           email: laforge at gnumonks.org steve at steve-m.de
 
       - sysmo-usim-tool:
-          cmd: cd ./tests; ./run-tests
+          cmd: |
+            {docker_run} \
+              osmocom:amd64 sh -ex -c \
+                "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/+/15584
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: If4b7d2f9ffbc7e92699732d97a8f5829a88c5b35
Gerrit-Change-Number: 15584
Gerrit-PatchSet: 1
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20190920/e9b85b46/attachment.htm>


More information about the gerrit-log mailing list