External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-05 10:41:05 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6772 from ansible/isolated-tower-instance-packaging

Browse Source 
Packaging updates for Isolated Instances
This commit is contained in:
Shane McDonald
2017-06-28 15:54:48 -04:00
committed by GitHub
parent 7e06acd206 4a8e8d4fbf
commit 23a0a00bd2
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -37,7 +37,7 @@ endif
GIT_DATE := $(shell git log -n 1 --format="%ai") GIT_DATE := $(shell git log -n 1 --format="%ai")
DATE := $(shell date -u +%Y%m%d%H%M) DATE := $(shell date -u +%Y%m%d%H%M)
NAME = ansible-tower NAME ?= ansible-tower
VERSION = $(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])") VERSION = $(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[0])")
GIT_REMOTE_URL = $(shell git config --get remote.origin.url) GIT_REMOTE_URL = $(shell git config --get remote.origin.url)
BUILD = 0.git$(DATE) BUILD = 0.git$(DATE)
@@ -73,6 +73,7 @@ else
SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)-$(RELEASE) SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)-$(RELEASE)
SDIST_TAR_NAME=$(NAME)-$(VERSION)-$(RELEASE) SDIST_TAR_NAME=$(NAME)-$(VERSION)-$(RELEASE)
endif endif
SDIST_COMMAND ?= sdist
SDIST_TAR_FILE=$(SDIST_TAR_NAME).tar.gz SDIST_TAR_FILE=$(SDIST_TAR_NAME).tar.gz
SETUP_TAR_FILE=$(SETUP_TAR_NAME).tar.gz SETUP_TAR_FILE=$(SETUP_TAR_NAME).tar.gz
SETUP_TAR_LINK=$(NAME)-setup-latest.tar.gz SETUP_TAR_LINK=$(NAME)-setup-latest.tar.gz
@@ -681,7 +682,7 @@ release_clean:
-(rm -rf ($RELEASE)) -(rm -rf ($RELEASE))
dist/$(SDIST_TAR_FILE): ui-release dist/$(SDIST_TAR_FILE): ui-release
BUILD="$(BUILD)" $(PYTHON) setup.py sdist BUILD="$(BUILD)" $(PYTHON) setup.py $(SDIST_COMMAND)
sdist: dist/$(SDIST_TAR_FILE) sdist: dist/$(SDIST_TAR_FILE)
@echo "#############################################" @echo "#############################################"
@@ -729,7 +730,7 @@ rpm-build/$(SDIST_TAR_FILE): rpm-build dist/$(SDIST_TAR_FILE) tar-build/$(SETUP_
cp packaging/rpm/tower.te rpm-build/ cp packaging/rpm/tower.te rpm-build/
cp packaging/rpm/tower.fc rpm-build/ cp packaging/rpm/tower.fc rpm-build/
cp packaging/rpm/$(NAME).sysconfig rpm-build/ cp packaging/rpm/ansible-tower.sysconfig rpm-build/
cp packaging/remove_tower_source.py rpm-build/ cp packaging/remove_tower_source.py rpm-build/
cp packaging/bytecompile.sh rpm-build/ cp packaging/bytecompile.sh rpm-build/
cp tar-build/$(SETUP_TAR_FILE) rpm-build/ cp tar-build/$(SETUP_TAR_FILE) rpm-build/
@@ -813,10 +814,7 @@ rpm-build/$(GPG_FILE): rpm-build
$(GPG_BIN) --export -a "${GPG_KEY}" > "$@" $(GPG_BIN) --export -a "${GPG_KEY}" > "$@"
rpm-sign: rpm-build/$(GPG_FILE) rpmtar rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm rpm-sign: rpm-build/$(GPG_FILE) rpmtar rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm
rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/$(RPM_NVR).$(RPM_ARCH).rpm rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/*.$(RPM_ARCH).rpm
rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/$(NAME)-ui-$(VERSION)-$(RELEASE)$(RPM_DIST).$(RPM_ARCH).rpm
rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/$(NAME)-server-$(VERSION)-$(RELEASE)$(RPM_DIST).$(RPM_ARCH).rpm
rpm --define "_signature gpg" --define "_gpg_name $(GPG_KEY)" --addsign rpm-build/$(NAME)-setup-$(VERSION)-$(RELEASE)$(RPM_DIST).$(RPM_ARCH).rpm
endif endif
deb-build: deb-build:

5
setup.py
View File

@@ -46,8 +46,11 @@ else:
class sdist_isolated(sdist): class sdist_isolated(sdist):
includes = [ includes = [
'include Makefile',
'include awx/__init__.py', 'include awx/__init__.py',
'include awx/main/isolated/run.py', 'include awx/main/isolated/run.py',
'include tools/scripts/tower-expect',
'include requirements/requirements_isolated.txt',
'recursive-include awx/lib *.py', 'recursive-include awx/lib *.py',
] ]
@@ -109,7 +112,7 @@ def proc_data_files(data_files):
setup( setup(
name='ansible-tower', name=os.getenv('NAME', 'ansible-tower'),
version=__version__.split("-")[0], # FIXME: Should keep full version here? version=__version__.split("-")[0], # FIXME: Should keep full version here?
author='Ansible, Inc.', author='Ansible, Inc.',
author_email='info@ansible.com', author_email='info@ansible.com',

4
tools/scripts/tower-expect Executable file
View File

@@ -0,0 +1,4 @@
#!/bin/bash
AWX_LIB=`/var/lib/awx/venv/tower/bin/python -c 'import os, awx; print os.path.dirname(awx.__file__)'`
. /var/lib/awx/venv/tower/bin/activate
exec env TOWER_LIB_DIRECTORY=$AWX_LIB/lib $AWX_LIB/main/isolated/run.py "$@"