summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBill Peck <bill@pecknet.com>2020-06-04 13:18:07 -0400
committerBill Peck <bill@pecknet.com>2020-07-24 15:40:39 -0400
commit69a6ef71326899d7f34eb63988ce3d794fa57701 (patch)
tree26b98c37e91920457d7c2d1b4ea3cf0b3dfe45cf
parentc890627c7e8eac998060c56299201df80e5c5525 (diff)
Update spec for RHEL-8 build
Change-Id: Ibb7540791ec538d3acdfb846ed3571eac78ac9a7
-rw-r--r--ansible-role-dci-sync-registry.spec10
-rw-r--r--molecule/default/molecule.yml12
-rw-r--r--tox.ini3
3 files changed, 21 insertions, 4 deletions
diff --git a/ansible-role-dci-sync-registry.spec b/ansible-role-dci-sync-registry.spec
index fc5df9d..02fe3cb 100644
--- a/ansible-role-dci-sync-registry.spec
+++ b/ansible-role-dci-sync-registry.spec
@@ -1,6 +1,6 @@
Name: ansible-role-dci-sync-registry
Version: 0.0.VERS
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: ansible-role-dci-sync-registry
License: ASL 2.0
URL: https://github.com/redhat-cip/ansible-role-dci-sync-registry
@@ -8,6 +8,7 @@ Source0: ansible-role-dci-sync-registry-%{version}.tar.gz
BuildArch: noarch
Requires: ansible
+BuildRequires: /usr/bin/pathfix.py
%description
An Ansible role that sync DCI registry
@@ -28,6 +29,11 @@ cp -r tasks %{buildroot}%{_datadir}/dci/roles/dci-sync-registry
cp -r templates %{buildroot}%{_datadir}/dci/roles/dci-sync-registry
cp -r handlers %{buildroot}%{_datadir}/dci/roles/dci-sync-registry
+%if 0%{?rhel} && 0%{?rhel} < 8
+pathfix.py -pni "%{__python2}" %{buildroot}%{_datadir}/dci/roles/dci-sync-registry/files/fetch_images.py
+%else
+pathfix.py -pni "%{__python3}" %{buildroot}%{_datadir}/dci/roles/dci-sync-registry/files/fetch_images.py
+%endif
%files
%doc README.md
@@ -36,5 +42,7 @@ cp -r handlers %{buildroot}%{_datadir}/dci/roles/dci-sync-registry
%changelog
+* Thu Jun 04 2020 Bill Peck <bpeck@rehdat.com> - 0.0.1-2
+- Rebuild for RHEL-8
* Thu Nov 13 2018 Dimitri Savineau <dsavinea@redhat.com> - 0.0.1-1
- Initial release
diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
index e9d07e1..0bac0b4 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/systemd:latest
@@ -19,6 +19,14 @@ provisioner:
name: ansible-lint
scenario:
name: default
+ test_sequence:
+ - lint
+ - destroy
+ - dependency
+ - syntax
+ - create
+ - prepare
+ - destroy
verifier:
name: testinfra
options:
diff --git a/tox.ini b/tox.ini
index c02fb74..0cab257 100644
--- a/tox.ini
+++ b/tox.ini
@@ -6,9 +6,10 @@ skipsdist = true
[testenv]
passenv = *
deps =
- ansible>=2.7,<2.8
+ ansible>=2.8,<2.9
docker
molecule
+sitepackages = False
[testenv:py27]
commands =