diff options
| author |   Cedric Ollivier <cedric.ollivier@orange.com> | 2018-09-13 09:41:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-09-13 09:41:46 +0000 |
| commit | c34733325dc4c42233dd81d089b863b1987a5754 (patch) | |
| tree | 303d9959c184e09948c0e61e320551e030ad64c9 | |
| parent | 2f9eb991687f4452839e90cdc7829b27699a1438 (diff) | |
| parent | 61f21c681b0e69124b9497b1ba3118da7c21dcf3 (diff) | |
Merge changes I83c64de0,I61c3e3af into stable/hunter
* changes:
Update .travis.yml
Fix BRANCH in Dockerfile
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | docker/Dockerfile | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index 36f1969a..e0929fea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,5 +24,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-hunter \ + --target ${DOCKER_USERNAME}/xtesting:hunter diff --git a/docker/Dockerfile b/docker/Dockerfile index 2ab61141..c74c9860 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ FROM alpine:3.8 -ARG BRANCH=master +ARG BRANCH=stable/hunter ARG OPENSTACK_TAG=stable/rocky RUN apk --no-cache add --update python py-pip bash git && \ |