x/ranger
Code Issues Proposed changes

Edit Ranger Promote and Makefile

Browse Source 
I used the incorrect process in my
previous image publication patchset.
This patchset changes Ranger to use
the correct process, Promote, which
is the process intended for promoting
artifacts from a patchset and will
appear after checks and gates have
completed on a patchset. The Makefile
also lacked a push step, so this
patchset corrects that as well.

Change-Id: I483f2bcc73aa060a52e7e10ce9a8fb7c7f38fe04
This commit is contained in:
jh629g
2019-11-13 16:19:55 -06:00
parent 62c9608eae
commit aa95601c93
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@@ -10,7 +10,7 @@
- openstack-tox-pep8 - openstack-tox-pep8
- openstack-tox-py36 - openstack-tox-py36
- ranger-tox-bandit - ranger-tox-bandit
post: promote:
jobs: jobs:
- ranger-image-publish - ranger-image-publish

13
Makefile
View File

@@ -15,15 +15,17 @@
DOCKER_REGISTRY ?= quay.io DOCKER_REGISTRY ?= quay.io
IMAGE_NAME := ranger rangercli IMAGE_NAME := ranger rangercli
IMAGE_PREFIX ?= attcomdev IMAGE_PREFIX ?= attcomdev
IMAGE_TAG ?= ocata IMAGE_TAG := latest
HELM ?= helm HELM ?= helm
LABEL ?= commit-id LABEL ?= commit-id
PROXY ?= PROXY ?=
PUSH_IMAGE ?= false
NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local NO_PROXY ?= localhost,127.0.0.1,.svc.cluster.local
USE_PROXY ?= true USE_PROXY ?= true
RANGER_USER := ranger RANGER_USER := ranger
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG} IMAGE_LATEST := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${IMAGE_TAG}
IMAGE := ${DOCKER_REGISTRY}/${IMAGE_PREFIX}/${IMAGE_NAME}:${LABEL}
IMAGE_DIR:=images/$(IMAGE_NAME) IMAGE_DIR:=images/$(IMAGE_NAME)
# Build ranger Docker image for this project # Build ranger Docker image for this project
@@ -35,6 +37,7 @@ images: $(IMAGE_NAME)
@echo @echo
@echo "===== Processing [$@] image =====" @echo "===== Processing [$@] image ====="
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@ @make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${IMAGE_TAG} IMAGE_DIR=images/$@ IMAGE_NAME=$@
@make build_$@ IMAGE=${DOCKER_REGISTRY}/${IMAGE_PREFIX}/$@:${LABEL} IMAGE_DIR=images/$@ IMAGE_NAME=$@
# Create tgz of the chart # Create tgz of the chart
.PHONY: charts .PHONY: charts
@@ -83,6 +86,10 @@ else
docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile . docker build --network host -t $(IMAGE) --label $(LABEL) -f $(IMAGE_DIR)/Dockerfile .
endif endif
ifeq ($(PUSH_IMAGE), true)
docker push $(IMAGE)
docker push $(IMAGE_LATEST)
endif
.PHONY: clean .PHONY: clean
clean: clean: