Skip to content

Commit

Permalink
Temporarily openshift_pkg_version against 3.7
Browse files Browse the repository at this point in the history
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
  • Loading branch information
David Moreau Simard authored and David Moreau Simard committed May 29, 2018
1 parent d8795d1 commit 321de1c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
2 changes: 2 additions & 0 deletions group_vars/OSEv3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 2 additions & 0 deletions run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 321de1c

Please sign in to comment.