From 2aecb0131c4b1394ea37e4a01fcc47db84a2c2cf Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Thu, 22 Apr 2021 12:01:31 +0300 Subject: [PATCH] Add --no-stream to all tripleo-repos in molecule jobs After --stream added as default in [1] molecule jobs fail when they don't have stream nodes. [1] https://review.opendev.org/c/openstack/tripleo-repos/+/786485 Change-Id: I3657169a3b519869f7f3594c8c6a6072a058e0c8 --- tripleo_ansible/roles/test_deps/tasks/main.yml | 2 +- .../roles/tripleo_cephadm/molecule/default/prepare.yml | 2 +- .../roles/tripleo_collectd/molecule/common/prepare.yml | 2 +- .../roles/tripleo_metrics_qdr/molecule/common/prepare.yml | 2 +- .../roles/tripleo_puppet_cache/molecule/default/prepare.yml | 2 +- .../tripleo_validations_package/molecule/default/prepare.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tripleo_ansible/roles/test_deps/tasks/main.yml b/tripleo_ansible/roles/test_deps/tasks/main.yml index 38aba3adc..755d70a7c 100644 --- a/tripleo_ansible/roles/test_deps/tasks/main.yml +++ b/tripleo_ansible/roles/test_deps/tasks/main.yml @@ -71,7 +71,7 @@ - test_deps_setup_tripleo | bool block: - name: Create tripleo repos - command: tripleo-repos -b master current-tripleo + command: tripleo-repos --no-stream -b master current-tripleo - name: Install tripleo packages package: diff --git a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/prepare.yml index 75eb4b6ce..7a6aa2884 100644 --- a/tripleo_ansible/roles/tripleo_cephadm/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_cephadm/molecule/default/prepare.yml @@ -25,7 +25,7 @@ name: openssh state: present - name: Enable ceph repsitory - command: tripleo-repos -b master current-tripleo ceph + command: tripleo-repos --no-stream -b master current-tripleo ceph become: true - name: Ensure ceph-admin group exists group: diff --git a/tripleo_ansible/roles/tripleo_collectd/molecule/common/prepare.yml b/tripleo_ansible/roles/tripleo_collectd/molecule/common/prepare.yml index 6e7d9f073..462d617b9 100644 --- a/tripleo_ansible/roles/tripleo_collectd/molecule/common/prepare.yml +++ b/tripleo_ansible/roles/tripleo_collectd/molecule/common/prepare.yml @@ -29,7 +29,7 @@ - name: "Set-up tripleo-repos" command: | - tripleo-repos -b master current-tripleo + tripleo-repos --no-stream -b master current-tripleo - name: "Install collectd plugin packages" package: diff --git a/tripleo_ansible/roles/tripleo_metrics_qdr/molecule/common/prepare.yml b/tripleo_ansible/roles/tripleo_metrics_qdr/molecule/common/prepare.yml index 42ea97edc..720e1ebb5 100644 --- a/tripleo_ansible/roles/tripleo_metrics_qdr/molecule/common/prepare.yml +++ b/tripleo_ansible/roles/tripleo_metrics_qdr/molecule/common/prepare.yml @@ -14,7 +14,7 @@ - name: "Set-up tripleo-repos" command: | - tripleo-repos -b master current-tripleo + tripleo-repos --no-stream -b master current-tripleo - name: Install Deps package: diff --git a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml index 2c1cbd781..033d61553 100644 --- a/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_puppet_cache/molecule/default/prepare.yml @@ -25,7 +25,7 @@ - role: test_deps post_tasks: - name: Create tripleo repos - command: tripleo-repos current-tripleo + command: tripleo-repos --no-stream current-tripleo become: true - name: Install required packages become: true diff --git a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml index a5b2d7a39..33c79bc98 100644 --- a/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml +++ b/tripleo_ansible/roles/tripleo_validations_package/molecule/default/prepare.yml @@ -21,5 +21,5 @@ - role: test_deps post_tasks: - name: Create tripleo repos - command: tripleo-repos current-tripleo + command: tripleo-repos --no-stream current-tripleo become: true