Remove opnfv/functest-restapi

REST api server should run on top of all Functest containers by
overriding the default command.

We can safely remove it and meet the Docker Slicing approach.

Change-Id: Ibcc56490c931ae701bd31c52650081a115183e22
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit aca4e83931aa48b633cbb399bd4e9f16d3acdb13)

diff --git a/.travis.yml b/.travis.yml
index f758937..c6c56b0 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -79,11 +79,6 @@ jobs:
         - REPO="${DOCKER_USERNAME}"
         - amd64_dirs="docker/vnf"
         - arm64_dirs=""
-    - script: sudo -E bash build.sh
-      env:
-        - REPO="${DOCKER_USERNAME}"
-        - amd64_dirs="docker/restapi"
-        - arm64_dirs=""
     - script: sudo -E bash build.sh
       env:
         - REPO="${DOCKER_USERNAME}"
@@ -120,11 +115,6 @@ jobs:
           --platforms linux/amd64 \
           --template ${DOCKER_USERNAME}/functest-vnf:ARCH-fraser \
           --target ${DOCKER_USERNAME}/functest-vnf:fraser
-    - script: >
-        sudo manifest-tool push from-args \
-          --platforms linux/amd64 \
-          --template ${DOCKER_USERNAME}/functest-restapi:ARCH-fraser \
-          --target ${DOCKER_USERNAME}/functest-restapi:fraser
     - script: >
         sudo manifest-tool push from-args \
           --platforms linux/amd64,linux/arm64 \

diff --git a/docker/restapi/Dockerfile b/docker/restapi/Dockerfile
deleted file mode 100644 (file)
index da6083f..0000000
--- a/docker/restapi/Dockerfile
+++ /dev/null
@@ -1,74 +0,0 @@
-FROM opnfv/functest-core:fraser
-
-ARG BRANCH=stable/fraser
-ARG OPENSTACK_TAG=stable/pike
-ARG ODL_TAG=85448c9d97b89989488e675b29b38ac42d8674e4
-ARG RALLY_TAG=stable/0.10
-ARG OS_FAULTS_TAG=0.1.16
-ARG REFSTACK_TARGET=2017.09
-ARG FDS_TAG=master
-ARG VIMS_TAG=stable
-ARG PATROLE_TAG=0.2.0
-
-COPY thirdparty-requirements.txt thirdparty-requirements.txt
-RUN apk --no-cache add --update python3 sshpass \
-        ruby ruby-bundler ruby-irb ruby-rdoc dnsmasq \
-        procps libxslt libxml2 zlib libffi go musl-dev && \
-    apk --no-cache add --virtual .build-deps --update \
-        python-dev python3-dev build-base linux-headers libffi-dev \
-        openssl-dev libjpeg-turbo-dev \
-        ruby-dev g++ make libxslt-dev libxml2-dev zlib-dev libffi-dev && \
-    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/ \
-        > upper-constraints.txt && \
-    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 && \
-    git clone --depth 1 https://github.com/openstack/os-faults.git -b $OS_FAULTS_TAG /src/os-faults && \
-    update-requirements -s --source /src/openstack-requirements /src/os-faults/ && \
-    git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
-    update-requirements -s --source /src/openstack-requirements /src/rally/ && \
-    git clone https://github.com/openstack/patrole.git /src/patrole && \
-    (cd /src/patrole && git checkout $PATROLE_TAG) && \
-    update-requirements -s --source /src/openstack-requirements /src/patrole/ && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        tempest /src/os-faults && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        oslotest /src/patrole /src/rally -rthirdparty-requirements.txt && \
-    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 && \
-    git clone https://git.opendaylight.org/gerrit/p/integration/test.git /src/odl_test && \
-    (cd /src/odl_test && git checkout $ODL_TAG) && \
-    git clone --depth 1 -b $FDS_TAG https://gerrit.opnfv.org/gerrit/fds /src/fds && \
-    git clone --depth 1 -b $VIMS_TAG https://github.com/boucherv-orange/clearwater-live-test /src/vims-test && \
-    virtualenv --system-site-packages /src/tempest/.venv --python=python2.7 && \
-    git clone https://github.com/RebacaInc/abot_charm.git /src/epc-requirements/abot_charm && \
-    python3 -m pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        juju-wait && \
-    go get github.com/rogpeppe/godeps && \
-    (cd /src/vims-test && bundle config build.nokogiri --use-system-libraries && bundle install --system) && \
-    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/neutron.git@$OPENSTACK_TAG#egg=neutron && \
-    pip install --no-cache-dir --src /src -cupper-constraints.txt \
-        -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
-        -r /src/neutron/test-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 db create && \
-    mkdir -p /home/opnfv/functest/data/refstack && \
-    wget "https://refstack.openstack.org/api/v1/guidelines/${REFSTACK_TARGET}/tests?target=compute&type=required&alias=true&flag=false" \
-        -O /home/opnfv/functest/data/refstack/defcore.txt && \
-    mkdir -p /etc/neutron /etc/glance && \
-    wget -q -O /etc/neutron/policy.json https://raw.githubusercontent.com/openstack/neutron/$OPENSTACK_TAG/etc/policy.json && \
-    wget -q -O /etc/glance/policy.json https://raw.githubusercontent.com/openstack/glance/$OPENSTACK_TAG/etc/policy.json && \
-    cp /usr/lib/python2.7/site-packages/functest/ci/testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci && \
-    rm -r upper-constraints.txt thirdparty-requirements.txt /src/odl_test/.git \
-        /src/os-faults /src/rally /src/fds/.git /src/vims-test/.git /src/epc-requirements/abot_charm/.git && \
-    apk del .build-deps
-EXPOSE 5000
-CMD ["functest_restapi"]

diff --git a/docker/restapi/hooks/post_checkout b/docker/restapi/hooks/post_checkout
deleted file mode 100644 (file)
index 8d0e981..0000000
--- a/docker/restapi/hooks/post_checkout
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
-sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
-
-exit $?

diff --git a/docker/restapi/thirdparty-requirements.txt b/docker/restapi/thirdparty-requirements.txt
deleted file mode 100644 (file)
index 73c11b4..0000000
--- a/docker/restapi/thirdparty-requirements.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-robotframework-httplibrary
-robotframework-requests
-robotframework-sshlibrary;python_version=='2.7'
-baro_tests
-sdnvpn
-sfc
-doctor-tests;python_version>='3.0'