Merge "Add INFO.yaml verify job"

diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 9b47fdc..a86ded7 100644 (file)
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -13,8 +13,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'demo-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml
index 98312bb..88aef7a 100644 (file)
--- a/jjb/global-templates-python.yaml
+++ b/jjb/global-templates-python.yaml
@@ -192,7 +192,7 @@
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: '@daily'
+      - timed: 'H */4 * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'

diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml
index f76f892..6c700fb 100644 (file)
--- a/jjb/integration/integration.yaml
+++ b/jjb/integration/integration.yaml
@@ -15,8 +15,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'beijing':
-          branch: 'beijing'
     mvn-settings: 'integration-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index 65820bf..bb62728 100644 (file)
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -4,14 +4,6 @@
     jobs:
       - 'lab-{job-name}'
     job-name:
-      - "windriver-beijing-heat-deploy":
-          job-desc: "Heat-based deployment into Wind River lab Integration-Stable tenant"
-      - "windriver-beijing-oom-deploy":
-          job-desc: "OOM-based deployment into Wind River lab Integration-Jenkins tenant"
-      - "tlab-beijing-heat-deploy":
-          job-desc: "Heat-based deployment into AT&T TLAB Integration-HEAT-Test tenant"
-      - "tlab-beijing-oom-deploy":
-          job-desc: "OOM-based deployment into AT&T TLAB Integration-OOM-Test tenant"
       - "windriver-heat-daily":
           job-desc: "Heat-based deployment into Wind River lab Integration-HEAT-Daily tenant"
       - "windriver-oom-daily":

diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
index 9a736da..3a704fa 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml
@@ -26,6 +26,7 @@
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+
 - project:
     name: vnfsdk-dovetail-integration-tox-sonar
     jobs:
@@ -38,3 +39,11 @@
     mvn-settings: 'vnfsdk-dovetail-integration-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-dovetail-integration-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/dovetail-integration'
+    project-name: 'vnfsdk-dovetail-integration'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml
index ec97de3..85e9b1b 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-functest.yaml
+++ b/jjb/vnfsdk/vnfsdk-functest.yaml
@@ -3,7 +3,7 @@
     name: vnfsdk-functest
     project-name: 'vnfsdk-functest'
     jobs:
-    - gerrit-maven-clm:
+    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - '{project-name}-{stream}-release-version-java-daily'
@@ -16,6 +16,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-functest-sonar
     jobs:
@@ -28,3 +29,11 @@
     mvn-settings: 'vnfsdk-functest-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-functest-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/functest'
+    project-name: 'vnfsdk-functest'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-ice-python.yaml b/jjb/vnfsdk/vnfsdk-ice-python.yaml
index a3ad7d3..223eeef 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ice-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-ice-python.yaml
@@ -29,6 +29,7 @@
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
+
 - project:
     name: vnfsdk-ice-docker
     project-name: 'vnfsdk-ice-docker'
@@ -50,6 +51,7 @@
           docker-pom: 'docker/pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
+
 - project:
     name: vnfsdk-ice-validation-scripts-tox-sonar
     jobs:
@@ -63,6 +65,7 @@
     mvn-settings: 'vnfsdk-ice-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
 - project:
     name: vnfsdk-ice-ice-server-tox-sonar
     jobs:
@@ -77,3 +80,10 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
+- project:
+    name: vnfsdk-ice-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/ice'
+    project-name: 'vnfsdk-ice'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml
index 9a7e2a1..e77fa78 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-lctest.yaml
+++ b/jjb/vnfsdk/vnfsdk-lctest.yaml
@@ -5,9 +5,16 @@
     jobs:
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-
     project-name: 'vnfsdk-lctest'
     stream:
       - 'master':
           branch: 'master'
     mvn-settings: 'vnfsdk-lctest-settings'
+
+- project:
+    name: vnfsdk-lctest-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/lctest'
+    project-name: 'vnfsdk-lctest'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml
new file mode 100644 (file)
index 0000000..71808ea
--- /dev/null
+++ b/jjb/vnfsdk/vnfsdk-model.yaml
@@ -0,0 +1,9 @@
+---
+- project:
+    name: vnfsdk-model
+    project: 'vnfsdk/model'
+    jobs:
+      - gerrit-info-yaml-verify
+    project-name: vnfsdk-model
+    branch: master
+    mvn-settings: vnfsdk-model-settings

diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index a0480d1..2ed1153 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -20,6 +20,7 @@
       - '{project-name}-{stream}-{subproject}-verify-python'
       - '{project-name}-{subproject}-python-staging-{stream}'
       - '{project-name}-{subproject}-python-release-{stream}'
+
 - project:
     name: vnfsdk-pkgtools-tox-sonar
     jobs:
@@ -32,3 +33,11 @@
     mvn-settings: 'vnfsdk-pkgtools-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-pkgtools-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/pkgtools'
+    project-name: 'vnfsdk-pkgtools'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml
index 0b07b10..debb979 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-refrepo.yaml
+++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml
@@ -3,7 +3,7 @@
     name: vnfsdk-refrepo
     project-name: 'vnfsdk-refrepo'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'
@@ -15,7 +15,6 @@
           docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml'
           mvn-profile: 'docker'
           mvn-params: '-Dmaven.test.skip=true'
-
     project: 'vnfsdk/refrepo'
     stream:
       - 'master':
@@ -24,6 +23,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-refrepo-sonar
     jobs:
@@ -36,3 +36,11 @@
     mvn-settings: 'vnfsdk-refrepo-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-refrepo-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/refrepo'
+    project-name: 'vnfsdk-refrepo'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 79b8573..7e85987 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -3,11 +3,10 @@
     name: vnfsdk-validation
     project-name: 'vnfsdk-validation'
     jobs:
-    - gerrit-maven-clm:
+    - gerrit-maven-clm
     - '{project-name}-{stream}-verify-java'
     - '{project-name}-{stream}-merge-java'
     - '{project-name}-{stream}-release-version-java-daily'
-
     project: 'vnfsdk/validation'
     stream:
       - 'master':
@@ -16,6 +15,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-validation-sonar
     jobs:
@@ -27,4 +27,12 @@
     branch: 'master'
     mvn-settings: 'vnfsdk-validation-settings'
     mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-validation-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/validation'
+    project-name: 'vnfsdk-validation'
+    branch: 'master'

diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
index ac77b77..37d5b9c 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml
+++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml
@@ -14,7 +14,6 @@
       - '{project-name}-{stream}-{subproject}-verify-java'
       - '{project-name}-{stream}-{subproject}-merge-java'
       - '{project-name}-{stream}-{subproject}-release-java-daily'
-
     project: 'vnfsdk/ves-agent'
     stream:
       - 'master':
@@ -23,6 +22,7 @@
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-builder-4c-4g
+
 - project:
     name: vnfsdk-ves-agent-sonar
     jobs:
@@ -36,3 +36,11 @@
     mvn-settings: 'vnfsdk-ves-agent-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+    name: vnfsdk-ves-agent-info
+    jobs:
+      - gerrit-info-yaml-verify
+    project: 'vnfsdk/ves-agent'
+    project-name: 'vnfsdk-ves-agent'
+    branch: 'master'