diff options
| -rw-r--r-- | docker/core/Dockerfile | 6 | ||||
| -rw-r--r-- | docker/parser/Dockerfile | 7 | ||||
| -rw-r--r-- | docker/parser/thirdparty-requirements.txt | 3 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/snaps/snaps_utils.py | 2 | ||||
| -rw-r--r-- | upper-constraints.txt | 3 |
5 files changed, 14 insertions, 7 deletions
diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 316e4e2d2..a729a978d 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -14,6 +14,8 @@ RUN apk --no-cache add --update \ sed -E s/^tempest==+\(.*\)$/-e\ git+https:\\/\\/github.com\\/openstack\\/tempest@\\1#egg=tempest/ | \ sed s/^requests===.*$/requests===2.13.0/ \ > upper-constraints.txt && \ + git clone https://gerrit.opnfv.org/gerrit/functest /src/functest && \ + (cd /src/functest && git fetch origin $BRANCH && git checkout FETCH_HEAD) && \ pip install --no-cache-dir --src /src -cupper-constraints.txt \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \ -e git+https://github.com/openstack/requirements@$OPENSTACK_TAG#egg=openstack_requirements && \ @@ -23,8 +25,8 @@ RUN apk --no-cache add --update \ -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH /src/rally && \ pip install --no-cache-dir --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 -r upper-constraints.txt /src/rally/.git && \ + /src/functest && \ + rm -r upper-constraints.txt /src/functest /src/rally/.git && \ 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/parser/Dockerfile b/docker/parser/Dockerfile index 66855dc92..d691b64f8 100644 --- a/docker/parser/Dockerfile +++ b/docker/parser/Dockerfile @@ -4,6 +4,7 @@ ARG BRANCH=stable/euphrates ARG OPENSTACK_TAG=stable/pike ARG RALLY_TAG=0.9.1 +COPY thirdparty-requirements.txt thirdparty-requirements.txt RUN apk --no-cache add --update \ python libffi libssl1.0 libjpeg-turbo py-pip bash \ grep sed wget ca-certificates git openssh-client && \ @@ -25,10 +26,8 @@ RUN apk --no-cache add --update \ pip install --no-cache-dir --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 \ - git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-heattranslator\&subdirectory=tosca2heat/heat-translator \ - git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-toscaparser\&subdirectory=tosca2heat/tosca-parser \ - -e git+https://gerrit.opnfv.org/gerrit/parser#egg=nfv-parser && \ - rm -r upper-constraints.txt /src/rally/.git && \ + -rthirdparty-requirements.txt && \ + rm -r upper-constraints.txt thirdparty-requirements.txt /src/rally/.git && \ 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/parser/thirdparty-requirements.txt b/docker/parser/thirdparty-requirements.txt new file mode 100644 index 000000000..9981404d6 --- /dev/null +++ b/docker/parser/thirdparty-requirements.txt @@ -0,0 +1,3 @@ +nfv-heattranslator +nfv-toscaparser +nfv-parser diff --git a/functest/opnfv_tests/openstack/snaps/snaps_utils.py b/functest/opnfv_tests/openstack/snaps/snaps_utils.py index 956b104ac..c3cd6245e 100644 --- a/functest/opnfv_tests/openstack/snaps/snaps_utils.py +++ b/functest/opnfv_tests/openstack/snaps/snaps_utils.py @@ -16,7 +16,7 @@ def get_ext_net_name(os_creds): """ neutron = neutron_utils.neutron_client(os_creds) ext_nets = neutron_utils.get_external_networks(neutron) - return ext_nets[0].name + return ext_nets[0].name if ext_nets else "" def get_active_compute_cnt(os_creds): diff --git a/upper-constraints.txt b/upper-constraints.txt index f64c3e03b..0314dd26d 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -6,6 +6,9 @@ git+https://gerrit.opnfv.org/gerrit/sfc@stable/euphrates#egg=sfc -e git+https://gerrit.opnfv.org/gerrit/promise@stable/euphrates#egg=promise -e git+https://gerrit.opnfv.org/gerrit/doctor@stable/euphrates#egg=doctor-tests git+https://gerrit.opnfv.org/gerrit/domino@stable/euphrates#egg=domino +git+https://gerrit.opnfv.org/gerrit/parser@stable/euphrates#egg=nfv-heattranslator&subdirectory=tosca2heat/heat-translator +git+https://gerrit.opnfv.org/gerrit/parser@stable/euphrates#egg=nfv-toscaparser&subdirectory=tosca2heat/tosca-parser +-e git+https://gerrit.opnfv.org/gerrit/parser@stable/euphrates#egg=nfv-parser cloudify-rest-client===4.0 iniparse===0.4 openbaton-cli===2.2.1b7 |