Merge "Adding frnakfurt branch to DMaaP DR jobs"

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 2cec134..ea7bcaf 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -61,7 +61,7 @@
     project-name: 'demo'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/integration/integration-docker-compose.yaml b/jjb/integration/integration-docker-compose.yaml
index 3d1e8a2..852d5a1 100644 (file)
--- a/jjb/integration/integration-docker-compose.yaml
+++ b/jjb/integration/integration-docker-compose.yaml
@@ -7,7 +7,7 @@
       - 'master':
           branch: 'master'
     jobs:
-      - '{project-name}-{stream}-{subproject}-docker-compose-verify'
+      - integration-docker-compose-verify
     subproject:
       - 'netconf-pnp-simulator':
           pattern: 'test/mocks/netconf-pnp-simulator/modules/**'

diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml
index ac383fb..e434d0a 100644 (file)
--- a/jjb/integration/integration-templates-docker.yaml
+++ b/jjb/integration/integration-templates-docker.yaml
@@ -126,6 +126,7 @@
 
 - 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'

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 7d9ffed..61d09d7 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -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

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index 6e36576..5111c4d 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -83,7 +83,7 @@
     project-name: 'integration'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/integration/netconf-pnp-simulator-verify.sh b/jjb/integration/netconf-pnp-simulator-verify.sh
index 6fb7b82..28e8ae3 100644 (file)
--- a/jjb/integration/netconf-pnp-simulator-verify.sh
+++ b/jjb/integration/netconf-pnp-simulator-verify.sh
@@ -22,7 +22,7 @@ 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=( "INFO  [supervisor] success:" "entered RUNNING state" )
+DOCKER_COMPOSE_LOG_MSG=( "success:" "entered RUNNING state" )
 DOCKER_COMPOSE_SLEEP_INTERVAL=60
 
 if [ -z ${NETCONF_SIM_SERVICE_NAME} ];

diff --git a/jjb/integration/simulators/integration-dc-simulator.yaml b/jjb/integration/simulators/integration-dc-simulator.yaml
index 7d807dc..5b07413 100644 (file)
--- a/jjb/integration/simulators/integration-dc-simulator.yaml
+++ b/jjb/integration/simulators/integration-dc-simulator.yaml
@@ -14,7 +14,7 @@
     project-name: integration-simulators-dc-simulator
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml
index 664a0fa..09875f8 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -66,7 +66,7 @@
       project-name: integration-simulators-pnf-simulator
       python-version: python3
       jobs:
-          - '{project-name}-{stream}-{subproject}-lint'
+          - integration-linters
       subproject:
           - 'yaml':
                 tox-dir: '.'

diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 584d93f..895854a 100644 (file)
--- 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 fbf56a4..ce2743e 100644 (file)
--- 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
index 7f4d692..475b271 100644 (file)
--- a/jjb/integration/usecases/integration-usecases-mdons.yaml
+++ b/jjb/integration/usecases/integration-usecases-mdons.yaml
@@ -14,7 +14,7 @@
     project-name: integration-usecases-mdons
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'

diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml
index 7d0eb5d..58bab20 100644 (file)
--- a/jjb/testsuite/testsuite.yaml
+++ b/jjb/testsuite/testsuite.yaml
@@ -63,7 +63,7 @@
     project-name: 'testsuite'
     python-version: python3
     jobs:
-      - '{project-name}-{stream}-{subproject}-lint'
+      - integration-linters
     subproject:
       - 'yaml':
           tox-dir: '.'