From 4d1ecd49deb45d49cfff58a4241f1bc9e085fbdd Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Ollivier?= Date: Tue, 28 Apr 2020 11:39:08 +0200 Subject: [PATCH] Publish Kali container MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit It should be noted that OpenStack has not released U's upper-constaints.txt yet. Change-Id: I05de1981cec34da1dcbc4b192d8a0510fddc84a1 Signed-off-by: Cédric Ollivier --- .gitreview | 2 +- .travis.yml | 4 ++-- ansible/site.yml | 3 +++ build.sh | 2 +- docker/Dockerfile | 2 +- 5 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.gitreview b/.gitreview index 8db5dfee..bdb61249 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=gerrit.opnfv.org port=29418 project=functest-xtesting.git - +defaultbranch=stable/kali diff --git a/.travis.yml b/.travis.yml index 402ac293..d92a5cb5 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-kali \ + --target ${DOCKER_USERNAME}/xtesting:kali diff --git a/ansible/site.yml b/ansible/site.yml index b042d57b..b27ea7f3 100644 --- a/ansible/site.yml +++ b/ansible/site.yml @@ -2,6 +2,9 @@ - hosts: 127.0.0.1 roles: - role: collivier.xtesting + docker_tags: + - kali: + branch: stable/kali builds: dependencies: - repo: _ diff --git a/build.sh b/build.sh index b7e56725..322b60cb 100644 --- a/build.sh +++ b/build.sh @@ -8,7 +8,7 @@ set -xe repo=${REPO:-opnfv} -tag=${BRANCH:-latest} +tag=${BRANCH:-kali} arch=${arch-"\ amd64 \ arm64 \ diff --git a/docker/Dockerfile b/docker/Dockerfile index 7b908cd4..83a3b13b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.11 -ARG BRANCH=master +ARG BRANCH=stable/kali ARG OPENSTACK_TAG=master RUN apk --no-cache add --update python3 bash git mailcap && \ -- 2.16.6