From 321de1c86755c13456ede87dbfd70be67e1534d0 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Tue, 29 May 2018 11:03:27 -0400 Subject: [PATCH] Temporarily openshift_pkg_version against 3.7 It's complaining that we're installing 3.7 while 3.9 is available. We'll upgrade to 3.9 eventually but for the time we need to explicitely pin the package version so it doesn't warn us about it. Also install openssl which is apparently no longer installed by default. Change-Id: Iecd677c18c186f15caeffb1c07742287f6febb0b --- group_vars/OSEv3.yml | 2 ++ run_tests.sh | 2 ++ tox.ini | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/group_vars/OSEv3.yml b/group_vars/OSEv3.yml index 07ab6e3..8d72661 100644 --- a/group_vars/OSEv3.yml +++ b/group_vars/OSEv3.yml @@ -13,6 +13,8 @@ openshift_node_sdn_mtu: 1400 openshift_deployment_type: origin deployment_subtype: registry openshift_release: v3.7 +# The dash prefix is on purpose, the matching is weird, see https://github.com/openshift/openshift-ansible/issues/8191 +openshift_pkg_version: -3.7.2-1.el7.git.0.cd74924 # openshift_image_tag: v3.7.0 # openshift_repos_enable_testing: true diff --git a/run_tests.sh b/run_tests.sh index 5d92121..762401a 100755 --- a/run_tests.sh +++ b/run_tests.sh @@ -60,6 +60,8 @@ function ko() { set -e } +# Install required packages +sudo yum install -y openssl # Generate the local SSL certificates sudo ./mock-certs.sh diff --git a/tox.ini b/tox.ini index 70ebca1..52fa484 100644 --- a/tox.ini +++ b/tox.ini @@ -23,7 +23,7 @@ whitelist_externals = bash [testenv:ansible-playbook] commands = rm -rf {toxinidir}/openshift-ansible - bash -c "git clone https://github.com/dmsimard/openshift-ansible; pushd openshift-ansible; git checkout rdo-test; popd" + bash -c "git clone https://github.com/dmsimard/openshift-ansible; pushd openshift-ansible; git checkout rdo-3.7; popd" pip install -r {toxinidir}/openshift-ansible/requirements.txt ansible-playbook {posargs} rm -rf {toxinidir}/openshift-ansible