From e5cbef523b78301d8dc0f28461205c192698e67d Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Wed, 27 Mar 2019 22:21:35 +0100 Subject: [PATCH] Publish Xtesting Iruya release MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ic0409dd375434f070000538c6169c04ee8e6e7f7 Signed-off-by: Cédric Ollivier --- .travis.yml | 4 ++-- ansible/site.yml | 5 ++++- build.sh | 2 +- docker/Dockerfile | 4 ++-- tox.ini | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 20f4dd45..975152fa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,5 +25,5 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm64 \ - --template ${DOCKER_USERNAME}/xtesting:ARCH-latest \ - --target ${DOCKER_USERNAME}/xtesting:latest + --template ${DOCKER_USERNAME}/xtesting:ARCH-iruya \ + --target ${DOCKER_USERNAME}/xtesting:iruya diff --git a/ansible/site.yml b/ansible/site.yml index 4c1f495e..8c862e9c 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -1,4 +1,7 @@ --- - hosts: 127.0.0.1 roles: - - collivier.xtesting + - role: collivier.xtesting + docker_tags: + - hunter: + branch: stable/iruya diff --git a/build.sh b/build.sh index 6c2a0c71..6b99e440 100644 --- a/build.sh +++ b/build.sh @@ -8,7 +8,7 @@ set -xe repo=${REPO:-opnfv} -tag=${BRANCH:-latest} +tag=${BRANCH:-iruya} arch=${arch-"\ amd64 \ arm64"} diff --git a/docker/Dockerfile b/docker/Dockerfile index 290ac6f8..2eff86c2 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.9 -ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG BRANCH=stable/iruya +ARG OPENSTACK_TAG=stable/stein RUN apk --no-cache add --update python py-pip bash git && \ apk --no-cache add --virtual .build-deps --update \ diff --git a/tox.ini b/tox.ini index ea0346a1..06db07d7 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = True usedevelop = True deps = -c{toxinidir}/upper-constraints.txt - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=master + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/stein -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} -- 2.16.6