Merge "Add jjb for integration/seccom repository"

diff --git a/global-jjb b/global-jjb
index 0c2d2ee..99e1a22 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit 0c2d2eea337b2700a7913d03aa5afd75d0c11b93
+Subproject commit 99e1a22608c6aa57ea78567683e98fcbcc9eb552

diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml
index 9f3b179..990545b 100644 (file)
--- a/jjb/aaf/aaf-certservice-csit.yaml
+++ b/jjb/aaf/aaf-certservice-csit.yaml
@@ -8,6 +8,8 @@
       stream:
           - "master":
                 branch: "master"
+          -  "frankfurt":
+                branch: "frankfurt"
       functionality:
           - "certservice":
                 trigger_jobs:

diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml
index 69a24a8..0fb6892 100644 (file)
--- a/jjb/aaf/aaf-certservice.yaml
+++ b/jjb/aaf/aaf-certservice.yaml
@@ -7,6 +7,9 @@
         -   'master':
                 branch: 'master'
                 java-version: openjdk11
+        -   'frankfurt':
+                branch: 'frankfurt'
+                java-version: openjdk11
     project: 'aaf/certservice'
     mvn-settings: 'aaf-certservice-settings'
     files: '**'

diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index 3813968..24e8d86 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -2,6 +2,7 @@
 - project:
     name: dcaegen2-platform-inventory-api
     project-name: 'dcaegen2-platform-inventory-api'
+    java-version: openjdk11
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
@@ -35,6 +36,7 @@
 
 - project:
     name: dcaegen2-platform-inventory-api-sonar
+    java-version: openjdk11
     jobs:
       - gerrit-maven-sonar
     sonarcloud: true

diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
old mode 100644 (file)
new mode 100755 (executable)
index 2791c37..55c5e90
--- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
+++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml
@@ -6,6 +6,7 @@
     stream:
       - 'master':
           branch: 'master'
+          java-version: openjdk11
       - 'frankfurt':
           branch: 'frankfurt'
     # apply to all jobs
@@ -47,6 +48,7 @@
     project: 'dcaegen2/services/pm-mapper'
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -60,6 +62,7 @@
     build-node: ubuntu1804-docker-8c-8g
     project-name: 'dcaegen2-services-pm-mapper'
     branch: 'master'
+    java-version: openjdk11
     mvn-settings: 'dcaegen2-services-pm-mapper-settings'
 
 - project:

diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 636c3d2..c714112 100644 (file)
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -18,8 +18,6 @@
     rtdproject: 'onap/58810/'
     mvn-settings: 'doc-settings'
     stream:
-      - master:
-          branch: 'master'
       - amsterdam:
           branch: 'amsterdam'
       - beijing:
@@ -30,8 +28,6 @@
           branch: 'dublin'
       - elalto:
           branch: 'elalto'
-      - frankfurt:
-          branch: 'frankfurt'
 
 - project:
     name: doc-info

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 61d09d7..622d523 100644 (file)
--- 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 ec0f970..481aca9 100644 (file)
--- a/jjb/integration/simulators/integration-pnf-simulator.yaml
+++ b/jjb/integration/simulators/integration-pnf-simulator.yaml
@@ -60,6 +60,22 @@
       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

diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml
new file mode 100644 (file)
index 0000000..6f496d5
--- /dev/null
+++ b/jjb/lf-infra-sandbox-3.yaml
@@ -0,0 +1,9 @@
+---
+- project:
+    name: sandbox-3
+    project-name: sandbox-3
+    jobs:
+      - gerrit-info-yaml-verify
+    build-node: centos7-builder-2c-1g
+    project: sandbox-3
+    branch: master

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
deleted file mode 100644 (file)
index 085788f..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-aai-context-builder
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - 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: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-aai-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-aai-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-aai-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#
-#    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder-sonar
-    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-builder-4c-4g
-    project: logging-analytics/pomba/pomba-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-aai-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-aai-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-aai-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-aai-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-aai-context-builder
-    project-name: logging-analytics-pomba-pomba-aai-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
deleted file mode 100644 (file)
index 0130f17..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-audit-common.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-audit-common
-    project-name: logging-analytics-pomba-pomba-audit-common
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-audit-common
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-- project:
-    name: logging-analytics-pomba-pomba-audit-common-sonar
-    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-builder-4c-4g
-    project: logging-analytics/pomba/pomba-audit-common
-    project-name: logging-analytics-pomba-pomba-audit-common
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: logging-analytics-pomba-pomba-audit-common-info
-    project-name: 'logging-analytics-pomba-pomba-audit-common'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-audit-common'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-audit-common-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-audit-common
-    project-name: logging-analytics-pomba-pomba-audit-common
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-audit-common-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
deleted file mode 100644 (file)
index 0fed024..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-context-aggregator.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator
-    project-name: logging-analytics-pomba-pomba-context-aggregator
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - 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: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-context-aggregator
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator-sonar
-    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-builder-4c-4g
-    project: logging-analytics/pomba/pomba-context-aggregator
-    project-name: logging-analytics-pomba-pomba-context-aggregator
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator-info
-    project-name: 'logging-analytics-pomba-pomba-context-aggregator'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-context-aggregator'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-context-aggregator-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-context-aggregator
-    project-name: logging-analytics-pomba-pomba-context-aggregator
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-context-aggregator-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
deleted file mode 100644 (file)
index bc760c0..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - 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: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-network-discovery-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#      - 'casablanca':
-#          branch: 'casablanca'
-#    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder-sonar
-    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-builder-4c-4g
-    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-network-discovery-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-network-discovery-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-network-discovery-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-network-discovery-context-builder
-    project-name: logging-analytics-pomba-pomba-network-discovery-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
deleted file mode 100644 (file)
index 17c4198..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml
+++ /dev/null
@@ -1,83 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdc-context-builder
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - 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: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-sdc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-    maven-version: 'mvn35'
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-sdc-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-sdc-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#    maven-version: 'mvn35'
-#
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder-sonar
-    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-builder-4c-4g
-    project: logging-analytics/pomba/pomba-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdc-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    maven-version: 'mvn35'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-sdc-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-sdc-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdc-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-sdc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdc-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings

diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
deleted file mode 100644 (file)
index 4b94f80..0000000
--- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
----
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - gerrit-maven-stage:
-          sign-artifacts: true
-          build-node: centos7-builder-4c-4g
-          maven-versions-plugin: true
-      - 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: '-Dmaven.test.skip=true -P docker'
-          maven-version: "mvn35"
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-builder-4c-4g
-
-#- project:
-#    name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-#    project-name: logging-analytics-pomba-pomba-arm64-sdnc-context-builder
-#    jobs:
-#      - '{project-name}-{stream}-docker-java-daily':
-#          docker-pom: 'pom.xml'
-#          mvn-profile: 'docker'
-#          mvn-params: '-Dmaven.test.skip=true'
-#    project: logging-analytics/pomba/pomba-sdnc-context-builder
-#    stream:
-#      - 'master':
-#          branch: 'master'
-#    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-#    files: '**'
-#    archive-artifacts: ''
-#    build-node: ubuntu1804-docker-arm64-4c-2g
-#
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar
-    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: 'H 11 * * *'
-    build-node: ubuntu1804-builder-4c-4g
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    branch: master
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-info
-    project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder'
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: 'logging-analytics/pomba/pomba-sdnc-context-builder'
-    branch: 'master'
-
-- project:
-    name: logging-analytics-pomba-pomba-sdnc-context-builder-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: logging-analytics/pomba/pomba-sdnc-context-builder
-    project-name: logging-analytics-pomba-pomba-sdnc-context-builder
-    branch: 'master'
-    mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings

diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index 9bc31df..9c2d057 100644 (file)
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -30,6 +30,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-sdc-workflow-designer-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 018a649..862447a 100644 (file)
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -55,6 +55,8 @@
           branch: 'master'
       - 'frankfurt':
           branch: 'frankfurt'
+      - 'elalto':
+          branch: 'elalto'
     mvn-settings: 'sdc-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
new file mode 100644 (file)
index 0000000..7a4ad4d
--- /dev/null
+++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+    name: testsuite-robot-utils-project-view
+    project-name: testsuite-robot-utils
+    views:
+      - project-view
+
+- project:
+    name: testsuite-robot-utils-info
+    project: testsuite/robot-utils
+    project-name: testsuite-robot-utils
+    build-node: centos7-builder-2c-1g
+    jobs:
+      - gerrit-info-yaml-verify