mirror of
https://github.com/ansible/awx.git
synced 2026-05-13 04:17:36 -02:30
Allow customizing packer license tier
This commit is contained in:
committed by
Matthew Jones
parent
e27ed61fc8
commit
49901de696
18
Makefile
18
Makefile
@@ -8,6 +8,11 @@ DATE := $(shell date -u +%Y%m%d%H%M)
|
|||||||
|
|
||||||
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=$(shell $(PYTHON) -c "from awx import __version__; print(__version__.split('-')[1])")
|
||||||
|
|
||||||
|
# Allow ami license customization
|
||||||
|
LICENSE_TIER ?= 30
|
||||||
|
PACKER_LICENSE_FILE ?= test.json
|
||||||
|
|
||||||
ifneq ($(OFFICIAL),yes)
|
ifneq ($(OFFICIAL),yes)
|
||||||
BUILD=dev$(DATE)
|
BUILD=dev$(DATE)
|
||||||
SDIST_TAR_FILE=awx-$(VERSION)-$(BUILD).tar.gz
|
SDIST_TAR_FILE=awx-$(VERSION)-$(BUILD).tar.gz
|
||||||
@@ -15,6 +20,7 @@ SETUP_TAR_NAME=awx-setup-$(VERSION)-$(BUILD)
|
|||||||
RPM_PKG_RELEASE=$(BUILD)
|
RPM_PKG_RELEASE=$(BUILD)
|
||||||
DEB_BUILD_DIR=deb-build/awx-$(VERSION)-$(BUILD)
|
DEB_BUILD_DIR=deb-build/awx-$(VERSION)-$(BUILD)
|
||||||
DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
|
DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
|
||||||
|
PACKER_BUILD_OPTS=-var-file=vars-awxkeys.json -var-file=vars-nightly.json
|
||||||
else
|
else
|
||||||
BUILD=
|
BUILD=
|
||||||
SDIST_TAR_FILE=awx-$(VERSION).tar.gz
|
SDIST_TAR_FILE=awx-$(VERSION).tar.gz
|
||||||
@@ -22,6 +28,7 @@ SETUP_TAR_NAME=awx-setup-$(VERSION)
|
|||||||
RPM_PKG_RELEASE=$(RELEASE)
|
RPM_PKG_RELEASE=$(RELEASE)
|
||||||
DEB_BUILD_DIR=deb-build/awx-$(VERSION)
|
DEB_BUILD_DIR=deb-build/awx-$(VERSION)
|
||||||
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
|
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
|
||||||
|
PACKER_BUILD_OPTS=-var-file=vars-awxkeys.json -var-file=vars-release.json
|
||||||
endif
|
endif
|
||||||
|
|
||||||
.PHONY: clean rebase push requirements requirements_pypi develop refresh \
|
.PHONY: clean rebase push requirements requirements_pypi develop refresh \
|
||||||
@@ -188,12 +195,11 @@ deb: sdist
|
|||||||
@echo "awx_$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles
|
@echo "awx_$(DEB_PKG_RELEASE).deb admin optional" > $(DEB_BUILD_DIR)/debian/realfiles
|
||||||
(cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles")
|
(cd $(DEB_BUILD_DIR) && PKG_RELEASE=$(DEB_PKG_RELEASE) dpkg-buildpackage -nc -us -uc -b --changes-option="-fdebian/realfiles")
|
||||||
|
|
||||||
ami:
|
packer_license:
|
||||||
if [ "$(OFFICIAL)" = "yes" ] ; then \
|
@python -c "import json; fp = open('packaging/ami/license/$(PACKER_LICENSE)', 'w+'); json.dump(dict(instance_count=$(LICENSE_TIER)), fp); fp.close();"
|
||||||
(cd packaging/ami && $(PACKER) build -var-file=vars-awxkeys.json -var-file=vars-release.json awx.json) ; \
|
|
||||||
else \
|
ami: packer_license
|
||||||
(cd packaging/ami && $(PACKER) build -var-file=vars-awxkeys.json -var-file=vars-nightly.json awx.json) ; \
|
(cd packaging/ami && $(PACKER) build $(PACKER_BUILD_OPTS) -var "aws_license=$(PACKER_LICENSE_FILE)" awx.json)
|
||||||
fi
|
|
||||||
|
|
||||||
install:
|
install:
|
||||||
$(PYTHON) setup.py install egg_info -b ""
|
$(PYTHON) setup.py install egg_info -b ""
|
||||||
|
|||||||
Reference in New Issue
Block a user