Merge "Update lfit submodules"

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
deleted file mode 100644 (file)
index cc87b88..0000000
--- a/jjb/ccsdk/dashboard.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
----
-- project:
-    name: ccsdk-dashboard
-    project-name: 'ccsdk-dashboard'
-    jobs:
-      - gerrit-maven-verify
-      - gerrit-maven-merge:
-          cron: '@daily'
-      - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
-          cron: ''
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-      - 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-versions-plugin: true
-          cron: '@daily'
-
-    project: 'ccsdk/dashboard'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-dashboard-settings'
-    # due to a strange macro / variable translation problem this needs to be
-    # passed as a string block to properly get the properties correctly defined
-    # in the job
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-    mvn-snapshot-id: 'ecomp-snapshots'
-    nexus-snapshot-repo: 'snapshots'
-
-- project:
-    name: ccsdk-dashboard-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: centos7-redis-4c-4g
-    project: 'ccsdk/dashboard'
-    project-name: 'ccsdk-dashboard'
-    branch: 'master'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-dashboard-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: ccsdk-dashboard-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: 'ccsdk/dashboard'
-    project-name: 'ccsdk-dashboard'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-dashboard-settings'
-    build-node: centos7-redis-4c-4g
-
-- project:
-    name: ccsdk-dashboard-info
-    project-name: ccsdk-dashboard
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: ccsdk/dashboard
-    branch: master
-
-- project:
-    name: ccsdk-dashboard-whitesource
-    project-name: ccsdk-dashboard
-    jobs:
-      - gerrit-whitesource-scan
-    java-version: openjdk11
-    mvn-version: 'mvn36'
-    mvn-settings: 'ccsdk-dashboard-settings'
-    wss-product-name: ccsdk
-    mvn-clean-install: true
-    project: ccsdk/dashboard
-    branch: master

diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index aa40f29..dc2a206 100644 (file)
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -43,10 +43,12 @@
       - "{project-name}-{stream}-merge-helm":
           build_script: "{oom_build_script}"
           files: "**"
+          build-timeout: 480
       - "{project-name}-{stream}-release-helm":
           build_script: "{oom_build_script}"
           post_build_script: !include-raw-escape: shell/publish_helm_charts.sh
           files: "**"
+          build-timeout: 480
 
       # Below jobs disabled until future need.
       - "{project-name}-{subproject}-{stream}-verify-helm2":

diff --git a/jjb/optf/optf-cmso-csit.yaml b/jjb/optf/optf-cmso-csit.yaml
deleted file mode 100644 (file)
index 5c43473..0000000
--- a/jjb/optf/optf-cmso-csit.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-- project:
-     name: optf-cmso-csit
-     jobs:
-       - '{project-name}-{stream}-verify-csit-{functionality}'
-       - '{project-name}-{stream}-csit-{functionality}'
-     project-name: 'optf-cmso'
-     recipients: 'snarayanan@research.att.com'
-     stream:
-       - 'master':
-           branch: master
-     functionality:
-       - 'cmso':
-           trigger_jobs:
-     robot-options: ''
-     branch: 'master'

diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml
deleted file mode 100644 (file)
index 180872c..0000000
--- a/jjb/optf/optf-cmso.yaml
+++ /dev/null
@@ -1,89 +0,0 @@
----
-- project:
-    name: optf-project-view
-    project-name: optf
-    views:
-      - project-view
-
-- project:
-    name: optf-cmso
-    project-name: 'optf-cmso'
-    jobs:
-      - gerrit-maven-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: false
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          maven-versions-plugin: false
-          container-public-registry: 'nexus3.onap.org:10001'
-          container-staging-registry: 'nexus3.onap.org:10003'
-          mvn-params: '-Dmaven.test.skip=true -P docker'
-      - '{project-name}-{stream}-verify-java-checkstyle':
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-      - '{project-name}-{stream}-merge-properties-java':
-         mvn_properties:
-            - docker.pull.registry=nexus3.onap.org:10001
-            - docker.push.registry=nexus3.onap.org:10003
-      - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'optf/cmso'
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'optf-cmso-settings'
-    java-version: openjdk11
-
-    subproject:
-      - 'cmso':
-          path: '.'
-          pattern: '**'
-          pom: 'pom.xml'
-
-- project:
-    name: optf-cmso-sonar
-    jobs:
-      - gerrit-maven-sonar:
-          mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001  -DskipIntegrationTests=false'
-    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-docker-8c-8g
-    project: 'optf/cmso'
-    project-name: 'optf-cmso'
-    branch: 'master'
-    mvn-settings: 'optf-cmso-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    java-version: openjdk11
-
-- project:
-    name: optf-cmso-clm
-    jobs:
-      - gerrit-maven-clm:
-         mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001'
-    nexus-iq-namespace: 'onap-'
-    project: optf/cmso
-    project-name: 'optf-cmso'
-    build-node: ubuntu1804-docker-8c-8g
-    stream:
-      - 'master':
-          branch: 'master'
-      - 'honolulu':
-          branch: 'honolulu'
-    mvn-settings: 'optf-cmso-settings'
-    java-version: openjdk11
-
-- project:
-    name: optf-cmso-info
-    project-name: optf-cmso
-    jobs:
-      - gerrit-info-yaml-verify
-    build-node: centos7-builder-2c-1g
-    project: optf/cmso
-    branch: master

diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml
index d142a34..d03fee0 100644 (file)
--- a/jjb/so/so-csit.yaml
+++ b/jjb/so/so-csit.yaml
@@ -17,6 +17,9 @@
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
+      - 'Custom_Workflow':
+          branch: 'Custom_Workflow'
+          java-version: openjdk11
     functionality:
 # integration testing suites disabled until brought up to date,
 # see https://jira.onap.org/browse/SO-3632

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 6fae06b..a8d9971 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -35,6 +35,9 @@
       - 'honolulu':
           branch: 'honolulu'
           java-version: openjdk11
+      - 'Custom_Workflow':
+          branch: 'Custom_Workflow'
+          java-version: openjdk11
     mvn-settings: 'so-settings'
     files: '**'
     archive-artifacts: ''