aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2019-03-27 22:21:35 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2019-03-27 22:25:07 +0100
commite5cbef523b78301d8dc0f28461205c192698e67d (patch)
tree28a3b5077ff7873064ae58e3fbf8b4835f114495
parentdc4175c77892d5a1cf7765cee980400531652171 (diff)
Publish Xtesting Iruya release
Change-Id: Ic0409dd375434f070000538c6169c04ee8e6e7f7 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--.travis.yml4
-rw-r--r--ansible/site.yml5
-rw-r--r--build.sh2
-rw-r--r--docker/Dockerfile4
-rw-r--r--tox.ini2
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}