ceph-ansible: remove ubuntu distribution

This commit removes the ubuntu distribution testing from the ceph-ansible
jobs for both PRs and nightly configuration.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
index 93d7100d7836997a0ce92ff4e6515abc4be589dd..9abc4fe2bb59d6a368ad68efb8017628f1e892c9 100644 (file)
--- a/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
+++ b/ceph-ansible-nightly/config/definitions/ceph-ansible-nightly.yml
@@ -4,7 +4,6 @@
       - luminous
     distribution:
       - centos
-      - ubuntu
     deployment:
       - container
       - non_container

diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
index 02de5abdbcb5caa6375e653c34f818d4022a3778..96a121cb2373fd02b2f3cf9a05a0a386c9c8bae8 100644 (file)
--- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
+++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml
@@ -289,101 +289,3 @@
           artifacts: 'logs/**'
           allow-empty: true
           latest-only: false
-
-- job-template:
-    name: 'ceph-ansible-prs-{distribution}-{deployment}-{scenario}'
-    id: 'ceph-ansible-prs-ubuntu-trigger'
-    node: '{slave_labels}'
-    concurrent: true
-    defaults: global
-    display-name: 'ceph-ansible: Pull Requests [{distribution}-{deployment}-{scenario}]'
-    quiet-period: 5
-    block-downstream: false
-    block-upstream: false
-    retry-count: 3
-    properties:
-      - github:
-          url: https://github.com/ceph/ceph-ansible
-      - build-discarder:
-          days-to-keep: 90
-          num-to-keep: -1
-          artifact-days-to-keep: -1
-          artifact-num-to-keep: -1
-
-    parameters:
-      - string:
-          name: sha1
-          description: "A pull request ID, like 'origin/pr/72/head'"
-
-    triggers:
-      - github-pull-request:
-          cancel-builds-on-update: true
-          allow-whitelist-orgs-as-admins: true
-          org-list:
-            - ceph
-          skip-build-phrase: '^jenkins do not test.*|.*\[skip ci\].*'
-          trigger-phrase: '^jenkins test {distribution}-{deployment}-{scenario}|jenkins test all.*'
-          only-trigger-phrase: true
-          github-hooks: true
-          permit-all: true
-          auto-close-on-fail: false
-          status-context: "Testing: {distribution}-{deployment}-{scenario}"
-          started-status: "Running: {distribution}-{deployment}-{scenario}"
-          success-status: "OK - {distribution}-{deployment}-{scenario}"
-          failure-status: "FAIL - {distribution}-{deployment}-{scenario}"
-
-    scm:
-      - git:
-          url: https://github.com/ceph/ceph-ansible.git
-          branches:
-            - ${{sha1}}
-          refspec: +refs/pull/*:refs/remotes/origin/pr/*
-          browser: auto
-          timeout: 20
-          skip-tag: true
-          wipe-workspace: false
-
-    builders:
-      - inject:
-          properties-content: |
-            DISTRIBUTION={distribution}
-            DEPLOYMENT={deployment}
-            SCENARIO={scenario}
-      - conditional-step:
-          condition-kind: shell
-          condition-command: |
-            #!/bin/bash
-            # Returns 1 if only .rst and README files were modified
-            echo "Checking if only rst and READMEs were modified"
-            git show HEAD | grep -qo ^Merge:
-            if [ $? -eq 0 ]; then
-              git diff --name-only $(git show HEAD | grep ^Merge: | cut -d ':' -f2) | grep -v '\.rst\|README'
-              if [ $? -eq 1 ]; then
-                echo "Only docs were modified.  Skipping the rest of the job."
-                exit 1
-              fi
-            fi
-          on-evaluation-failure: dont-run
-          steps:
-            - shell:
-                !include-raw-escape:
-                  - ../../../scripts/build_utils.sh
-                  - ../../build/build
-
-    publishers:
-      - postbuildscript:
-          builders:
-            - role: SLAVE
-              build-on:
-                  - FAILURE
-                  - ABORTED
-              build-steps:
-                - shell:
-                    !include-raw-escape:
-                      - ../../../scripts/build_utils.sh
-                      - ../../build/teardown
-
-      - archive:
-          artifacts: 'logs/**'
-          allow-empty: true
-          latest-only: false