From 32eb7687bf7b8440aa87805480789ef61ae65ec9 Mon Sep 17 00:00:00 2001 From: Vincent Mahe Date: Mon, 25 May 2020 18:32:58 +0200 Subject: Add MTS driver It creates a new container xtesting-mts to avoid increase core container size. Signed-off-by: Vincent Mahe Change-Id: I59544023e1235747e140a442815778a133bf6acf --- docker/Dockerfile | 20 --------- docker/core/Dockerfile | 20 +++++++++ docker/core/testcases.yaml | 81 +++++++++++++++++++++++++++++++++++++ docker/mts/Dockerfile | 24 +++++++++++ docker/mts/mts-installer.properties | 2 + docker/mts/testcases.yaml | 26 ++++++++++++ docker/testcases.yaml | 81 ------------------------------------- 7 files changed, 153 insertions(+), 101 deletions(-) delete mode 100644 docker/Dockerfile create mode 100644 docker/core/Dockerfile create mode 100644 docker/core/testcases.yaml create mode 100644 docker/mts/Dockerfile create mode 100644 docker/mts/mts-installer.properties create mode 100644 docker/mts/testcases.yaml delete mode 100644 docker/testcases.yaml (limited to 'docker') diff --git a/docker/Dockerfile b/docker/Dockerfile deleted file mode 100644 index a5e3801e..00000000 --- a/docker/Dockerfile +++ /dev/null @@ -1,20 +0,0 @@ -FROM alpine:3.12 - -ARG BRANCH=master -ARG OPENSTACK_TAG=master - -RUN apk --no-cache add --update python3 py3-pip bash git mailcap && \ - apk --no-cache add --virtual .build-deps --update \ - python3-dev build-base && \ - git init /src/functest-xtesting && \ - (cd /src/functest-xtesting && \ - git fetch --tags https://gerrit.opnfv.org/gerrit/functest-xtesting $BRANCH && \ - git checkout FETCH_HEAD) && \ - pip3 install --no-cache-dir --src /src \ - -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ - -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ - /src/functest-xtesting && \ - rm -r /src/functest-xtesting && \ - apk del .build-deps -COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml -CMD ["run_tests", "-t", "all"] diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile new file mode 100644 index 00000000..58389734 --- /dev/null +++ b/docker/core/Dockerfile @@ -0,0 +1,20 @@ +FROM alpine:3.12 + +ARG BRANCH=master +ARG OPENSTACK_TAG=master + +RUN apk --no-cache add --update python3 py3-pip bash git mailcap libxml2 libxslt && \ + apk --no-cache add --virtual .build-deps --update \ + python3-dev build-base libxml2-dev libxslt-dev && \ + git init /src/functest-xtesting && \ + (cd /src/functest-xtesting && \ + git fetch --tags https://gerrit.opnfv.org/gerrit/functest-xtesting $BRANCH && \ + git checkout FETCH_HEAD) && \ + pip3 install --no-cache-dir --src /src \ + -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ + /src/functest-xtesting && \ + rm -r /src/functest-xtesting && \ + apk del .build-deps +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +CMD ["run_tests", "-t", "all"] diff --git a/docker/core/testcases.yaml b/docker/core/testcases.yaml new file mode 100644 index 00000000..7708a86c --- /dev/null +++ b/docker/core/testcases.yaml @@ -0,0 +1,81 @@ +--- +tiers: + - + name: samples + order: 1 + description: '' + testcases: + - + case_name: first + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false + description: '' + run: + name: 'first' + + - + case_name: second + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false + description: '' + run: + name: 'second' + + - + case_name: third + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false + description: '' + run: + name: 'bashfeature' + args: + cmd: 'echo -n Hello World; exit 0' + + - + case_name: fourth + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false + description: '' + run: + name: 'unit' + args: + name: 'xtesting.samples.fourth' + + - + case_name: fifth + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false + description: '' + run: + name: 'robotframework' + args: + suites: + - /usr/lib/python3.8/site-packages/xtesting/samples/HelloWorld.robot + variable: + - 'var01:foo' + - 'var02:bar' + + - + case_name: sixth + project_name: xtesting + criteria: 100 + blocking: false + clean_flag: false + description: '' + run: + name: 'behaveframework' + args: + suites: + - /usr/lib/python3.8/site-packages/xtesting/samples/features/ + tags: + - foo diff --git a/docker/mts/Dockerfile b/docker/mts/Dockerfile new file mode 100644 index 00000000..597e4f4b --- /dev/null +++ b/docker/mts/Dockerfile @@ -0,0 +1,24 @@ +FROM opnfv/xtesting + +ARG MTS_TAG=6.6.3 +ARG APP_FOLDER=/opt/mts +ARG MAVEN_OPTS= +ENV JAVA_HOME=/usr/lib/jvm/java-1.8-openjdk +ENV NGN_JAVA_HOME=${JAVA_HOME}/bin +ENV MAVEN_OPTS=$MAVEN_OPTS + +COPY mts-installer.properties /src/mts-installer.properties +RUN apk --no-cache add --update openjdk8-jre lksctp-tools libpcap && \ + apk --no-cache add --virtual .build-deps --update \ + libpcap-dev openjdk8 maven git && \ + git init /src/git-mts && \ + (cd /src/git-mts && \ + git fetch --tags https://github.com/ericsson-mts/mts $MTS_TAG && \ + git checkout FETCH_HEAD && \ + echo ${NGN_JAVA_HOME} > src/main/bin/java_home.release && \ + mvn versions:set -DnewVersion=${MTS_TAG} && mvn package && mvn install && \ + java -jar target/mts-${MTS_TAG}-installer.jar -options /src/mts-installer.properties) && \ + rm -rf /root/.m2/ ${APP_FOLDER}/tutorial /src/mts-installer.properties /src/git-mts && \ + apk del .build-deps +COPY testcases.yaml /usr/lib/python3.8/site-packages/xtesting/ci/testcases.yaml +CMD ["run_tests", "-t", "all"] diff --git a/docker/mts/mts-installer.properties b/docker/mts/mts-installer.properties new file mode 100644 index 00000000..fe4e030f --- /dev/null +++ b/docker/mts/mts-installer.properties @@ -0,0 +1,2 @@ +INSTALL_PATH=/opt/mts +java_memory=1024 diff --git a/docker/mts/testcases.yaml b/docker/mts/testcases.yaml new file mode 100644 index 00000000..40bb46d8 --- /dev/null +++ b/docker/mts/testcases.yaml @@ -0,0 +1,26 @@ +--- +tiers: + - + name: samples + order: 1 + description: '' + testcases: + - + case_name: seventh + project_name: xtesting + enabled: true + criteria: 100 + blocking: true + clean_flag: false + description: 'Some MTS tests' + run: + name: 'mts' + args: + test_file: /usr/lib/python3.8/site-packages/xtesting/samples/mts/test.xml + testcases: + - Pause_5_sec + max_duration: 2 # in seconds + log_level: INFO + store_method: FILE + java_memory: 2048 + console: true diff --git a/docker/testcases.yaml b/docker/testcases.yaml deleted file mode 100644 index 7708a86c..00000000 --- a/docker/testcases.yaml +++ /dev/null @@ -1,81 +0,0 @@ ---- -tiers: - - - name: samples - order: 1 - description: '' - testcases: - - - case_name: first - project_name: xtesting - criteria: 100 - blocking: true - clean_flag: false - description: '' - run: - name: 'first' - - - - case_name: second - project_name: xtesting - criteria: 100 - blocking: true - clean_flag: false - description: '' - run: - name: 'second' - - - - case_name: third - project_name: xtesting - criteria: 100 - blocking: true - clean_flag: false - description: '' - run: - name: 'bashfeature' - args: - cmd: 'echo -n Hello World; exit 0' - - - - case_name: fourth - project_name: xtesting - criteria: 100 - blocking: true - clean_flag: false - description: '' - run: - name: 'unit' - args: - name: 'xtesting.samples.fourth' - - - - case_name: fifth - project_name: xtesting - criteria: 100 - blocking: true - clean_flag: false - description: '' - run: - name: 'robotframework' - args: - suites: - - /usr/lib/python3.8/site-packages/xtesting/samples/HelloWorld.robot - variable: - - 'var01:foo' - - 'var02:bar' - - - - case_name: sixth - project_name: xtesting - criteria: 100 - blocking: false - clean_flag: false - description: '' - run: - name: 'behaveframework' - args: - suites: - - /usr/lib/python3.8/site-packages/xtesting/samples/features/ - tags: - - foo -- cgit