Merge "new project-csit for policy"

diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml
new file mode 100644 (file)
index 0000000..3261f5b
--- /dev/null
+++ b/jjb/policy/policy-csit-jobs.yaml
@@ -0,0 +1,61 @@
+- job-template:
+    name: '{project-name}-{stream}-project-csit-{functionality}'
+    disabled: '{disabled}'
+    project-type: freestyle
+    build-node: 'ubuntu1804-docker-8c-8g'
+    node: '{build-node}'
+    recipients: ''
+    java-version: 'openjdk11'
+    python-version: python3
+
+    properties:
+      - lf-infra-properties:
+          project: '{project}'
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-test-options:
+          test-options: '{functionality}'
+      - integration-unique-docker-tag:
+          unique-docker-tag: ''
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: '{build-timeout}'
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+    triggers:
+      - timed: '@daily'
+      - reverse:
+          jobs: '{obj:trigger_jobs}'
+
+    builders:
+      - lf-infra-pre-build
+      - lf-update-java-alternatives:
+          java-version: '{java-version}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-run-project-test
+
+    publishers:
+      - integration-project-robot:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - lf-infra-publish
+      - email:
+          recipients: '{recipients}'
+          notify-every-unstable-build: false
+          send-to-individuals: true
+

diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 91fc9ec..be3f5c8 100644 (file)
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -1,32 +1,30 @@
 - project:
-    name: policy-apex-pdp-csit
+    name: policy-api-project-csit
     jobs:
-      - '{project-name}-{stream}-verify-csit-{functionality}'
-      - '{project-name}-{stream}-csit-{functionality}'
-    project-name: 'policy'
-    java-version: openjdk11
-    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
+      - '{project-name}-{stream}-project-csit-{functionality}'
+    project-name: 'policy-api'
+    recipients: 'takamune.cho@att.com'
+    project: 'policy/docker'
     stream:
       - 'master':
-          branch: master
-      - 'frankfurt':
-          branch: frankfurt
+          branch: 'master'
       - 'guilin':
-          branch: guilin
+          branch: 'guilin'
+      - 'frankfurt':
+          branch: 'frankfurt'
     functionality:
-      - 'apex-pdp'
+      - 'api'
     trigger_jobs:
-      - 'policy-apex-pdp-{stream}-merge-java'
-    robot-options: ''
+      - 'policy-api-{stream}-merge-java'
 
 - project:
-    name: policy-distribution-csit
+    name: policy-apex-pdp-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
-    recipients: 'ram.krishna.verma@est.tech'
+    recipients: 'liam.fallon@est.tech ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -35,18 +33,19 @@
       - 'guilin':
           branch: guilin
     functionality:
-      - 'distribution'
+      - 'apex-pdp'
     trigger_jobs:
-      - 'policy-distribution-{stream}-merge-java'
+      - 'policy-apex-pdp-{stream}-merge-java'
     robot-options: ''
 
 - project:
-    name: policy-api-csit
+    name: policy-distribution-csit
     jobs:
       - '{project-name}-{stream}-verify-csit-{functionality}'
       - '{project-name}-{stream}-csit-{functionality}'
     project-name: 'policy'
     java-version: openjdk11
+    recipients: 'ram.krishna.verma@est.tech'
     stream:
       - 'master':
           branch: master
@@ -55,9 +54,9 @@
       - 'guilin':
           branch: guilin
     functionality:
-      - 'api'
+      - 'distribution'
     trigger_jobs:
-      - 'policy-api-{stream}-merge-java'
+      - 'policy-distribution-{stream}-merge-java'
     robot-options: ''
 
 - project: