Change in osmo-ci[master]: gerrit-verification: fix erlang cmd

[laforge]

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/16904 )

Change subject: gerrit-verification: fix erlang cmd
......................................................................

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
---
M jobs/gerrit-verifications.yml
1 file changed, 3 insertions(+), 4 deletions(-)

Approvals:
  laforge: Looks good to me, approved
  osmith: Verified



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}'

-- 
To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/16904
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: osmo-ci
Gerrit-Branch: master
Gerrit-Change-Id: I6e121c79ecf872a7058de3a6dc0a940fa8091f68
Gerrit-Change-Number: 16904
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <osmith at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: osmith <osmith at sysmocom.de>
Gerrit-MessageType: merged
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200117/a2c3e176/attachment.htm>