External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-16 08:27:29 -02:30
Code Issues Packages Projects Releases Wiki Activity

Consolidate RPM and DEB build process

Browse Source 
* Add reprepro target
* Use debuild for building deb packages
* Use the same setuptools target for RPM and DEB
* Update rpm and deb changelogs for existing releases
This commit is contained in:
James Laska
2014-10-17 09:01:45 -04:00
parent 103929c9ee
commit bfce078ce4
3 changed files with 146 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

211
Makefile
View File

@@ -8,45 +8,74 @@ GRUNT ?= $(shell [ -t 0 ] && echo "grunt" || echo "grunt --no-color")
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])")
RELEASE=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])") RELEASE ?= 1
GIT_REMOTE_URL=$(shell git config --get remote.origin.url) GIT_REMOTE_URL = $(shell git config --get remote.origin.url)
BUILD ?= 0.git$(DATE)
# Allow AMI license customization # Allow AMI license customization
AWS_INSTANCE_COUNT ?= 10 AWS_INSTANCE_COUNT ?= 100
# TAR build parameters
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
BUILD=0.dev$(DATE) SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)-$(BUILD)
SDIST_TAR_FILE=$(NAME)-$(VERSION)-$(BUILD).tar.gz SDIST_TAR_NAME=$(NAME)-$(VERSION)-$(BUILD)
SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)-$(BUILD) PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-nightly.json
RPM_PKG_RELEASE=$(BUILD)
DEB_BUILD_DIR=deb-build/$(NAME)-$(VERSION)-$(BUILD)
DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-nightly.json
else else
BUILD= SETUP_TAR_NAME=$(NAME)-setup-$(VERSION)
SDIST_TAR_FILE=$(NAME)-$(VERSION).tar.gz SDIST_TAR_NAME=$(NAME)-$(VERSION)
SETUP_TAR_NAME=$(NAME)-setup-$(VERSION) PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-release.json
RPM_PKG_RELEASE=$(RELEASE)
DEB_BUILD_DIR=deb-build/$(NAME)-$(VERSION)
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
PACKER_BUILD_OPTS=-var-file=vars-aws-keys.json -var-file=vars-release.json
endif endif
SDIST_TAR_FILE=$(SDIST_TAR_NAME).tar.gz
# DEB build parameters
DEBUILD_BIN ?= debuild
DEBUILD_OPTS = --source-option="-I"
DPUT_BIN ?= dput
DPUT_OPTS ?=
ifeq ($(OFFICIAL),yes)
DEB_DIST ?= stable
DEB_RELEASE = $(RELEASE)
# Sign OFFICIAL builds using 'DEBSIGN_KEYID'
# DEBSIGN_KEYID is required when signing
ifneq ($(DEBSIGN_KEYID),)
DEBUILD_OPTS += -k$(DEBSIGN_KEYID)
endif
else
DEB_DIST ?= unstable
DEB_RELEASE = $(BUILD)
# Do not sign development builds
DEBUILD_OPTS += -uc -us
DPUT_OPTS += -u
endif
DEBUILD = $(DEBUILD_BIN) $(DEBUILD_OPTS)
DEB_PPA ?= reprepro
# RPM build parameters
RPM_SPECDIR= packaging/rpm
RPM_SPEC = $(RPM_SPECDIR)/$(NAME).spec
RPM_DIST = $(shell rpm --eval '%{?dist}')
ifeq ($(OFFICIAL),yes)
RPM_RELEASE = $(RELEASE)
else
RPM_RELEASE = $(BUILD)
endif
RPM_NVR = $(NAME)-$(VERSION)-$(RPM_RELEASE)$(RPM_DIST)
MOCK_BIN ?= mock MOCK_BIN ?= mock
MOCK_CFG ?= MOCK_CFG ?=
.PHONY: clean rebase push requirements requirements_pypi requirements_jenkins \ .PHONY: clean rebase push requirements requirements_pypi requirements_jenkins \
develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \ develop refresh adduser syncdb migrate dbchange dbshell runserver celeryd \
receiver test test_coverage coverage_html test_ui test_jenkins dev_build \ receiver test test_coverage coverage_html test_ui test_jenkins dev_build \
release_build release_clean sdist rpm release_build release_clean sdist rpmtar mock-rpm mock-srpm \
deb deb-src debian reprepro
# Remove temporary build files, compiled Python files. # Remove temporary build files, compiled Python files.
clean: clean:
rm -rf dist/* rm -rf dist/*
rm -rf build rpm-build *.egg-info rm -rf build rpm-build $(NAME)-$(VERSION) *.egg-info
rm -rf debian deb-build rm -rf debian deb-build reprepro
rm -f awx/ui/static/{js,css}/awx*.{js,css} rm -f awx/ui/static/{js,css}/awx*.{js,css}
rm -rf awx/ui/static/docs rm -rf awx/ui/static/docs
rm -rf node_modules package.json Gruntfile.js bower.json rm -rf node_modules package.json Gruntfile.js bower.json
@@ -231,81 +260,107 @@ release_build:
$(PYTHON) setup.py release_build $(PYTHON) setup.py release_build
# Build AWX setup tarball. # Build AWX setup tarball.
setup_tarball: $(SETUP_TAR_NAME).tar.gz:
@cp -a setup $(SETUP_TAR_NAME) @cp -a setup $(SETUP_TAR_NAME)
@tar czf $(SETUP_TAR_NAME).tar.gz $(SETUP_TAR_NAME)/ @tar czf $(SETUP_TAR_NAME).tar.gz $(SETUP_TAR_NAME)/
@rm -rf $(SETUP_TAR_NAME) @rm -rf $(SETUP_TAR_NAME)
@echo "#############################################"
@echo "Setup artifacts:"
@echo $(SETUP_TAR_NAME).tar.gz
@echo "#############################################"
setup_tarball: $(SETUP_TAR_NAME).tar.gz
release_clean: release_clean:
-(rm *.tar) -(rm *.tar)
-(rm -rf ($RELEASE)) -(rm -rf ($RELEASE))
# Traditional 'sdist' dist/$(SDIST_TAR_FILE):
sdist: clean minjs BYTE_COMPLE=$(BYTE_COMPILE) BUILD="$(BUILD)" $(PYTHON) setup.py sdist
if [ "$(OFFICIAL)" = "yes" ] ; then \
$(PYTHON) setup.py release_rpm; \
else \
BUILD=$(BUILD) $(PYTHON) setup.py dev_rpm; \
fi
# Differs from 'sdist' because it includes 'byte-compiled' files in the tarball sdist: minjs dist/$(SDIST_TAR_FILE)
sdist_deb: clean minjs
if [ "$(OFFICIAL)" = "yes" ] ; then \
$(PYTHON) setup.py release_deb ; \
else \
BUILD=$(BUILD) $(PYTHON) setup.py dev_deb; \
fi
rpmtar: sdist rpm-build/$(SDIST_TAR_FILE): dist/$(SDIST_TAR_FILE)
mkdir -p rpm-build mkdir -p rpm-build
cp packaging/rpm/$(NAME).spec rpm-build/
cp packaging/rpm/$(NAME).te rpm-build/ cp packaging/rpm/$(NAME).te rpm-build/
sed -e 's#^Version:.*#Version: $(VERSION)#' -e 's#^Release:.*#Release: $(RPM_PKG_RELEASE)%{?dist}#' packaging/rpm/$(NAME).spec >rpm-build/$(NAME).spec
if [ "$(OFFICIAL)" != "yes" ] ; then \ if [ "$(OFFICIAL)" != "yes" ] ; then \
(cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \ (cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \
(cd dist/ && mv $(NAME)-$(VERSION)-$(BUILD) $(NAME)-$(VERSION)) ; \ (cd dist/ && mv $(NAME)-$(VERSION)-$(BUILD) $(NAME)-$(VERSION)) ; \
(cd dist/ && tar czf $(NAME)-$(VERSION).tar.gz $(NAME)-$(VERSION)) ; \ (cd dist/ && tar czf ../rpm-build/$(SDIST_TAR_FILE) $(NAME)-$(VERSION)) ; \
ln -sf $(SDIST_TAR_FILE) rpm-build/$(NAME)-$(VERSION).tar.gz ; \
else \
ln -sf ../dist/$(SDIST_TAR_FILE) rpm-build/ ; \
fi fi
cp dist/$(NAME)-$(VERSION).tar.gz rpm-build/
mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmtar rpmtar: rpm-build/$(SDIST_TAR_FILE)
$(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build
mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm rpm-build/$(RPM_NVR).src.rpm: /etc/mock/$(MOCK_CFG).cfg
$(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build --rebuild rpm-build/$(NAME)-*.src.rpm $(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build --buildsrpm --spec rpm-build/$(NAME).spec --sources rpm-build \
--define "tower_version $(VERSION)" --define "tower_release $(RPM_RELEASE)"
@echo "#############################################"
@echo "SRPM artifacts:"
@echo rpm-build/$(RPM_NVR).src.rpm
@echo "#############################################"
srpm: rpmtar mock-srpm: rpmtar rpm-build/$(RPM_NVR).src.rpm
@rpmbuild \
--define "_pkgrelease $(RPM_PKG_RELEASE)" \
--define "_topdir %(pwd)/rpm-build" \
--define "_builddir %{_topdir}" \
--define "_rpmdir %{_topdir}" \
--define "_srcrpmdir %{_topdir}" \
--define "_specdir %{_topdir}" \
--define "_sourcedir %{_topdir}" \
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
-bs rpm-build/$(NAME).spec
rpm: rpmtar rpm-build/$(RPM_NVR).noarch.rpm: rpm-build/$(RPM_NVR).src.rpm
@rpmbuild \ $(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build --rebuild rpm-build/$(RPM_NVR).src.rpm \
--define "_pkgrelease $(RPM_PKG_RELEASE)" \ --define "tower_version $(VERSION)" --define "tower_release $(RPM_RELEASE)"
--define "_topdir %(pwd)/rpm-build" \ @echo "#############################################"
--define "_builddir %{_topdir}" \ @echo "RPM artifacts:"
--define "_rpmdir %{_topdir}" \ @echo rpm-build/$(RPM_NVR).noarch.rpm
--define "_srcrpmdir %{_topdir}" \ @echo "#############################################"
--define "_specdir %{_topdir}" \
--define "_sourcedir %{_topdir}" \
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
-ba rpm-build/$(NAME).spec
deb: sdist_deb mock-rpm: rpm-build/$(RPM_NVR).noarch.rpm
@mkdir -p deb-build
@cp dist/$(SDIST_TAR_FILE) deb-build/ deb-build/$(SDIST_TAR_NAME): BYTE_COMPILE = 1
(cd deb-build && tar zxf $(SDIST_TAR_FILE)) deb-build/$(SDIST_TAR_NAME):
(cd $(DEB_BUILD_DIR) && dh_make --indep --yes -f ../$(SDIST_TAR_FILE) -p $(NAME)-$(VERSION)) mkdir -p deb-build
@rm -rf $(DEB_BUILD_DIR)/debian tar -C deb-build/ -xvf dist/$(SDIST_TAR_FILE)
@cp -a packaging/debian $(DEB_BUILD_DIR)/ cp -a packaging/debian deb-build/$(SDIST_TAR_NAME)/
@echo "$(NAME)-$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles sed -ie "s#^$(NAME) (\([^)]*\)) \([^;]*\);#$(NAME) ($(VERSION)-$(DEB_RELEASE)) $(DEB_DIST);#" deb-build/$(SDIST_TAR_NAME)/debian/changelog
(cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles")
debian: sdist deb-build/$(SDIST_TAR_NAME)
deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb:
cd deb-build/$(SDIST_TAR_NAME) && $(DEBUILD) -b
@echo "#############################################"
@echo "DEB artifacts:"
@echo deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb
@echo "#############################################"
deb: debian deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb
deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_source.changes:
cd deb-build/$(SDIST_TAR_NAME) && $(DEBUILD) -S
@echo "#############################################"
@echo "DEB artifacts:"
@echo deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_source.changes
@echo "#############################################"
deb-src: debian deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_source.changes
deb-upload: deb
$(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_amd64.changes ; \
deb-src-upload: deb-src
$(DPUT_BIN) $(DPUT_OPTS) $(DEB_PPA) deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_source.changes ; \
reprepro: deb
mkdir -p reprepro/conf
cp -a packaging/reprepro/* reprepro/conf/
@DEB=deb-build/$(NAME)_$(VERSION)-$(DEB_RELEASE)_all.deb ; \
for DIST in trusty precise ; do \
echo "Removing '$(NAME)' from the $${DIST} apt repo" ; \
echo reprepro --export=force -b reprepro remove $${DIST} $(NAME) ; \
done; \
reprepro --export=force -b reprepro clearvanished; \
for DIST in trusty precise ; do \
echo "Adding $${DEB} to the $${DIST} apt repo"; \
reprepro --keepunreferencedfiles --export=force -b reprepro --ignore=brokenold includedeb $${DIST} $${DEB} ; \
done; \
ami: ami:
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_instance_count=$(AWS_INSTANCE_COUNT)" -var "product_version=$(VERSION)" -var "official=$(OFFICIAL)" $(NAME).json) (cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_instance_count=$(AWS_INSTANCE_COUNT)" -var "product_version=$(VERSION)" -var "official=$(OFFICIAL)" $(NAME).json)

2
awx/__init__.py
View File

@@ -1,7 +1,7 @@
# Copyright (c) 2014 AnsibleWorks, Inc. # Copyright (c) 2014 AnsibleWorks, Inc.
# All Rights Reserved. # All Rights Reserved.
__version__ = '2.1.0-l' __version__ = '2.1.0'
import os import os
import sys import sys

24
setup.py
View File

@@ -10,7 +10,10 @@ from setuptools.command.sdist import sdist as _sdist
from awx import __version__ from awx import __version__
build_timestamp = os.getenv("BUILD",datetime.datetime.now().strftime('-%Y%m%d%H%M')) if os.getenv('OFFICIAL', 'no') == 'yes':
build_timestamp = ''
else:
build_timestamp = '-' + os.getenv("BUILD", datetime.datetime.now().strftime('0.git%Y%m%d%H%M'))
# Paths we'll use later # Paths we'll use later
etcpath = "/etc/tower" etcpath = "/etc/tower"
@@ -73,7 +76,7 @@ def proc_data_files(data_files):
##################################################################### #####################################################################
class sdist_deb(_sdist, object): class sdist_pyc_only(_sdist, object):
''' '''
Custom sdist command to distribute some files as .pyc only. Custom sdist command to distribute some files as .pyc only.
''' '''
@@ -83,7 +86,8 @@ class sdist_deb(_sdist, object):
if f.endswith('.egg-info/SOURCES.txt'): if f.endswith('.egg-info/SOURCES.txt'):
files.remove(f) files.remove(f)
sources_txt_path = f sources_txt_path = f
super(sdist_deb, self).make_release_tree(base_dir, files) super(sdist_pyc_only, self).make_release_tree(base_dir, files)
new_sources_path = os.path.join(base_dir, sources_txt_path) new_sources_path = os.path.join(base_dir, sources_txt_path)
if os.path.isfile(new_sources_path): if os.path.isfile(new_sources_path):
log.warn('unlinking previous %s', new_sources_path) log.warn('unlinking previous %s', new_sources_path)
@@ -117,7 +121,7 @@ class sdist_deb(_sdist, object):
# Replace .py with .pyc file # Replace .py with .pyc file
self.filelist.files[n] = f + 'c' self.filelist.files[n] = f + 'c'
self.pyc_only_files.append(f) self.pyc_only_files.append(f)
super(sdist_deb, self).make_distribution() super(sdist_pyc_only, self).make_distribution()
##################################################################### #####################################################################
@@ -225,19 +229,15 @@ setup(
), ),
options = { options = {
'egg_info': { 'egg_info': {
'tag_build': '-%s' % build_timestamp, 'tag_build': build_timestamp,
}, },
'aliases': { 'aliases': {
# For RPM builds, don't byte-compile awx ... RPM handles that for us 'dev_build': 'clean --all egg_info sdist',
'dev_rpm': 'clean --all egg_info sdist', 'release_build': 'clean --all egg_info -b "" sdist',
'release_rpm': 'clean --all egg_info -b "" sdist',
# For DEB builds, do byte-compile awx
'dev_deb': 'clean --all egg_info sdist_deb',
'release_deb': 'clean --all egg_info -b "" sdist_deb',
}, },
}, },
cmdclass = { cmdclass = {
'sdist_deb': sdist_deb, 'sdist': os.getenv('BYTE_COMPILE', False) in (True, 1, 'True', '1') and sdist_pyc_only or _sdist,
'install_lib': install_lib, 'install_lib': install_lib,
}, },
) )