ceph-dev-*-trigger: stop building master on bionic

in short, we don't need to test on bionic anymore for couple reasons:

- for accessing newer GCC
- for accessing more packages

see the discussion at
https://lists.ceph.io/hyperkitty/list/dev@ceph.io/thread/BW5NKQ4KTOPV7OYUBUHVDVCSH72LVIEO/

the only qa suite referencing ubuntu 18.04 is the qa/suites/orch/rook/smoke,
but it deploys ceph using Rook, and the container image of Ceph is
based on CentOS, so stop building on ubuntu/bionic does not
break it, despite the fact that 18.04 is included by
qa/suites/orch/rook/smoke/0-distro.

Signed-off-by: Kefu Chai <kchai@redhat.com>

diff --git a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
index b02e462764c3f072d07b4709cf72fc40ad2bb786..09677d0ad6050cd7c755d281dfc07c0e54e719bd 100644 (file)
--- a/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
+++ b/ceph-dev-new-trigger/config/definitions/ceph-dev-new-trigger.yml
@@ -126,7 +126,7 @@
                     DISTROS=centos8
                     FLAVOR=crimson
                     ARCHS=x86_64
-      # If no release name is found in branch, build on all possible distro/flavor combos (except xenial).
+      # If no release name is found in branch, build on all possible distro/flavor combos (except xenial and bionic).
       # regex matching and 'on-evaluation-failure: run' doesn't work here so triple negative it is.
       - conditional-step:
           condition-kind: shell
@@ -143,7 +143,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos8 windows
+                    DISTROS=focal centos8 windows
             - trigger-builds:
                 - project: 'ceph-dev-new'
                   predefined-parameters: |

diff --git a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
index 2ab29e26e48426b4343a62f489bca8007b52ed75..86773d025b5f8d5cca03adda63d56500db4537b0 100644 (file)
--- a/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
+++ b/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml
@@ -101,7 +101,7 @@
                     DISTROS=centos8
                     FLAVOR=crimson
       # build master on:
-      # default: focal bionic centos8 leap15
+      # default: focal centos8 leap15
       # crimson: centos8
       - conditional-step:
           condition-kind: regex-match
@@ -118,7 +118,7 @@
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}
                     FORCE=True
-                    DISTROS=focal bionic centos8
+                    DISTROS=focal centos8
                 - project: 'ceph-dev'
                   predefined-parameters: |
                     BRANCH=${GIT_BRANCH}