From d0be3bbd1e0f7f6ed8496aa7fe0eeb803d713f77 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Thu, 26 Nov 2020 16:22:21 +0100 Subject: Use guilin branches to buil guilin xtesting dockers Issue-ID: INT-1781 Signed-off-by: mrichomme Change-Id: I982652327a99a250fe127c7b31e2dd58614ddbfa --- .gitreview | 4 ++-- benchmarking/README.md | 11 ---------- benchmarking/docker/Dockerfile | 33 ------------------------------ benchmarking/docker/testcases.yaml | 26 ----------------------- benchmarking/requirements.txt | 14 ------------- benchmarking/scripts/cmd.sh | 3 --- candidate-usecases/README.md | 26 ----------------------- candidate-usecases/docker/Dockerfile | 16 --------------- candidate-usecases/docker/testcases.yaml | 19 ----------------- healthcheck/docker/Dockerfile | 2 +- infra-healthcheck/docker/Dockerfile | 4 ++-- security/docker/Dockerfile | 4 ++-- smoke-usecases-pythonsdk/docker/Dockerfile | 2 +- smoke-usecases-robot/docker/Dockerfile | 2 +- 14 files changed, 9 insertions(+), 157 deletions(-) delete mode 100644 benchmarking/README.md delete mode 100644 benchmarking/docker/Dockerfile delete mode 100644 benchmarking/docker/testcases.yaml delete mode 100644 benchmarking/requirements.txt delete mode 100755 benchmarking/scripts/cmd.sh delete mode 100644 candidate-usecases/README.md delete mode 100644 candidate-usecases/docker/Dockerfile delete mode 100644 candidate-usecases/docker/testcases.yaml diff --git a/.gitreview b/.gitreview index 9800f10..b9082e5 100644 --- a/.gitreview +++ b/.gitreview @@ -3,5 +3,5 @@ host=gerrit.onap.org port=29418 project=integration/xtesting - defaultbranch=master - \ No newline at end of file + defaultbranch=guilin + 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 4206b4c..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=master -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 b6dae67..0000000 --- a/candidate-usecases/docker/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM opnfv/xtesting - -MAINTAINER Morgan Richomme - -ARG ONAP_TESTS_TAG=master - -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 diff --git a/healthcheck/docker/Dockerfile b/healthcheck/docker/Dockerfile index bcaf378..2ab22fe 100644 --- a/healthcheck/docker/Dockerfile +++ b/healthcheck/docker/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/xtesting:jerma ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TAG=guilin ARG PIP_TAG=19.3.1 ENV PYTHONPATH $PYTHONPATH:/src/testing-utils/robotframework-onap/eteutils diff --git a/infra-healthcheck/docker/Dockerfile b/infra-healthcheck/docker/Dockerfile index f84f976..287823c 100644 --- a/infra-healthcheck/docker/Dockerfile +++ b/infra-healthcheck/docker/Dockerfile @@ -2,8 +2,8 @@ FROM opnfv/xtesting ARG KUBERNETES_VERSION="v1.15.11" ARG HELM_VERSION="v2.16.6" -ARG ONAP_TESTS_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TESTS_TAG=guilin +ARG ONAP_TAG=guilin # Install kubectl # Note: Latest version may be found on: diff --git a/security/docker/Dockerfile b/security/docker/Dockerfile index 413290d..0607f66 100644 --- a/security/docker/Dockerfile +++ b/security/docker/Dockerfile @@ -20,8 +20,8 @@ FROM opnfv/xtesting AS run ARG KUBERNETES_VERSION="v1.15.2" ARG HELM_VERSION="v2.14.1" -ARG ONAP_TAG=master -ARG ONAP_TESTS_TAG=master +ARG ONAP_TAG=guilin +ARG ONAP_TESTS_TAG=guilin # Install kubectl # Note: Latest version may be found on: diff --git a/smoke-usecases-pythonsdk/docker/Dockerfile b/smoke-usecases-pythonsdk/docker/Dockerfile index 0322774..8ae1a28 100644 --- a/smoke-usecases-pythonsdk/docker/Dockerfile +++ b/smoke-usecases-pythonsdk/docker/Dockerfile @@ -2,7 +2,7 @@ FROM opnfv/xtesting MAINTAINER Morgan Richomme -ARG ONAP_TESTS_TAG=master +ARG ONAP_TESTS_TAG=guilin RUN apk add --no-cache python3 git && \ apk add --no-cache --virtual .build-deps libffi-dev python3-dev \ diff --git a/smoke-usecases-robot/docker/Dockerfile b/smoke-usecases-robot/docker/Dockerfile index 5a614c0..a5dc966 100644 --- a/smoke-usecases-robot/docker/Dockerfile +++ b/smoke-usecases-robot/docker/Dockerfile @@ -4,7 +4,7 @@ MAINTAINER Morgan Richomme ARG OPENSTACK_TAG=master ARG OPNFV_TAG=master -ARG ONAP_TAG=master +ARG ONAP_TAG=guilin ARG PIP_TAG=20.1 ARG KUBERNETES_VERSION="v1.15.11" -- cgit 1.2.3-korg