diff options
Diffstat (limited to 'jjb/integration')
-rw-r--r-- | jjb/integration/docker/integration-docker-onap-python.yaml | 63 | ||||
-rw-r--r-- | jjb/integration/integration-docker.yaml | 7 | ||||
-rw-r--r-- | jjb/integration/integration-macros.yaml | 1 | ||||
-rw-r--r-- | jjb/integration/integration-templates.yaml | 8 | ||||
-rw-r--r-- | jjb/integration/simulators/integration-pnf-simulator.yaml | 18 | ||||
-rw-r--r-- | jjb/integration/xtesting/info-integration-xtesting.yaml | 9 | ||||
-rw-r--r-- | jjb/integration/xtesting/integration-xtesting.yaml | 128 |
7 files changed, 217 insertions, 17 deletions
diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml new file mode 100644 index 000000000..505591c40 --- /dev/null +++ b/jjb/integration/docker/integration-docker-onap-python.yaml @@ -0,0 +1,63 @@ +--- +- project: + name: integration-docker-onap-python-info + project-name: integration-docker-onap-python + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/docker/onap-python + branch: master + +- project: + name: integration-docker-onap-python-linters + project: integration/docker/onap-python + project-name: integration-docker-onap-python + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' + +- project: + name: integration-docker-onap-python-release + project-name: 'integration-docker-onap-python' + project: 'integration/docker/onap-python' + mvn-settings: 'integration-settings' + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + +- project: + name: 'integration-docker-onap-python-docker' + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + project-name: 'integration-docker-onap-python' + project: 'integration/docker/onap-python' + stream: + - 'master': + branch: 'master' + files: '' + docker-name: 'onap/integration-python' + docker-build-args: '-f ./Dockerfile' + docker-root: '$WORKSPACE' + mvn-settings: 'integration-settings' + build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index c39ca2aba..b315bc443 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -17,16 +17,11 @@ pom: 'test/mocks/mass-pnf-sim/pnf-sim-lightweight/pom.xml' pattern: 'test/mocks/mass-pnf-sim/**' mvn-goals: 'clean package docker:build -Dcheckstyle.skip' - PNF_INSTANCES: 1 post-docker-verify-script: | #!/bin/bash set -ex # Fail build if any setup step fails cd $WORKSPACE/test/mocks/mass-pnf-sim - ./mass-pnf-sim.py --bootstrap {PNF_INSTANCES} --urlves http://127.0.0.1:10000/eventListener/v7 --ipfileserver 127.0.0.1 --typefileserver sftp --ipstart 10.11.0.16 - ./mass-pnf-sim.py --start {PNF_INSTANCES} - ./mass-pnf-sim.py --trigger {PNF_INSTANCES} - ./mass-pnf-sim.py --stop {PNF_INSTANCES} - ./mass-pnf-sim.py --clean + tox mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 99647507b..11680b6b0 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -64,6 +64,7 @@ sudo apt --yes install libxslt-dev libxml2-dev libvirt-dev zlib1g-dev ruby-dev vagrant vagrant plugin install vagrant-libvirt vagrant plugin install vagrant-disksize + vagrant plugin install vagrant-sshfs mkdir -p ~/.ssh - builder: diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 61d09d7d7..622d523a7 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -44,7 +44,7 @@ publishers: - lf-infra-publish -- job-template: +- job-template: &tox_verify_boilerplate # Job template for running linters against specific file formats # # Required Variables: @@ -98,3 +98,9 @@ publishers: - lf-infra-publish + +- job-template: + <<: *tox_verify_boilerplate + name: '{project-name}-{stream}-{subproject}-tox-verify' + id: integration-tox-verify + description: 'Job intended for running tox' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index d24b9df8d..481aca909 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -29,7 +29,7 @@ build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' + mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' - project: name: integration-simulators-pnf-simulator-sonar @@ -61,6 +61,22 @@ branch: master - project: + name: integration-simulators-pnf-simulator-cli + project: integration/simulators/pnf-simulator + project-name: integration-pnf-simulator + python-version: python3 + jobs: + - integration-tox-verify + subproject: + - 'simulator-cli': + tox-dir: 'simulator-cli' + tox-envs: 'pytest' + pattern: '**/*' + stream: + - 'master': + branch: 'master' + +- project: name: integration-simulators-pnf-simulator-linters project: integration/simulators/pnf-simulator project-name: integration-pnf-simulator diff --git a/jjb/integration/xtesting/info-integration-xtesting.yaml b/jjb/integration/xtesting/info-integration-xtesting.yaml deleted file mode 100644 index babd9f64f..000000000 --- a/jjb/integration/xtesting/info-integration-xtesting.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: integration-xtesting-info - project-name: integration-xtesting - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: integration/xtesting - branch: master diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml new file mode 100644 index 000000000..2065813c5 --- /dev/null +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -0,0 +1,128 @@ +--- +- project: + name: integration-xtesting-info + project-name: integration-xtesting + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/xtesting + branch: master + +- project: + name: integration-xtesting-linters + project: integration/xtesting + project-name: integration-xtesting + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' + +- project: + name: integration-xtesting-release + project-name: 'integration-xtesting' + project: 'integration/docker/onap-python' + mvn-settings: 'integration-settings' + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + +- project: + name: 'integration-xtesting-docker' + jobs: + - gerrit-docker-verify: + project-name: 'integration-xtesting-infra-healthcheck' + docker-root: ./infra-healthcheck + docker-name: 'onap/xtesting-infra-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-infra-healthcheck' + docker-root: ./infra-healthcheck + docker-name: 'onap/xtesting-infra-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-healthcheck' + docker-root: ./healthcheck + docker-name: 'onap/xtesting-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-healthcheck' + docker-root: ./healthcheck + docker-name: 'onap/xtesting-healthcheck' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-smoke-usecases-pythonsdk' + docker-root: ./smoke-usecases-pythonsdk + docker-name: 'onap/xtesting-smoke-usecases-pythonsdk' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-smoke-usecases-pythonsdk' + docker-root: ./smoke-usecases-pythonsdk + docker-name: 'onap/xtesting-smoke-usecases-pythonsdk' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-smoke-usecases-robot' + docker-root: ./smoke-usecases-robot + docker-name: 'onap/xtesting-smoke-usecases-robot' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-smoke-usecases-robot' + docker-root: ./smoke-usecases-robot + docker-name: 'onap/xtesting-smoke-usecases-robot' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-benchmarking' + docker-root: ./benchmarking + docker-name: 'onap/xtesting-benchmarking' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-benchmarking' + docker-root: ./benchmarking + docker-name: 'onap/xtesting-benchmarking' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-candidate-usecases' + docker-root: ./candidate-usecases + docker-name: 'onap/xtesting-candidate-usecases' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-candidate-usecases' + docker-root: ./candidate-usecases + docker-name: 'onap/xtesting-candidate-usecases' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-verify: + project-name: 'integration-xtesting-security' + docker-root: ./security + docker-name: 'onap/xtesting-security' + docker-build-args: '-f ./docker/Dockerfile' + - gerrit-docker-merge: + project-name: 'integration-xtesting-security' + docker-root: ./security + docker-name: 'onap/xtesting-security' + docker-build-args: '-f ./docker/Dockerfile' + project: 'integration/xtesting' + stream: + - 'master': + branch: 'master' + files: '' + docker-root: '$WORKSPACE' + mvn-settings: 'integration-settings' + build-node: ubuntu1804-docker-8c-8g |