Merge "Remove stage-site-java template"

diff --git a/jjb/aaf/aaf-sshsm.yaml b/jjb/aaf/aaf-sshsm.yaml
index f48c2cf..5908627 100644 (file)
--- a/jjb/aaf/aaf-sshsm.yaml
+++ b/jjb/aaf/aaf-sshsm.yaml
@@ -2,12 +2,17 @@
 - project:
     name: aaf-sshsm
     project-name: 'aaf-sshsm'
+    build-timeout: 60
+    project: 'aaf/sshsm'
     jobs:
       - gerrit-maven-clm
-    project: 'aaf/sshsm'
+      - '{project-name}-{stream}-verify-c':
+         script:
+            !include-raw-escape: 'build-sshsm.sh'
     stream:
       - 'master':
           branch: 'master'
+
     mvn-settings: 'aaf-sshsm-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/aaf/build-sshsm.sh b/jjb/aaf/build-sshsm.sh
new file mode 100644 (file)
index 0000000..e26d44b
--- /dev/null
+++ b/jjb/aaf/build-sshsm.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+#
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+echo 'Building the SoftHSMv2...'
+
+cd SoftHSMv2
+sh autogen.sh
+./configure
+make check
+cd ..
+
+echo 'Building the TPM2-Plugin...'
+
+cd TPM2-Plugin
+./bootstrap
+./configure
+make

diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index ad9b0d5..8273ba3 100644 (file)
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -28,6 +28,6 @@
     project: 'aai/search-data-service'
     project-name: 'aai-search-data-service'
     branch: 'master'
-    mvn-settings: 'aai-search-data-service'
+    mvn-settings: 'aai-search-data-service-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/global-jjb b/jjb/global-jjb
index 8e33e6a..90e4e82 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 8e33e6ab798cd57a383cb8871d973de3fce6340c
+Subproject commit 90e4e825b3d0ac5959122c50e457419ad0cfe137

diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml
new file mode 100644 (file)
index 0000000..fc89511
--- /dev/null
+++ b/jjb/global-templates-c.yaml
@@ -0,0 +1,51 @@
+---
+# vim: sw=2 ts=2 sts=2 et :
+
+- job-template:
+    #
+    # job template for build C/C++ project
+    #
+    # Required Variables:
+    #   script:         build script to execute
+    #
+
+    name: '{project-name}-{stream}-verify-c'
+    project-type: freestyle
+    node: '{build-node}'
+
+    properties:
+      - infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - infra-parameters:
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - maven-exec:
+          maven-version: '{maven-version}'
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          choosing-strategy: 'gerrit'
+          submodule-recursive: '{submodule-recursive}'
+
+    wrappers:
+      - infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - gerrit-trigger-patch-submitted:
+          server: '{server-name}'
+          project: '{project}'
+          branch: '{branch}'
+          files: '**'
+
+    builders:
+      - shell: '{script}'
+
+    publishers:
+      - infra-shiplogs:
+          maven-version: '{maven-version}'

diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 94644f2..aa26fbc 100644 (file)
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -30,3 +30,42 @@
     mvn-settings: 'logging-analytics-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+- project:
+    name: logging-analytics-pylog
+    project-name: 'logging-analytics-pylog'
+    project: 'logging-analytics'
+    python-version: python3
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'logging-analytics-settings'
+    subproject:
+      - 'pylog':
+          pom: 'pylog/pom.xml'
+          pattern: 'pylog/**'
+          tox-dir: pylog/
+          tox-envs: ''
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-java'
+      - '{project-name}-{stream}-{subproject}-merge-java'
+      - '{project-name}-{stream}-{subproject}-release-version-java-daily'
+      - '{project-name}-{subproject}-python-staging-{stream}'
+      - '{project-name}-{subproject}-python-release-{stream}'
+    files: '**'
+    archive-artifacts: ''
+    build-node: ubuntu1604-basebuild-4c-4g
+- project:
+    name: logging-analytics-pylog-python
+    project-name: 'logging-analytics-pylog'
+    project: 'logging-analytics'
+    stream:
+      - 'master':
+          branch: 'master'
+    mvn-settings: 'logging-analytics-settings'
+    build-node: 'ubuntu1604-basebuild-4c-4g'
+    subproject:
+      - 'pylog':
+          path: 'pylog'
+          pattern: 'pylog/**'
+    jobs:
+      - '{project-name}-{stream}-{subproject}-verify-python'

diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml
index 472be89..1bb3c71 100644 (file)
--- a/jjb/music/music-distributed-kv-store.yaml
+++ b/jjb/music/music-distributed-kv-store.yaml
@@ -4,7 +4,7 @@
     project-name: 'music-distributed-kv-store'
     path: 'src/dkv'
     jobs:
-      - gerrit-maven-clm
+      - gerrit-python-xc-clm
       - '{project-name}-{stream}-verify-golang'
       - '{project-name}-{stream}-merge-golang'
     project: 'music/distributed-kv-store'

diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index bbcb3d6..780d522 100644 (file)
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -3,7 +3,7 @@
     name: music
     project-name: 'music'
     jobs:
-      - gerrit-maven-clm:
+      - gerrit-maven-clm
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
       - '{project-name}-{stream}-release-version-java-daily'

diff --git a/jjb/optf/build-optf-has-docker-image.sh b/jjb/optf/build-optf-has-docker-image.sh
index d1405f4..6c93c8b 100644 (file)
--- a/jjb/optf/build-optf-has-docker-image.sh
+++ b/jjb/optf/build-optf-has-docker-image.sh
@@ -5,6 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
 CURRENTDIR="$(pwd)"
 echo $CURRENTDIR
 
-chmod 755 ./conductor/docker/*.*
+chmod 755 ./*.*
 
-./conductor/docker/build-dockers.sh
+./build-dockers.sh

diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 8681013..991b6d4 100644 (file)
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -55,15 +55,3 @@
     mvn-settings: 'vfc-nfvo-wfengine-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-- project:
-    name: vfc-nfvo-wfengine-sonar
-    jobs:
-      - gerrit-maven-sonar
-    cron: 'H 11 * * *'
-    build-node: ubuntu1604-basebuild-4c-4g
-    project: 'vfc/nfvo/wfengine'
-    project-name: 'vfc-nfvo-wfengine'
-    branch: 'master'
-    mvn-settings: 'vfc-nfvo-wfengine-settings'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'

diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
index dcfdc23..d8864cd 100644 (file)
--- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
+++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml
@@ -15,4 +15,5 @@
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
       - gerrit-maven-clm
+      - gerrit-python-xc-clm
       - '{project-name}-{stream}-{subproject}-verify-python'