diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | ansible/site.yml | 3 | ||||
| -rw-r--r-- | build.sh | 2 | ||||
| -rw-r--r-- | docker/Dockerfile | 4 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 9 insertions, 6 deletions
diff --git a/.travis.yml b/.travis.yml index 2c7cfcff..0311d2f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,5 +41,5 @@ jobs: script: > sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ - --template ${DOCKER_USERNAME}/xtesting:ARCH-latest \ - --target ${DOCKER_USERNAME}/xtesting:latest + --template ${DOCKER_USERNAME}/xtesting:ARCH-jerma \ + --target ${DOCKER_USERNAME}/xtesting:jerma diff --git a/ansible/site.yml b/ansible/site.yml index 8fa19688..db12cc63 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -2,6 +2,9 @@ - hosts: 127.0.0.1 roles: - role: collivier.xtesting + docker_tags: + - iruya: + branch: stable/iruya builds: dependencies: - repo: _ @@ -8,7 +8,7 @@ set -xe repo=${REPO:-opnfv} -tag=${BRANCH:-latest} +tag=${BRANCH:-jerma} arch=${arch-"\ amd64 \ arm64 \ diff --git a/docker/Dockerfile b/docker/Dockerfile index 81b58299..a1c635d9 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:3.10 -ARG BRANCH=master -ARG OPENSTACK_TAG=master +ARG BRANCH=stable/jerma +ARG OPENSTACK_TAG=stable/train RUN apk --no-cache add --update python3 bash git && \ apk --no-cache add --virtual .build-deps --update \ @@ -6,7 +6,7 @@ skipsdist = True usedevelop = True deps = -c{toxinidir}/upper-constraints.txt - -chttps://opendev.org/openstack/requirements/raw/branch/master/upper-constraints.txt + -chttps://opendev.org/openstack/requirements/raw/branch/stable/train/upper-constraints.txt -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt install_command = pip install {opts} {packages} |