This is merely a historical archive of years 2008-2021, before the migration to mailman3.
A maintained and still updated list archive can be found at https://lists.osmocom.org/hyperkitty/list/gerrit-log@lists.osmocom.org/.
osmith gerrit-no-reply at lists.osmocom.orgosmith has uploaded this change for review. ( https://gerrit.osmocom.org/12045 Change subject: gerrit-verifications/master-builds: with_manuals ...................................................................... gerrit-verifications/master-builds: with_manuals Add a new "with_manuals" axis to all jobs generated by gerrit-verifications.yml and master-builds.yml, which already have at least one axis. Adjust the combination filters, so the manuals are generated (and published) only once. The contrib/jenkins.sh scripts will be adjusted to append --enable-manuals to the configure options, when with_manuals is set. For all jobs that do not have any axes, we can always append this flag. Two different methods of passing through the configure flags are used in both yml files already. One is creating a "with_var" variable with True and False as arguments. The other is creating a "VAR" variable with "--enable-foo" and "--disable-foo" as values. I decided to use the "with_var" approach, so we could use it to activate multiple configure options at once: --enable-manuals and --enable-man when the UNIX man pages feature gets implemented (OS#3386). Related: OS#3385 Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 86 insertions(+), 30 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/45/12045/1 diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 71a0904..a4ee878 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -90,22 +90,29 @@ a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, litecell15, oc2g, oc2g-next] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15, oc2g] + a3_name: with_manuals + a3: !!python/tuple [True, False] combination_filter: > - FIRMWARE_VERSION == "master" || - (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g") || - (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g") + (FIRMWARE_VERSION == "master" && with_manuals == True) || + (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && with_manuals == False) || + (FIRMWARE_VERSION == "litecell15" && BTS_MODEL == "lc15" && with_manuals == False) || + (FIRMWARE_VERSION == "oc2g" && BTS_MODEL == "oc2g" && with_manuals == False) || + (FIRMWARE_VERSION == "oc2g-next" && BTS_MODEL == "oc2g" && with_manuals == False) cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL"' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] + a2_name: with_manuals + a2: !!python/tuple [True, False] + combination_filter: > + (GTP == "--enable-gtp-linux" && with_manuals == True) || + (GTP == "--disable-gtp-linux" && with_manuals == False) cmd: GTP="$GTP" ./contrib/jenkins.sh - osmo-gsm-manuals @@ -117,7 +124,12 @@ - osmo-mgw: a1_name: MGCP a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (MGCP == "--enable-mgcp-transcoding" && with_manuals == True) || + (MGCP == "--disable-mgcp-transcoding" && with_manuals == False) 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" \ @@ -128,7 +140,12 @@ - osmo-msc: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" @@ -149,13 +166,15 @@ a2: !!python/tuple [True, False] a3_name: with_dsp a3: !!python/tuple [sysmo, lc15, none] + a4_name: with_manuals + a4: !!python/tuple [True, False] sequential: true combination_filter: > - (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && with_manuals == True) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && with_manuals == False) || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && with_manuals == False) || - osmo-python-tests: repos_url: 'ssh://jenkins@gerrit.osmocom.org:29418/python/{repos}' @@ -164,7 +183,12 @@ - osmo-sgsn: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) 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" \ @@ -176,10 +200,14 @@ - osmo-trx: a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 + # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (INSTR == "--with-sse" && with_manuals == True) - osmocom-bb - osmo-tetra diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 67a9b80..729211e 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -182,20 +182,27 @@ a1: !!python/tuple [master, femtobts_v2.7, superfemto_v2.4, superfemto_v3.0.1pre, superfemto_v3.1, superfemto_v5.1, v2017.01, origin/nrw/litecell15] a2_name: BTS_MODEL a2: !!python/tuple [sysmo, oct, trx, oct+trx, lc15] + a3_name: with_manuals + a3: !!python/tuple [True, False] combination_filter: > - FIRMWARE_VERSION == "master" || - (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo") || - (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15") || - (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15") + (FIRMWARE_VERSION == "master" && with_manuals == True) || + (FIRMWARE_VERSION == "femtobts_v2.7" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v2.4" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.0.1pre" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v3.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "superfemto_v5.1" && BTS_MODEL == "sysmo" && with_manuals == False) || + (FIRMWARE_VERSION == "v2017.01" && BTS_MODEL == "lc15" && with_manuals == False) || + (FIRMWARE_VERSION == "origin/nrw/litecell15" && BTS_MODEL == "lc15" && with_manuals == False) cmd: './contrib/jenkins_bts_model.sh "$BTS_MODEL" --publish' - osmo-ggsn: a1_name: GTP a1: !!python/tuple [--enable-gtp-linux,--disable-gtp-linux] + a2_name: with_manuals + a2: !!python/tuple [True, False] + combination_filter: > + (GTP == "--enable-gtp-linux" && with_manuals == True) || + (GTP == "--disable-gtp-linux" && with_manuals == False) cmd: GTP="$GTP" ./contrib/jenkins.sh --publish trigger: master-osmo-sgsn @@ -223,7 +230,12 @@ - osmo-mgw: a1_name: MGCP a1: !!python/tuple [--enable-mgcp-transcoding, --disable-mgcp-transcoding] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (MGCP == "--enable-mgcp-transcoding" && with_manuals == True) || + (MGCP == "--disable-mgcp-transcoding" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines docker run --rm=true \ @@ -241,7 +253,12 @@ - osmo-msc: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines ARTIFACT_STORE="$HOME/jenkins_build_artifact_store" @@ -274,19 +291,26 @@ a2: !!python/tuple [True, False] a3_name: with_dsp a3: !!python/tuple [sysmo, lc15, none] + a4_name: with_manuals + a4: !!python/tuple [True, False] sequential: true combination_filter: > - (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01") || - (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15") || - (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master") + (with_vty == "True" && with_dsp == "sysmo" && FIRMWARE_VERSION=="master" && with_manuals == True) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="master" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="v2017.01" && with_manuals == False) || + (with_vty == "True" && with_dsp == "lc15" && FIRMWARE_VERSION=="origin/nrw/litecell15" && with_manuals == False) || + (with_vty == "False" && with_dsp == "none" && FIRMWARE_VERSION=="master" && with_manuals == False) cmd: ./contrib/jenkins.sh --publish - osmo-sgsn: a1_name: IU a1: !!python/tuple [--enable-iu, --disable-iu] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (IU == "--enable-iu" && with_manuals == True) || + (IU == "--disable-iu" && with_manuals == False) cmd: > # keep first line with less indent to preserve newlines docker run --rm=true \ @@ -309,10 +333,14 @@ - osmo-trx: a1_name: INSTR - # ARM variants temporarily disabled due to issue OS#3061 + # ARM variants temporarily disabled due to issue OS#3061 (mind the combination_filter below!) # a1: !!python/tuple [--with-sse, --with-neon, --with-neon-vfpv4] a1: !!python/tuple [--with-sse] + a2_name: with_manuals + a2: !!python/tuple [True, False] concurrent: true + combination_filter: > + (INSTR == "--with-sse" && with_manuals == True) cmd: ./contrib/jenkins.sh --publish - osmocom-bb -- To view, visit https://gerrit.osmocom.org/12045 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0643b17a6be6e86e281b50d78dd7a6858cf99ee Gerrit-Change-Number: 12045 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith at sysmocom.de> -------------- next part -------------- An HTML attachment was scrubbed... URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20181130/5135d4b8/attachment.htm>