diff options
Diffstat (limited to 'jjb/integration')
18 files changed, 721 insertions, 65 deletions
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml deleted file mode 100644 index 071f81610..000000000 --- a/jjb/integration/docker/info-integration-docker.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: integration-docker-onap-java11-info - project-name: integration-docker-onap-java11 - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: integration/docker/onap-java11 - branch: master diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml new file mode 100644 index 000000000..4ad47ab95 --- /dev/null +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -0,0 +1,63 @@ +--- +- project: + name: integration-docker-onap-java11-info + project-name: integration-docker-onap-java11 + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/docker/onap-java11 + branch: master + +- project: + name: integration-docker-onap-java11-linters + project: integration/docker/onap-java11 + project-name: integration-docker-onap-java11 + 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-java11-release + project-name: 'integration-docker-onap-java11' + project: 'integration/docker/onap-java11' + mvn-settings: 'integration-settings' + jobs: + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + +- project: + name: 'integration-docker-onap-java11-docker' + jobs: + - gerrit-docker-verify + - gerrit-docker-merge + project-name: 'integration-docker-onap-java11' + project: 'integration/docker/onap-java11' + stream: + - 'master': + branch: 'master' + files: '' + docker-name: 'onap/integration-java11' + docker-build-args: '-f ./Dockerfile' + docker-root: '$WORKSPACE' + mvn-settings: 'integration-settings' + build-node: ubuntu1804-docker-8c-8g 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-compose.yaml b/jjb/integration/integration-docker-compose.yaml new file mode 100644 index 000000000..c3a2ab972 --- /dev/null +++ b/jjb/integration/integration-docker-compose.yaml @@ -0,0 +1,56 @@ +--- +- project: + name: integration-docker-compose + project-name: 'integration' + project: 'integration' + stream: + - 'master': + branch: 'master' + jobs: + - integration-docker-compose-verify + subproject: + - 'netconf-pnp-simulator': + pattern: 'test/mocks/netconf-pnp-simulator/modules/**' + docker_root: 'test/mocks/netconf-pnp-simulator/modules' + netconf_sim_service_name: 'netconf-pnp-simulator' + script: | + #!/bin/bash + cd $DOCKER_ROOT + docker-compose up -d + post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh + - 'emssimulator-swm-netconf': + pattern: 'test/mocks/emssimulator/swm-netconf/**' + docker_root: 'test/mocks/emssimulator/swm-netconf' + netconf_sim_service_name: 'ems-netconf-swm' + script: | + #!/bin/bash + cd $DOCKER_ROOT + docker-compose up -d + post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh + - 'pmsh-pnf-sim': + pattern: 'test/mocks/pmsh-pnf-sim/docker-compose/**' + docker_root: 'test/mocks/pmsh-pnf-sim/docker-compose' + netconf_sim_service_name: 'netopeer2' + script: | + #!/bin/bash + cd $DOCKER_ROOT + docker-compose up -d + post_script: !include-raw-escape: netconf-pnp-simulator-verify.sh + - 'datafilecollector-testharness': + pattern: 'test/mocks/datafilecollector-testharness/**' + docker_root: 'test/mocks/datafilecollector-testharness/simulator-group' + script: | + #!/bin/bash + cd $DOCKER_ROOT + ./prepare-images.sh + ./docker-compose-setup.sh + - 'prov-mns-provider': + pattern: 'test/mocks/prov-mns-provider/**' + docker_root: 'test/mocks/prov-mns-provider' + script: | + #!/bin/bash + cd $DOCKER_ROOT + docker build . -t prov-mns-provider + docker-compose up -d + cd src + tox diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 10660572b..b315bc443 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -3,8 +3,8 @@ name: integration-docker project-name: 'integration' jobs: - - '{project-name}-{stream}-{subproject}-docker-merge' - - '{project-name}-{stream}-{subproject}-docker-verify' + - integration-docker-merge + - integration-docker-verify project: 'integration' stream: - 'master': @@ -13,13 +13,43 @@ - 'sniroemulator': pom: 'test/mocks/sniroemulator/pom.xml' pattern: 'test/mocks/sniroemulator/**' - - 'pnfsimulator': - pom: 'test/mocks/pnfsimulator/pnfsimulator/pom.xml' - pattern: 'test/mocks/pnfsimulator/pnfsimulator/**' - - 'netconfsimulator': - pom: 'test/mocks/pnfsimulator/netconfsimulator/pom.xml' - pattern: 'test/mocks/pnfsimulator/netconfsimulator/**' + - 'mass-pnf-sim': + 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' + post-docker-verify-script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd $WORKSPACE/test/mocks/mass-pnf-sim + tox mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + +- project: + name: integration-netconf-pnp-simulator + project: integration + stream: + - 'master': + branch: 'master' + # Required by verifier + mvn-settings: 'integration-settings' + project-name: 'integration-netconf-pnp-simulator' + gerrit_trigger_file_paths: + - compare-type: ANT + pattern: 'test/mocks/netconf-pnp-simulator/engine/**' + docker-name: 'onap/integration/simulators/netconf-pnp-simulator' + docker-root: test/mocks/netconf-pnp-simulator/engine + container-tag-method: yaml-file + post_docker_build_script: | + #!/bin/bash + set -eux + cd "$DOCKER_ROOT" + # To simplify the references inside tox.ini and tests/settings.py + docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest + tox + build-node: centos7-docker-8c-8g + build-timeout: 20 + jobs: + - gerrit-docker-verify + - gerrit-docker-merge diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index aeb793f6f..11680b6b0 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -64,8 +64,14 @@ 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: + name: integration-docker-compose-logs + builders: + - shell: !include-raw: shell/docker-compose-logs.sh + - publisher: name: integration-robot publishers: @@ -75,3 +81,16 @@ unstable-threshold: '{unstable-if}' pass-threshold: '{pass-if}' only-critical: false + +- publisher: + name: integration-docker-compose-logs + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - FAILURE + - SUCCESS + - UNSTABLE + build-steps: + - integration-docker-compose-logs diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml new file mode 100644 index 000000000..30a356903 --- /dev/null +++ b/jjb/integration/integration-seccom.yaml @@ -0,0 +1,37 @@ +--- +- project: + name: integration-seccom-info + project-name: integration-seccom + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/seccom + branch: master + +- project: + name: integration-seccom-linters + project: integration/seccom + project-name: integration-seccom + 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' diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index a01e82f96..9c2682d43 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -1,9 +1,11 @@ --- - job-template: name: '{project-name}-{stream}-{subproject}-docker-merge' + id: integration-docker-merge project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' + mvn-goals: 'clean package docker:build docker:push' properties: - infra-properties: @@ -38,7 +40,6 @@ files: '{pattern}' builders: - - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -48,7 +49,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean package docker:build docker:push' + goals: '{mvn-goals}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -63,9 +64,12 @@ - job-template: name: '{project-name}-{stream}-{subproject}-docker-verify' + id: integration-docker-verify project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' + mvn-goals: 'clean package docker:build' + post-docker-verify-script: '' properties: - infra-properties: @@ -100,7 +104,6 @@ files: '{pattern}' builders: - - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' @@ -110,7 +113,7 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean package docker:build' + goals: '{mvn-goals}' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -118,8 +121,57 @@ properties: - docker.pull.registry=nexus3.onap.org:10001 - docker.push.registry=nexus3.onap.org:10003 + - shell: '{post-docker-verify-script}' publishers: - infra-shiplogs: maven-version: '{maven-version}' +- job-template: + name: '{project-name}-{stream}-{subproject}-docker-compose-verify' + id: integration-docker-compose-verify + project-type: freestyle + description: 'This job validates Docker Compose based projects' + node: 'ubuntu1804-docker-8c-8g' + docker_root: '$WORKSPACE' + post_script: '' + netconf_sim_service_name: '' + + parameters: + - lf-infra-parameters: + project: '{project}' + stream: '{stream}' + branch: '{branch}' + + properties: + - infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{pattern}' + + builders: + - inject: + properties-content: | + DOCKER_ROOT={docker_root} + NETCONF_SIM_SERVICE_NAME={netconf_sim_service_name} + - shell: '{script}' + - shell: '{post_script}' + + publishers: + - integration-docker-compose-logs + - lf-infra-publish diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 7d9ffed21..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: @@ -54,6 +54,7 @@ # pattern: List of file patterns to scan name: '{project-name}-{stream}-{subproject}-lint' + id: integration-linters project-type: freestyle description: 'Job intended for running linters with Tox and Coala' build-node: ubuntu1804-builder-4c-4g @@ -97,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/integration.yaml b/jjb/integration/integration.yaml index 62a0bed76..5b211d745 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -49,54 +49,41 @@ golangver: 'golang112' mvn-settings: 'integration-settings' archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g jobs: - - '{project-name}-{stream}-{subproject}-verify-golang': + - '{project-name}-{stream}-{subproject}-verify-golang' + subproject: + - 'test-security-k8s': + path: 'test/security/k8s' + pattern: '{path}/**' + build-node: ubuntu1804-builder-4c-4g script: | #!/bin/bash set -ex # Fail build if any setup step fails cd $WORKSPACE/{path} make test - subproject: - - 'test-security-k8s': - path: 'test/security/k8s' - pattern: '{path}/**' - 'test-security-sslendpoints': path: 'test/security/sslendpoints' pattern: '{path}/**' + build-node: ubuntu1804-docker-8c-8g + script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd $WORKSPACE/{path} + rm -rf $WORKSPACE/{path}/bin + make docker-build + make test + make clean stream: - 'master': branch: 'master' - project: - name: integration-netconf-pnp-simulator - project: integration - stream: - - 'master': - branch: 'master' - # Required by verifier - mvn-settings: 'integration-settings' - project-name: 'integration-netconf-pnp-simulator' - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'test/mocks/netconf-pnp-simulator/engine/**' - docker-name: 'onap/integration/simulators/netconf-pnp-simulator' - docker-root: test/mocks/netconf-pnp-simulator/engine - container-tag-method: yaml-file - post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh - build-node: centos7-docker-8c-8g - build-timeout: 20 - jobs: - - gerrit-docker-verify - - gerrit-docker-merge - -- project: name: integration-linters project: 'integration' project-name: 'integration' python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' @@ -114,6 +101,14 @@ tox-dir: '.' tox-envs: 'py' pattern: '**/*.py' + - 'rst': + tox-dir: '.' + tox-envs: 'rst' + pattern: '**/*.rst' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' stream: - 'master': branch: 'master' diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh new file mode 100644 index 000000000..28e8ae3b6 --- /dev/null +++ b/jjb/integration/netconf-pnp-simulator-verify.sh @@ -0,0 +1,52 @@ +#!/bin/bash + +# Copyright 2020 Samsung Electronics Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +# Script verifies if all services in Netconf simulator's docker +# service container were launched successfully. + +echo "---> netconf-pnp-simulator-verify.sh" + +set -e # Exit with zero only if all commands succeed + +DOCKER_COMPOSE_LOG="/tmp/docker-compose.log" +DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" ) +DOCKER_COMPOSE_SLEEP_INTERVAL=60 + +if [ -z ${NETCONF_SIM_SERVICE_NAME} ]; +then + echo "ERROR: netconf-pnp-simulator service name not set." + exit 1 +fi + +pushd $DOCKER_ROOT + +# Dump container logs +sleep ${DOCKER_COMPOSE_SLEEP_INTERVAL} # Hang for a while so the services settle +docker-compose logs --no-color > ${DOCKER_COMPOSE_LOG} + +# Get the supervisord services running within container +supervisord_services=($(docker-compose exec -T ${NETCONF_SIM_SERVICE_NAME} /bin/sh -c \ + 'cat /etc/supervisord.conf /etc/supervisord.d/*' | grep -ho "program:[-a-zA-Z0-9]*" | cut -d: -f 2)) + +# Check all services are running and fail if not +for service in ${supervisord_services[@]}; +do + if ! grep -q "${DOCKER_COMPOSE_LOG_MSG[0]} $service ${DOCKER_COMPOSE_LOG_MSG[1]}" ${DOCKER_COMPOSE_LOG}; + then + echo "ERROR: Service $service is not running, failing the build." + exit 1 + fi +done diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml new file mode 100644 index 000000000..5b074135a --- /dev/null +++ b/jjb/integration/simulators/integration-dc-simulator.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: integration-simulators-dc-simulator-info + project-name: integration-simulators-dc-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/dc-simulator + branch: master + +- project: + name: integration-simulators-dc-simulator-linters + project: integration/simulators/dc-simulator + project-name: integration-simulators-dc-simulator + 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' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml new file mode 100644 index 000000000..481aca909 --- /dev/null +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -0,0 +1,106 @@ +--- +- project: + name: integration-simulators-pnf-simulator + project-name: integration-pnf-simulator + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + project: 'integration/simulators/pnf-simulator' + mvn-settings: 'integration-simulators-pnf-simulator-settings' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + jobs: + - '{project-name}-{stream}-verify-java': + mvn-goals: 'clean install' + - '{project-name}-{stream}-merge-java': + mvn-goals: 'clean deploy' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-goals: 'clean deploy' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + mvn-params: '-P docker,integration -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' + +- project: + name: integration-simulators-pnf-simulator-sonar + java-version: openjdk11 + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-docker-8c-8g + project: integration/simulators/pnf-simulator + project-name: integration-pnf-simulator + branch: 'master' + mvn-settings: 'integration-simulators-pnf-simulator-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + + +- project: + name: integration-simulators-pnf-simulator-info + project-name: integration-pnf-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/pnf-simulator + 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 + 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' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + stream: + - 'master': + branch: 'master' + diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 584d93f33..895854a55 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -14,7 +14,7 @@ project-name: integration-simulators-ran-simulator python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml index fbf56a4a6..ce2743e98 100644 --- a/jjb/integration/usecases/integration-usecases-bbs.yaml +++ b/jjb/integration/usecases/integration-usecases-bbs.yaml @@ -14,7 +14,7 @@ project-name: integration-usecases-bbs python-version: python3 jobs: - - '{project-name}-{stream}-{subproject}-lint' + - integration-linters subproject: - 'yaml': tox-dir: '.' diff --git a/jjb/integration/usecases/integration-usecases-mdons.yaml b/jjb/integration/usecases/integration-usecases-mdons.yaml new file mode 100644 index 000000000..475b27182 --- /dev/null +++ b/jjb/integration/usecases/integration-usecases-mdons.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: integration-usecases-mdons-info + project-name: integration-usecases-mdons + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/usecases/mdons + branch: master + +- project: + name: integration-usecases-mdons-linters + project: integration/usecases/mdons + project-name: integration-usecases-mdons + 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' + stream: + - 'master': + branch: 'master' 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 |