Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix rpm build #987

Merged
merged 1 commit into from Feb 8, 2022
Merged

Fix rpm build #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ GIT_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
ANSIBLE_BRANCH ?=
ANSIBLE_VERSIONS ?= stable-2.9 stable-2.10 stable-2.11
PIP_NAME = ansible_runner
VERSION := $(shell python setup.py --version)
VERSION := $(shell $(PYTHON) setup.py --version)
ifeq ($(OFFICIAL),yes)
RELEASE ?= 1
else
Expand Down
2 changes: 2 additions & 0 deletions packaging/rpm/Dockerfile.epel-8-x86_64
View file
Open in desktop
Expand Up @@ -4,3 +4,5 @@ RUN dnf install -y epel-release
RUN yum install -y make mock python3-pip which git gcc python3-devel
RUN pip3 install -IU pip>=21.0.1
RUN pip3 install -IU ansible

RUN sed -i 's/release=8/release=8-stream/g' /etc/mock/templates/centos-8.tpl
2 changes: 2 additions & 0 deletions packaging/rpm/ansible-runner.spec.j2
View file
Open in desktop
Expand Up @@ -30,6 +30,7 @@ Requires: python2-%{pypi_name} = %{version}-%{release}

%if %{with python3}
BuildRequires: python3-devel
BuildRequires: python3-pbr
BuildRequires: python3-setuptools
Requires: python3-%{pypi_name} = %{version}-%{release}
%endif
Expand Down Expand Up @@ -125,6 +126,7 @@ ln -s %{_bindir}/ansible-runner-%{python2_version} %{buildroot}/%{_bindir}/ansib
%{_bindir}/ansible-runner
%{_bindir}/ansible-runner-3
%{_bindir}/ansible-runner-%{python3_version}
%{_datadir}/ansible-runner/*
%endif

%changelog
Expand Down
2 changes: 1 addition & 1 deletion packaging/rpm/docker-compose.yml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ services:
context: .
image: runner-rpm-builder:${MOCK_CONFIG}
environment:
MOCK_BIN: "mock --old-chroot"
MOCK_BIN: "mock --isolation=simple"
MOCK_CONFIG:
RELEASE:
OFFICIAL:
Expand Down