summaryrefslogtreecommitdiffstats
path: root/jobs
diff options
context:
space:
mode:
authorOliver Smith <osmith@sysmocom.de>2020-01-17 08:48:54 +0100
committerlaforge <laforge@osmocom.org>2020-01-17 15:03:08 +0000
commit2c13d633ec9d4d12766a5cc04ac24fced5f1048d (patch)
tree513082a128ce3d8c515e1d87b16f6f18c87da5f5 /jobs
parent5434eb477f71d0314521e91ee860983582919585 (diff)
gerrit-verification: fix erlang cmd
Jenkins job builder only does one pass of variable substitution. Replace the cmd_erlang variable with its contents, so the jobs don't fail with: [osmocom-gerrit-debian9] $ /bin/sh -xe /tmp/jenkins7189809471369692535.sh + {docker_run} {docker_img_erlang} /build/contrib/jenkins.sh /tmp/jenkins7189809471369692535.sh: 2: /tmp/jenkins7189809471369692535.sh: {docker_run}: not found Fixes: aadc60f4037dcf9529a30d362648b0f0849825c2 ("jobs/gerrit-verifications.yml: add erlang repos") Related: OS#4345 Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68
Diffstat (limited to 'jobs')
-rw-r--r--jobs/gerrit-verifications.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 8846e31..5703bf8 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -43,7 +43,6 @@
docker_img: '$USER/debian-stretch-jenkins'
docker_img_erlang: '$USER/debian-buster-erlang'
cmd: '{docker_run} {docker_img} /build/contrib/jenkins.sh'
- cmd_erlang: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
gerrit_url: 'ssh://jenkins@gerrit.osmocom.org:29418'
repos_url: '{gerrit_url}/{repos}'
gerrit_project: '{repos}'
@@ -114,7 +113,7 @@
- osmo_dia2gsup:
repos_url: '{gerrit_url}/erlang/{repos}'
gerrit_project: 'erlang/{repos}'
- cmd: '{cmd_erlang}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
- osmo-ggsn:
a1_name: GTP
@@ -135,7 +134,7 @@
- osmo_gsup:
repos_url: '{gerrit_url}/erlang/{repos}'
gerrit_project: 'erlang/{repos}'
- cmd: '{cmd_erlang}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
- osmo-hlr
- osmo-iuh
@@ -232,7 +231,7 @@
- ss7:
repos_url: '{gerrit_url}/erlang/{repos}'
gerrit_project: 'erlang/{repos}'
- cmd: '{cmd_erlang}'
+ cmd: '{docker_run} {docker_img_erlang} /build/contrib/jenkins.sh'
- osmo-ttcn3-hacks:
repos_url: 'https://gerrit.osmocom.org/{repos}'