From 163eef27de017856aef3208122e1cf7f3e59313f Mon Sep 17 00:00:00 2001
From: Neels Hofmeyr <neels@hofmeyr.de>
Date: Fri, 15 Dec 2017 19:30:30 +0100
Subject: [PATCH] jobs: cosmetic: readability: docker one-arg-per-line

Change-Id: I8b18a5bc54a879002b40b0fc51cd295e82beba4f
---
 jobs/master-builds.yml | 72 +++++++++++++++++++++++++++++++-----------
 1 file changed, 53 insertions(+), 19 deletions(-)

diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 05fcb00e..16e2a7cd 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -85,21 +85,36 @@
            # keep first line with less indent to preserve newlines
             ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
             mkdir -p "$ARTIFACT_STORE"
-            docker run --rm=true -e HOME=/build -e ARTIFACT_STORE=/artifact_store \
-              -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e IU="$IU" -e SMPP="$SMPP" -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" \
-              -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build -v "$PWD:/build" \
-              -v "$HOME/bin:/build_bin" -v "$ARTIFACT_STORE:/artifact_store" \
+            docker run --rm=true \
+              -e HOME=/build \
+              -e ARTIFACT_STORE=/artifact_store \
+              -e JOB_NAME="$JOB_NAME" \
+              -e MAKE=make \
+              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+              -e IU="$IU" \
+              -e SMPP="$SMPP" \
+              -e MGCP="$MGCP" \
+              -e PATH="$PATH:/build_bin" \
+              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -w /build -i -u build \
+              -v "$PWD:/build" \
+              -v "$HOME/bin:/build_bin" \
+              -v "$ARTIFACT_STORE:/artifact_store" \
               osmocom:amd64 /build/contrib/jenkins.sh
 
       - osmo-bsc:
           concurrent: true
           cmd: >
            # keep first line with less indent to preserve newlines
-            docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-            -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build -i -u build \
-            -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
-            osmocom:amd64 /build/contrib/jenkins.sh
+            docker run --rm=true \
+              -e HOME=/build \
+              -e MAKE=make \
+              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+              -e PATH="$PATH:/build_bin" \
+              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -w /build -i -u build \
+              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
+              osmocom:amd64 /build/contrib/jenkins.sh
 
       - osmo-bts:
           a1_name: FIRMWARE_VERSION
@@ -152,9 +167,15 @@
           concurrent: true
           cmd: >
            # keep first line with less indent to preserve newlines
-            docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e MGCP="$MGCP" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \
-              -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
+            docker run --rm=true \
+              -e HOME=/build \
+              -e MAKE=make \
+              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+              -e MGCP="$MGCP" \
+              -e PATH="$PATH:/build_bin" \
+              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -w /build -i -u build \
+              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               osmocom:amd64 /build/contrib/jenkins.sh
           trigger: master-osmo-msc, master-osmo-bsc
 
@@ -166,10 +187,17 @@
            # keep first line with less indent to preserve newlines
             ARTIFACT_STORE="$HOME/jenkins_build_artifact_store"
             mkdir -p "$ARTIFACT_STORE"
-            docker run --rm=true -i -e HOME=/build -e ARTIFACT_STORE=/artifact_store \
-              -e JOB_NAME="$JOB_NAME" -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
-              -w /build -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
+            docker run --rm=true -i \
+              -e HOME=/build \
+              -e ARTIFACT_STORE=/artifact_store \
+              -e JOB_NAME="$JOB_NAME" \
+              -e MAKE=make \
+              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+              -e IU="$IU" \
+              -e PATH="$PATH:/build_bin" \
+              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -w /build -u build \
+              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               -v "$ARTIFACT_STORE:/artifact_store" \
               osmocom:amd64 /build/contrib/jenkins.sh
 
@@ -201,9 +229,15 @@
           concurrent: true
           cmd: >
            # keep first line with less indent to preserve newlines
-            docker run --rm=true -e HOME=/build -e MAKE=make -e PARALLEL_MAKE="$PARALLEL_MAKE" \
-              -e IU="$IU" -e PATH="$PATH:/build_bin" -e OSMOPY_DEBUG_TCP_SOCKETS="1" -w /build \
-              -i -u build -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
+            docker run --rm=true \
+              -e HOME=/build \
+              -e MAKE=make \
+              -e PARALLEL_MAKE="$PARALLEL_MAKE" \
+              -e IU="$IU" \
+              -e PATH="$PATH:/build_bin" \
+              -e OSMOPY_DEBUG_TCP_SOCKETS="1" \
+              -w /build -i -u build \
+              -v "$PWD:/build" -v "$HOME/bin:/build_bin" \
               osmocom:amd64 /build/contrib/jenkins.sh
 
       - osmo-sip-connector