From 95611ad4a2943831f710c32867d8636f03021346 Mon Sep 17 00:00:00 2001 From: Ajay Kumar Date: Mon, 5 Apr 2021 16:08:01 +0530 Subject: Add an Ansible driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It calls ansible_runner.interface.run() by converting the testcase description data to kwargs. It only overrides quiet and artifact_dir to implement the Xtesting behavior. Co-Authored-By: Cédric Ollivier Change-Id: Ifd09810400babc0f2b81f2c33edf55a3ed88807b Signed-off-by: Ajay kumar Signed-off-by: Cédric Ollivier --- docker/core/Dockerfile | 12 ++-- docker/core/testcases.yaml | 154 ++++++++++++++++++++++----------------------- 2 files changed, 84 insertions(+), 82 deletions(-) (limited to 'docker/core') diff --git a/docker/core/Dockerfile b/docker/core/Dockerfile index 70b194b8..45248ff2 100644 --- a/docker/core/Dockerfile +++ b/docker/core/Dockerfile @@ -4,12 +4,14 @@ ARG BRANCH=master ARG OPENSTACK_TAG=master RUN apk -U upgrade && \ - apk --no-cache add --update python3 py3-pip py3-wheel bash git mailcap libxml2 libxslt && \ + apk --no-cache add --update python3 py3-pip py3-wheel bash git mailcap libxml2 libxslt ansible && \ apk --no-cache add --virtual .build-deps --update \ - python3-dev build-base libxml2-dev libxslt-dev && \ + python3-dev build-base libxml2-dev libxslt-dev linux-headers && \ + wget -q -O- https://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt > upper-constraints.txt && \ + sed -i -E /^PyYAML==+.*$/d upper-constraints.txt && \ case $(uname -m) in aarch*|arm*) CFLAGS="-O0" \ pip3 install --no-cache-dir \ - -chttps://opendev.org/openstack/requirements/raw/branch/$OPENSTACK_TAG/upper-constraints.txt \ + -cupper-constraints.txt \ -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ lxml ;; esac && \ git init /src/functest-xtesting && \ @@ -17,10 +19,10 @@ RUN apk -U upgrade && \ 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 \ + -cupper-constraints.txt \ -chttps://git.opnfv.org/functest-xtesting/plain/upper-constraints.txt?h=$BRANCH \ /src/functest-xtesting && \ - rm -r /src/functest-xtesting && \ + rm -r /src/functest-xtesting upper-constraints.txt && \ 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 index f549e0c4..04d48ab1 100644 --- a/docker/core/testcases.yaml +++ b/docker/core/testcases.yaml @@ -1,80 +1,80 @@ --- tiers: - - - name: samples + - name: samples + description: '' + testcases: + - case_name: first + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false 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 + 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: true + clean_flag: false + description: '' + run: + name: behaveframework + args: + suites: + - /usr/lib/python3.8/site-packages/xtesting/samples/features + tags: + - foo + - case_name: eighth + project_name: xtesting + criteria: 100 + blocking: true + clean_flag: false + description: '' + run: + name: ansible + args: + private_data_dir: /usr/lib/python3.8/site-packages/xtesting/samples + playbook: helloworld.yml -- cgit 1.2.3-korg