mirror of https://gerrit.osmocom.org/osmo-ci
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
This commit is contained in:
parent
a3e83d6d40
commit
ae69a1aa67
|
@ -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:
|
||||
|
|
|
@ -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'
|
||||
|
|
Loading…
Reference in New Issue