osmith has uploaded this change for review.

View Change

jobs: osmo-e1-hardware: split into job types

Split the job, so building the software can be done with the regular
docker image instead of the fpga-build one (that doesn't have the needed
dependencies).

Related: osmo-e1-hardware I26e839de419c6eb86bf2a6250a1adf06b761d1fa
Change-Id: I90fbe72c722e491f41b9607d1a6389964d7e43b4
---
M jobs/gerrit-verifications.yml
M jobs/master-builds.yml
2 files changed, 28 insertions(+), 4 deletions(-)

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

diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml
index 9db1ebc..cc42a8e 100644
--- a/jobs/gerrit-verifications.yml
+++ b/jobs/gerrit-verifications.yml
@@ -165,8 +165,20 @@
           cmd: '{docker_run} {docker_img_erlang} {timeout_cmd} /build/contrib/jenkins.sh'
 
       - osmo-e1-hardware:
-          docker_img: 'registry.osmocom.org/$USER/fpga-build'
-          cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh'
+          a2_name: JOB_TYPE
+          a2: !!python/tuple ["firmware", "gateware", "manuals", "software"]
+          cmd: |
+            DOCKER_IMG="{docker_img}"
+            case "$JOB_TYPE" in
+            firmware|gateware|manuals)
+              DOCKER_IMG="registry.osmocom.org/$USER/fpga-build"
+              docker pull "$DOCKER_IMG"
+              ;;
+            esac
+            {docker_run} \
+              -e JOB_TYPE="$JOB_TYPE" \
+              "$DOCKER_IMG" \
+                {timeout_cmd} /build/contrib/jenkins.sh
           pipeline_binpkgs: false
 
       - osmo-ci:
diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml
index 86519f7..eb186bf 100644
--- a/jobs/master-builds.yml
+++ b/jobs/master-builds.yml
@@ -236,8 +236,20 @@
               {docker_img} {timeout_cmd} /build/contrib/jenkins_bts_model.sh "$BTS_MODEL"
 
       - osmo-e1-hardware:
-          docker_img: 'registry.osmocom.org/$USER/fpga-build'
-          cmd: 'docker pull {docker_img} && {docker_run} {docker_img} {timeout_cmd} /build/contrib/jenkins.sh --publish'
+          a2_name: JOB_TYPE
+          a2: !!python/tuple ["firmware", "gateware", "manuals", "software"]
+          cmd: |
+            DOCKER_IMG="{docker_img}"
+            case "$JOB_TYPE" in
+            firmware|gateware|manuals)
+              DOCKER_IMG="registry.osmocom.org/$USER/fpga-build"
+              docker pull "$DOCKER_IMG"
+              ;;
+            esac
+            {docker_run} \
+              -e JOB_TYPE="$JOB_TYPE" \
+              "$DOCKER_IMG" \
+                {timeout_cmd} /build/contrib/jenkins.sh --publish
       - ice40-usbtrace:
           git_base_url: https://gitea.osmocom.org/electronics
           docker_img: 'registry.osmocom.org/$USER/fpga-build'

To view, visit change 29978. To unsubscribe, or for help writing mail filters, visit settings.