From f617cbf76e7fe53f8ee7841a3c75f2fa2e8aa5ce Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 15 Nov 2017 19:53:01 +0100
Subject: Remove Domino and Promise testcases
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Domino and Promise won't participate in the Fraser Release [1].

[1] https://wiki.opnfv.org/display/SWREL/Projects+Intending+to+Participate+in+the+Fraser+Release

Change-Id: Ib06411769439015549cac9353fa92cebd2f61193
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
 docker/features/Dockerfile                  |  5 +----
 docker/features/testcases.yaml              | 34 -----------------------------
 docker/features/thirdparty-requirements.txt |  2 --
 docker/restapi/Dockerfile                   |  5 +----
 docker/restapi/thirdparty-requirements.txt  |  2 --
 5 files changed, 2 insertions(+), 46 deletions(-)

(limited to 'docker')

diff --git a/docker/features/Dockerfile b/docker/features/Dockerfile
index adcb5454f..1fb488297 100644
--- a/docker/features/Dockerfile
+++ b/docker/features/Dockerfile
@@ -5,7 +5,7 @@ ARG OPENSTACK_TAG=stable/pike
 ARG FDS_TAG=master
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
+RUN apk --no-cache add --update python3 sshpass && \
     apk --no-cache add --virtual .build-deps --update \
         python-dev python3-dev build-base linux-headers libffi-dev \
         openssl-dev libjpeg-turbo-dev && \
@@ -19,9 +19,6 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass && \
     python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
         -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
         doctor-tests && \
-    npm -g install npm@latest && \
-    # the next line must be uncommented as soon as promise is synced with pike
-    # (cd /src/promise/source && npm install) && \
     rm -r upper-constraints.txt thirdparty-requirements.txt /src/fds/.git && \
     apk del .build-deps
 COPY testcases.yaml /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml
diff --git a/docker/features/testcases.yaml b/docker/features/testcases.yaml
index 2c40a2906..a418164b9 100644
--- a/docker/features/testcases.yaml
+++ b/docker/features/testcases.yaml
@@ -7,23 +7,6 @@ tiers:
             Test suites from feature projects
             integrated in functest
         testcases:
-            -
-                case_name: promise
-                project_name: promise
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from Promise project.
-                dependencies:
-                    installer: '(fuel)|(joid)'
-                    scenario: ''
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_promise_tests.py'
-
             -
                 case_name: doctor-notification
                 project_name: doctor
@@ -73,23 +56,6 @@ tiers:
                     args:
                         cmd: 'run_sfc_tests.py'
 
-            -
-                case_name: domino-multinode
-                project_name: domino
-                enabled: false
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from Domino project.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_multinode.sh'
-
             -
                 case_name: barometercollectd
                 project_name: barometer
diff --git a/docker/features/thirdparty-requirements.txt b/docker/features/thirdparty-requirements.txt
index 62b2e9d62..4e729ea39 100644
--- a/docker/features/thirdparty-requirements.txt
+++ b/docker/features/thirdparty-requirements.txt
@@ -1,6 +1,4 @@
 # baro_tests
 # sdnvpn
 # sfc
-# promise
 # doctor-tests;python_version>='3.0'
-# domino
diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
index f36100129..dc0119a9e 100644
--- a/docker/restapi/Dockerfile
+++ b/docker/restapi/Dockerfile
@@ -10,7 +10,7 @@ ARG FDS_TAG=master
 ARG VIMS_TAG=stable
 
 COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
+RUN apk --no-cache add --update python3 sshpass \
         ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
         procps libxslt libxml2 zlib libffi && \
     apk --no-cache add --virtual .build-deps --update \
@@ -45,10 +45,7 @@ RUN apk --no-cache add --update nodejs nodejs-npm python3 sshpass \
     git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
     ln -s /src/tempest /src/refstack-client/.tempest && \
     virtualenv --system-site-packages /src/tempest/.venv && \
-    # the next line must be uncommented as soon as promise is synced with pike
-    # (cd /src/promise/source && npm install) && \
     (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
-    npm -g install npm@latest && \
     rm -r upper-constraints.txt thirdparty-requirements.txt /src/refstack-client/.git /src/odl_test/.git \
         /src/os-faults /src/rally /src/fds/.git /src/vims-test/.git && \
     apk del .build-deps
diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt
index 4f2c1e15f..893666473 100644
--- a/docker/restapi/thirdparty-requirements.txt
+++ b/docker/restapi/thirdparty-requirements.txt
@@ -1,6 +1,4 @@
 # baro_tests
 # sdnvpn
 # sfc
-# promise
 # doctor-tests;python_version>='3.0'
-# domino
-- 
cgit 1.2.3-korg