Merge "Change from Weekly to Daily run"

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index ac15e76..aee9a76 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -64,3 +64,18 @@
     mvn-settings: 'ccsdk-oran-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: ccsdk-oran-rtd
+    project-name: 'ccsdk-oran'
+    jobs:
+      - '{project-name}-rtd-jobs'
+    stream:
+      - 'master':
+          branch: 'master'
+      - 'guilin':
+          branch: 'guilin'
+    project: 'ccsdk/oran'
+    project-pattern: ccsdk/oran
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/onap-ccsdk-oran/133602/
+    rtd-token: 7346b9ecd6195ab86db1fcadd29662512edc86e1

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index d88fe02..6296ff1 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -21,14 +21,15 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'elalto':
-          branch: 'elalto'
     mvn-settings: 'integration-settings'
-    build-node: 'centos7-builder-4c-4g'
+    build-node: 'ubuntu1804-builder-4c-4g'
     subproject:
       - 'test-vcpe':
           path: 'test/vcpe'
           pattern: 'test/vcpe/**'
+      - 'ran-nssmf-simulator':
+          path: 'test/mocks/ran-nssmf-simulator'
+          pattern: 'test/mocks/ran-nssmf-simulator/**'
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
 

diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml
index 895854a..aea005d 100644 (file)
--- a/jjb/integration/simulators/integration-ran-simulator.yaml
+++ b/jjb/integration/simulators/integration-ran-simulator.yaml
@@ -1,4 +1,30 @@
 ---
+- project:
+      name: integration-simulators-ran-simulator
+      project-name: integration-simulators-ran-simulator
+      stream:
+          -   'master':
+                  branch: 'master'
+      project: 'integration/simulators/ran-simulator'
+      mvn-settings: 'integration-simulators-ran-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'
+
 - project:
     name: integration-simulators-ran-simulator-info
     project-name: integration-simulators-ran-simulator

diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index a3a0d60..ff4a3f8 100644 (file)
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -12,7 +12,7 @@
           - "certservice":
                 trigger_jobs:
                     - "oom-platform-cert-service-{stream}-merge-java"
-          - "truststoremerger":
+          - "postprocessor":
                 trigger_jobs:
                     - "oom-platform-cert-service-{stream}-merge-java"
       robot-options: ""