summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2020-06-04 11:31:04 -0400
committerBill Peck <bill@pecknet.com>2020-07-24 14:20:47 -0400
commit18734fd197bd2441a0024db80792f1aa2156063a (patch)
treeaa992d964710ba43d183746a90251ce98528871a
parent5ff74517a83d0cfcc64f603c0a6a7f1b85bce2bc (diff)
Update spec for RHEL-8 buildHEADmaster
Change-Id: If3a2c082fc0c3f22aecf2f44f878797a9351612a
-rw-r--r--ansible-role-dci-import-keys.spec5
-rw-r--r--molecule/default/molecule.yml5
-rw-r--r--tox.ini3
3 files changed, 9 insertions, 4 deletions
diff --git a/ansible-role-dci-import-keys.spec b/ansible-role-dci-import-keys.spec
index 34d7d08..131bbef 100644
--- a/ansible-role-dci-import-keys.spec
+++ b/ansible-role-dci-import-keys.spec
@@ -1,6 +1,6 @@
Name: ansible-role-dci-import-keys
Version: 0.0.VERS
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: ansible-role-dci-import-keys
License: ASL 2.0
URL: https://github.com/redhat-cip/ansible-role-dci-import-keys
@@ -33,5 +33,8 @@ cp -r tasks %{buildroot}%{_datadir}/dci/roles/dci-import-keys
%changelog
+* Thu Jun 04 2020 Bill Peck <bpeck@redhat.com> - 0.0.1-2
+- Rebuild for RHEL-8
+
* Wed Apr 19 2018 Cedric Lecomte <clecomte@redhat.com> - 0.0.1-1
- Initial release
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index 61028f3..dbdeeee 100644
--- a/molecule/default/molecule.yml
+++ b/molecule/default/molecule.yml
@@ -4,8 +4,8 @@ dependency:
enabled: false
driver:
name: docker
-lint:
- name: yamllint
+lint: |
+ yamllint tasks
platforms:
- name: el7
image: centos:7
@@ -13,6 +13,7 @@ platforms:
capabilities:
- SYS_ADMIN
provisioner:
+ log: true
name: ansible
connection_options:
ansible_user: centos
diff --git a/tox.ini b/tox.ini
index 46d2b9e..95fc2e5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,7 +6,7 @@ skipsdist = true
[testenv]
passenv = *
deps =
- ansible>=2.7,<2.8
+ ansible>=2.8,<2.9
docker
molecule
whitelist_externals =
@@ -15,6 +15,7 @@ whitelist_externals =
commands =
rm -rf /var/tmp/dci
git clone https://softwarefactory-project.io/r/dci-ansible /var/tmp/dci
+sitepackages = False
[testenv:py27]
commands =