diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2020-04-01 14:19:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-01 14:19:07 +0000 |
| commit | 4a08c3e6566eb832b096665b705f668bff52bb30 (patch) | |
| tree | 055d005628a67908de98ae40e06fde2d11d11395 /jjb | |
| parent | 13de7f3684d8a3a4f8f47fc5f16ce07881e9fedf (diff) | |
| parent | be24a931735158f1ec4e4608f448be21e38797ac (diff) | |
Merge "Move netconf-pnp-simulator project to integration-docker.yaml"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/integration/integration-docker.yaml | 22 | ||||
| -rw-r--r-- | jjb/integration/integration.yaml | 22 |
2 files changed, 22 insertions, 22 deletions
diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 1d105d762..3062b0013 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -22,3 +22,25 @@ mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' + +- 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 diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index ef112ea20..6e36576dd 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -78,28 +78,6 @@ 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' |