aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrichomme <morgan.richomme@orange.com>2020-11-26 16:34:01 +0100
committermrichomme <morgan.richomme@orange.com>2020-11-26 16:34:01 +0100
commit7733d5abe3a42ffc865dccf38d07245a20cfd593 (patch)
treea82259331335a49a396390a4e284372828e5448b
parente98cb30e40b01b0dfcaa0a36140abed6e3c8082f (diff)
Cleanup xtesting frankfurt branchfrankfurt
remove unused directories Issue-ID: INT-1781 Signed-off-by: mrichomme <morgan.richomme@orange.com> Change-Id: I7eaae6d1dd90a9fd8ec6854930617bad55b9d8df
-rw-r--r--.gitreview3
-rw-r--r--benchmarking/README.md11
-rw-r--r--benchmarking/docker/Dockerfile33
-rw-r--r--benchmarking/docker/testcases.yaml26
-rw-r--r--benchmarking/requirements.txt14
-rwxr-xr-xbenchmarking/scripts/cmd.sh3
-rw-r--r--candidate-usecases/README.md26
-rw-r--r--candidate-usecases/docker/Dockerfile16
-rw-r--r--candidate-usecases/docker/testcases.yaml19
9 files changed, 1 insertions, 150 deletions
diff --git a/.gitreview b/.gitreview
index 9800f10..e1f6953 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,4 @@
host=gerrit.onap.org
port=29418
project=integration/xtesting
- defaultbranch=master
- \ No newline at end of file
+ defaultbranch=frankfurt
diff --git a/benchmarking/README.md b/benchmarking/README.md
deleted file mode 100644
index 3defbf8..0000000
--- a/benchmarking/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Security
-
-## Goal
-
-## Usage
-
-### Configuration
-
-### Command
-
-### Output
diff --git a/benchmarking/docker/Dockerfile b/benchmarking/docker/Dockerfile
deleted file mode 100644
index deed408..0000000
--- a/benchmarking/docker/Dockerfile
+++ /dev/null
@@ -1,33 +0,0 @@
-FROM opnfv/xtesting
-ARG OPENSTACK_TAG=master
-ARG OPNFV_TAG=master
-ARG ONAP_TAG=frankfurt
-ARG PIP_TAG=19.3.1
-
-ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils
-ENV TAG all
-
-COPY requirements.txt requirements.txt
-RUN apk --no-cache add --virtual .build-deps --update \
- python3-dev build-base linux-headers libffi-dev \
- openssl-dev libjpeg-turbo-dev && \
- git clone --depth 1 https://git.onap.org/testsuite -b $ONAP_TAG /var/opt/ONAP && \
- git clone --depth 1 https://git.onap.org/testsuite/python-testing-utils -b $ONAP_TAG /src/testing-utils && \
- git clone --depth 1 https://git.onap.org/demo -b $ONAP_TAG /src/demo && \
- pip3 install \
- -chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
- pip==$PIP_TAG && \
- pip3 install \
- -chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$OPNFV_TAG \
- -rrequirements.txt \
- -e /src/testing-utils/robotframework-onap && \
- mkdir -p /var/opt/ONAP/demo/heat && cp -Rf /src/demo/heat/vFW /var/opt/ONAP/demo/heat/ && \
- mkdir -p /demo/service_mapping && cp -Rf /src/demo/service_mapping /demo/ && \
- mkdir -p /var/opt/ONAP/demo/preload_data && cp -Rf /src/demo/preload_data /var/opt/ONAP/demo/ && \
- rm -r requirements.txt /src/testing-utils/.git /var/opt/ONAP/.git /src/demo && \
- cd / && ln -s /var/opt/ONAP/robot/ /robot && \
- apk del .build-deps
-
-COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
-COPY scripts/cmd.sh /
-CMD ["/cmd.sh"]
diff --git a/benchmarking/docker/testcases.yaml b/benchmarking/docker/testcases.yaml
deleted file mode 100644
index df165e8..0000000
--- a/benchmarking/docker/testcases.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-tiers:
- -
- name: benchmarking
- order: 1
- ci_loop: 'weekly'
- description: >-
- Set of basic Functional benchmarking tests.
- testcases:
- -
- case_name: stability72hr
- project_name: integration
- criteria: 100
- blocking: false
- description: >-
- run stability 72h test.
- run:
- name: 'robotframework'
- args:
- suites:
- - /var/opt/ONAP/robot/testsuites/vnf-orchestration.robot
- include:
- - stability72hr
- variablefile:
- - '/share/config/robot_properties.py'
- - '/share/config/integration_preload_parameters.py'
diff --git a/benchmarking/requirements.txt b/benchmarking/requirements.txt
deleted file mode 100644
index 434e5e3..0000000
--- a/benchmarking/requirements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-selenium
-requests>=2.20.0
-robotframework-selenium2library
-robotframework-databaselibrary
-robotframework-extendedselenium2library
-robotframework-requests
-robotframework-sshlibrary
-robotframework-ftplibrary
-deepdiff
-dnspython
-robotframework-httplibrary
-robotframework-archivelibrary
-pyyaml>=4.2b1
-json5
diff --git a/benchmarking/scripts/cmd.sh b/benchmarking/scripts/cmd.sh
deleted file mode 100755
index aeeffde..0000000
--- a/benchmarking/scripts/cmd.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-run_tests -t ${TAG} -r || true
diff --git a/candidate-usecases/README.md b/candidate-usecases/README.md
deleted file mode 100644
index 7f9e0b7..0000000
--- a/candidate-usecases/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Smoke use cases
-
-## Goal
-
-The goal of this docker is to run End to End use cases on ONAP in order to
-check the solution. The testcases defined in this docker MUST be PASS to
-validate the release.
-The test cases can be run using Robot framework or onap-test (ONAP python SDK).
-Bash, python and unit test drivers also exist. Additionnal drivers can be added
-but the Dockerfile must be adapted accordingly.
-
-The tests are:
-
-* basic_vm: it onboard/distribute/deploy a single Ubuntu VM in ONAP using
- VNF-API. The components used are SDC, SO, AA&I, SDNC.
-* freeradius_nbi: based on basic_vm, the instantiation part is done through the
- ONAP external API (NBI) module.
-* clearwater_ims: it consists in a full deployment of an clearwater vIMS in ONAP.
-
-## Usage
-
-### Configuration
-
-### Command
-
-### Output
diff --git a/candidate-usecases/docker/Dockerfile b/candidate-usecases/docker/Dockerfile
deleted file mode 100644
index 6b95d51..0000000
--- a/candidate-usecases/docker/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM opnfv/xtesting
-
-MAINTAINER Morgan Richomme <morgan.richomme@orange.com>
-
-ARG ONAP_TESTS_TAG=frankfurt
-
-RUN apk add --no-cache python3 git bash && \
- apk add --no-cache --virtual .build-deps libffi-dev python3-dev \
- gcc openssl-dev linux-headers musl-dev && \
- pip3 install --upgrade pip && \
- pip3 install --no-cache-dir \
- git+https://gitlab.com/Orange-OpenSource/onap-tests.git@$ONAP_TESTS_TAG#egg=onap_tests && \
- apk del .build-deps
-
-COPY docker/testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml
-CMD ["run_tests", "-t", "all"]
diff --git a/candidate-usecases/docker/testcases.yaml b/candidate-usecases/docker/testcases.yaml
deleted file mode 100644
index ee1dcfd..0000000
--- a/candidate-usecases/docker/testcases.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-tiers:
- -
- name: candidate-usecases
- order: 1
- description: >-
- ONAP E2E tests
- testcases:
- -
- case_name: 5g_son
- project_name: integration
- enabled: true
- criteria: 100
- blocking: false
- description: >-
- Test 5G SON use case
- dependencies:
- run:
- name: 5g_son