diff options
| author | Oliver Smith <osmith@sysmocom.de> | 2018-11-30 15:15:16 +0100 |
|---|---|---|
| committer | Oliver Smith <osmith@sysmocom.de> | 2018-11-30 15:15:16 +0100 |
| commit | 03d5f4c71c5c9297243096377bb3a2120d156db9 (patch) | |
| tree | a87a7f36769ccf31efbed6ad64c3614899415e33 | |
| parent | ffb3fa6286b29b0b7056f3c33de9e7c5ddc892f5 (diff) | |
cosmetic: gerrit-verifications: format docker cmd
Format the docker command lines just like they are formatted in
master-builds.yml. Most notably, this puts every environment variable on
its own line. This makes it much easier to compare both files side by
side.
Change-Id: I0adcb028be24c2e05189c15b85811777d6287387
| -rw-r--r-- | jobs/gerrit-verifications.yml | 83 |
1 files changed, 61 insertions, 22 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 71a0904..e70d28e 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -32,9 +32,14 @@ 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" -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 PATH="$PATH:/build_bin" \ + -w /build -i -u build \ + -v "$PWD:/build" \ + -v "$HOME/bin:/build_bin" \ osmocom:amd64 /build/contrib/jenkins.sh - libasn1c @@ -64,11 +69,21 @@ # 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 - openggsn: @@ -80,10 +95,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 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 @@ -120,9 +140,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 - osmo-msc: @@ -133,10 +159,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 @@ -167,9 +200,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 |