oVirt/ovirt-openshift-extensions
1
0
Fork 0
mirror of https://github.com/oVirt/ovirt-openshift-extensions.git synced 2026-02-05 09:46:02 +01:00
Code Issues Releases Wiki Activity

ovirt-openshift-installer: include from openshift-ansible

Browse Source 
Signed-off-by: Roy Golan <rgolan@redhat.com>
This commit is contained in:
Roy Golan
2019-04-04 12:53:40 +03:00
parent 89b4d3d3b9
commit 1a7688aefb
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -21,6 +21,7 @@ COMMON_ENV=CGO_ENABLED=0 GOOS=linux GOARCH=amd64
COMMON_GO_BUILD_FLAGS=-ldflags '-extldflags "-static"'
TARBALL=ovirt-openshift-extensions-$(VERSION_RELEASE).tar.gz
PUSH_LATEST=1
all: clean deps build test container container-push
@@ -62,7 +63,9 @@ container-%: tarball
container-push-%:
@docker login -u rgolangh -p ${QUAY_API_KEY} quay.io
docker push $(REGISTRY)/$*:$(VERSION_RELEASE)
ifneq ($(PUSH_LATEST),0)
docker push $(REGISTRY)/$*:latest
endif
echo "$(REGISTRY)/$*:$(VERSION_RELEASE)" >> containers-artifacts.list
build: $(binaries)

2
automation/build-artifacts.sh
View File

@@ -4,7 +4,7 @@ EXPORTED_ARTIFACTS=exported-artifacts
mkdir -p $EXPORTED_ARTIFACTS
make build-containers ARTIFACT_DIR=$EXPORTED_ARTIFACTS
make push-containers
make push-containers PUSH_LATEST=$([ $(basename $0) == "build-artifacts.sh" ] && echo 0)
make apb_build apb_docker_push
cp containers-artifacts.list $EXPORTED_ARTIFACTS || true

2
automation/ci/Dockerfile
View File

@@ -21,7 +21,7 @@ ADD setup_dns.yaml setup_dns.yaml
ADD flex_deployer_job.yaml flex_deployer_job.yaml
ENV OPTS="-v "
ENV ANSIBLE_ROLES_PATH="/usr/share/ansible/roles/"
ENV ANSIBLE_ROLES_PATH="/usr/share/ansible/roles:/usr/share/ansible/openshift-ansible/roles/"
ENV ANSIBLE_JINJA2_EXTENSIONS="jinja2.ext.do"
ENV INVENTORY_FILE="integ.ini"
ENV PLAYBOOK_FILE="install_okd.yaml"