From 2830cfff623254ac59468bb945330500ff25e07d Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 23 May 2019 10:48:04 +0200 Subject: [PATCH] ceph-ansible: test podman on centos instead rhel podman is available on atomic os, from upstream perspective it's better to test against this image instead a rhel8 which was a beta image outdated. Signed-off-by: Guillaume Abrioux --- .../definitions/ceph-ansible-pipeline.yml | 4 +-- .../config/definitions/ceph-ansible-prs.yml | 26 ------------------- scripts/build_utils.sh | 3 +++ 3 files changed, 5 insertions(+), 28 deletions(-) diff --git a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml index 34f538d7..5a6b18ad 100644 --- a/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml +++ b/ceph-ansible-pipeline/config/definitions/ceph-ansible-pipeline.yml @@ -80,7 +80,7 @@ current-parameters: true - name: 'ceph-ansible-prs-dev-ubuntu-container-all_daemons' current-parameters: true - - name: 'ceph-ansible-prs-dev-rhel-container-podman' + - name: 'ceph-ansible-prs-dev-centos-container-podman' current-parameters: true - name: 'ceph-ansible-prs-dev-centos-non_container-dashboard' current-parameters: true @@ -152,7 +152,7 @@ current-parameters: true - name: 'ceph-ansible-prs-nautilus-ubuntu-container-all_daemons' current-parameters: true - - name: 'ceph-ansible-prs-nautilus-rhel-container-podman' + - name: 'ceph-ansible-prs-nautilus-centos-container-podman' current-parameters: true - multijob: name: 'ceph-ansible cluster second testing phase' diff --git a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml index 1a822d90..494e6988 100644 --- a/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml +++ b/ceph-ansible-prs/config/definitions/ceph-ansible-prs.yml @@ -58,19 +58,6 @@ - container scenario: - ooo_collocation - jobs: - - 'ceph-ansible-prs-pipeline' - -- project: - name: ceph-ansible-prs-master-podman-pipeline - slave_labels: 'vagrant && libvirt && smithi' - release: - - dev - distribution: - - rhel - deployment: - - container - scenario: - podman jobs: - 'ceph-ansible-prs-pipeline' @@ -134,19 +121,6 @@ - container scenario: - ooo_collocation - jobs: - - 'ceph-ansible-prs-pipeline' - -- project: - name: ceph-ansible-prs-nautilus-podman-pipeline - slave_labels: 'vagrant && libvirt && smithi' - release: - - nautilus - distribution: - - rhel - deployment: - - container - scenario: - podman jobs: - 'ceph-ansible-prs-pipeline' diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh index c4b370fb..ba1a5dac 100644 --- a/scripts/build_utils.sh +++ b/scripts/build_utils.sh @@ -782,6 +782,9 @@ case $SCENARIO in dashboard) TOX_INI_FILE=tox-dashboard.ini ;; + podman) + TOX_INI_FILE=tox-podman.ini + ;; *) TOX_INI_FILE=tox.ini ;; -- 2.47.3