diff options
| -rw-r--r-- | docker/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/Dockerfile.aarch64 | 11 | ||||
| -rw-r--r-- | docker/core/Dockerfile | 15 | ||||
| -rw-r--r-- | docker/core/upper-constraints.txt | 17 | ||||
| -rw-r--r-- | docker/smoke/Dockerfile | 11 | ||||
| -rw-r--r-- | docker/smoke/upper-constraints.txt | 17 | ||||
| -rw-r--r-- | docker/upper-constraints.txt | 17 |
7 files changed, 28 insertions, 71 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile index 81d5167ea..accbf5e30 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -15,6 +15,7 @@ LABEL version="0.1" description="OPNFV Functest Docker container" ARG BRANCH=master ARG RALLY_TAG=0.8.1 ARG ODL_TAG=release/beryllium-sr4 +ARG OPENSTACK_TAG=stable/ocata ARG KINGBIRD_TAG=1.1.0 ARG VIMS_TAG=stable ARG VROUTER_TAG=stable @@ -70,17 +71,17 @@ RUN mkdir -p ${REPOS_VNFS_DIR} \ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt -COPY upper-constraints.txt upper-constraints.txt -RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ +RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > o-upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ + > upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ -rthirdparty-requirements.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ - rm thirdparty-requirements.txt upper-constraints.txt o-upper-constraints.txt + rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper diff --git a/docker/Dockerfile.aarch64 b/docker/Dockerfile.aarch64 index 1140eaddf..abd4d1afb 100644 --- a/docker/Dockerfile.aarch64 +++ b/docker/Dockerfile.aarch64 @@ -15,6 +15,7 @@ LABEL version="0.1" description="OPNFV Functest Aarch64 Docker container" ARG BRANCH=master ARG RALLY_TAG=0.8.1 ARG ODL_TAG=release/beryllium-sr4 +ARG OPENSTACK_TAG=stable/ocata ARG KINGBIRD_TAG=0.2.2 ARG VIMS_TAG=stable ARG REPOS_DIR=/home/opnfv/repos @@ -69,17 +70,17 @@ RUN mkdir -p ${REPOS_VNFS_DIR} \ RUN git config --global http.sslVerify false COPY thirdparty-requirements.txt thirdparty-requirements.txt -COPY upper-constraints.txt upper-constraints.txt -RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ +RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > o-upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ + > upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest \ -rthirdparty-requirements.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ - rm thirdparty-requirements.txt upper-constraints.txt o-upper-constraints.txt + rm thirdparty-requirements.txt upper-constraints.txt # OPNFV repositories RUN git clone --depth 1 -b $BRANCH https://gerrit.opnfv.org/gerrit/copper ${REPOS_DIR}/copper diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 4aa9e5c41..ef9f0e2d2 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -1,18 +1,21 @@ FROM alpine:3.6 -COPY upper-constraints.txt upper-constraints.txt +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata + RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ grep sed wget ca-certificates git && \ apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev && \ - wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata | \ + wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG | \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ \ - > o-upper-constraints.txt && \ - pip install --src /src -cupper-constraints.txt -co-upper-constraints.txt \ - git+https://gerrit.opnfv.org/gerrit/functest#egg=functest && \ - rm upper-constraints.txt o-upper-constraints.txt && \ + > upper-constraints.txt && \ + pip install --src /src -cupper-constraints.txt \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ + git+https://gerrit.opnfv.org/gerrit/functest@$BRANCH#egg=functest && \ + rm upper-constraints.txt && \ mkdir -p /etc/rally && \ printf "[database]\nconnection = 'sqlite:////var/lib/rally/database/rally.sqlite'" > /etc/rally/rally.conf && \ mkdir -p /var/lib/rally/database && rally-manage db create && \ diff --git a/docker/core/upper-constraints.txt b/docker/core/upper-constraints.txt deleted file mode 100644 index 73ec7f41b..000000000 --- a/docker/core/upper-constraints.txt +++ /dev/null @@ -1,17 +0,0 @@ -git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn -git+https://gerrit.opnfv.org/gerrit/opera#egg=opera -git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning -git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc --e git+https://github.com/openstack/refstack-client#egg=refstack-client -cloudify_rest_client===4.0 -iniparse===0.4 -openbaton-cli===2.2.1b7 -robotframework===3.0.2 -robotframework-httplibrary===0.4.2 -robotframework-requests===0.4.7 -robotframework-sshlibrary===2.1.3;python_version=='2.7' -kingbird===1.1.0 -rally===0.9.1 diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile index 5a3b59be6..b037728ae 100644 --- a/docker/smoke/Dockerfile +++ b/docker/smoke/Dockerfile @@ -1,15 +1,18 @@ FROM ollivier/functest-core +ARG BRANCH=master +ARG OPENSTACK_TAG=stable/ocata + COPY thirdparty-requirements.txt thirdparty-requirements.txt -COPY upper-constraints.txt upper-constraints.txt RUN apk --no-cache add --virtual .build-deps --update \ python-dev build-base linux-headers libffi-dev \ openssl-dev libjpeg-turbo-dev git && \ - pip install --src /src -cupper-constraints.txt \ - -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/ocata \ + pip install --src /src \ + -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \ + -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -rthirdparty-requirements.txt && \ ln -s /src/tempest /src/refstack-client/.tempest && \ virtualenv --system-site-packages /src/tempest/.venv && \ - rm thirdparty-requirements.txt upper-constraints.txt && \ + rm thirdparty-requirements.txt && \ apk del .build-deps COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml diff --git a/docker/smoke/upper-constraints.txt b/docker/smoke/upper-constraints.txt deleted file mode 100644 index 73ec7f41b..000000000 --- a/docker/smoke/upper-constraints.txt +++ /dev/null @@ -1,17 +0,0 @@ -git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn -git+https://gerrit.opnfv.org/gerrit/opera#egg=opera -git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning -git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc --e git+https://github.com/openstack/refstack-client#egg=refstack-client -cloudify_rest_client===4.0 -iniparse===0.4 -openbaton-cli===2.2.1b7 -robotframework===3.0.2 -robotframework-httplibrary===0.4.2 -robotframework-requests===0.4.7 -robotframework-sshlibrary===2.1.3;python_version=='2.7' -kingbird===1.1.0 -rally===0.9.1 diff --git a/docker/upper-constraints.txt b/docker/upper-constraints.txt deleted file mode 100644 index 73ec7f41b..000000000 --- a/docker/upper-constraints.txt +++ /dev/null @@ -1,17 +0,0 @@ -git+https://gerrit.opnfv.org/gerrit/releng#egg=opnfv&subdirectory=modules -git+https://gerrit.opnfv.org/gerrit/snaps#egg=snaps -git+https://gerrit.opnfv.org/gerrit/barometer#egg=baro_tests -git+https://gerrit.opnfv.org/gerrit/sdnvpn#egg=sdnvpn -git+https://gerrit.opnfv.org/gerrit/opera#egg=opera -git+https://gerrit.opnfv.org/gerrit/securityscanning#egg=securityscanning -git+https://gerrit.opnfv.org/gerrit/sfc#egg=sfc --e git+https://github.com/openstack/refstack-client#egg=refstack-client -cloudify_rest_client===4.0 -iniparse===0.4 -openbaton-cli===2.2.1b7 -robotframework===3.0.2 -robotframework-httplibrary===0.4.2 -robotframework-requests===0.4.7 -robotframework-sshlibrary===2.1.3;python_version=='2.7' -kingbird===1.1.0 -rally===0.9.1 |