summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml2
-rw-r--r--jjb/dmaap/dmaap-messagerouter.yaml3
-rw-r--r--jjb/doc/doc-post-rtd.sh9
-rw-r--r--jjb/doc/doc-templates-rtd.yaml143
-rw-r--r--jjb/doc/doc.yaml17
-rw-r--r--jjb/msb/build-docker-image.sh2
-rw-r--r--jjb/vfc/vfc-gvnfm-vnflcm-python.yaml2
-rw-r--r--jjb/vfc/vfc-nfvo-driver-ems-java.yaml6
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml23
9 files changed, 203 insertions, 4 deletions
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 3db9e4ac3..4589c4f4c 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -11,9 +11,11 @@
- 'datarouter-prov':
pom: 'datarouter-prov/pom.xml'
pattern: 'datarouter-prov/**'
+ mvn-goals: 'clean install'
- 'datarouter-node':
pom: 'datarouter-node/pom.xml'
pattern: 'datarouter-node/**'
+ mvn-goals: 'clean install'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
diff --git a/jjb/dmaap/dmaap-messagerouter.yaml b/jjb/dmaap/dmaap-messagerouter.yaml
index 7156f945e..a0c806e00 100644
--- a/jjb/dmaap/dmaap-messagerouter.yaml
+++ b/jjb/dmaap/dmaap-messagerouter.yaml
@@ -11,12 +11,15 @@
- 'Msgrtr':
pom: 'Msgrtr/pom.xml'
pattern: 'Msgrtr/**'
+ mvn-goals: 'clean install'
- 'dmaap':
pom: 'dmaap/pom.xml'
pattern: 'dmaap/**'
+ mvn-goals: 'clean install'
- 'dmaapClient':
pom: 'dmaapClient/pom.xml'
pattern: 'dmaapClient/**'
+ mvn-goals: 'clean install'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
diff --git a/jjb/doc/doc-post-rtd.sh b/jjb/doc/doc-post-rtd.sh
new file mode 100644
index 000000000..5c8d8c52f
--- /dev/null
+++ b/jjb/doc/doc-post-rtd.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+if [ "$GERRIT_BRANCH" == "master" ]; then
+ RTD_BUILD_VERSION=latest
+else
+ RTD_BUILD_VERSION="${{GERRIT_BRANCH/\//-}}"
+fi
+
+# shellcheck disable=SC1083
+curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/{rtdproject}
diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
new file mode 100644
index 000000000..4f54322cd
--- /dev/null
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -0,0 +1,143 @@
+---
+- job-template:
+ # Job template for verifying Sphinx/Restructured Text for RTD
+ #
+ # The purpose of this job template is verify documentation source
+ #
+ # Required Variables:
+ # branch: git branch
+ # Optional Variables:
+ # path: directory containing the project's tox.ini relative to
+ # the workspace. The default is the project root.
+ # pattern: ant file-path pattern relative to the workspace used to
+ # trigger the job
+
+ name: '{project-name}-{stream}-verify-rtd'
+ path: '$WORKSPACE'
+
+ project-type: freestyle
+ concurrent: true
+ 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: '**'
+ branch: '{branch}'
+ files: 'docs/**/*.rst'
+ - timed: 'H H * * *'
+
+ builders:
+ - shell: |
+ if [ "$GERRIT_PROJECT" != "doc" ]; then
+ cd docs/submodules/$GERRIT_PROJECT
+ git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
+ else
+ git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
+ fi
+ - shell: |
+ #!/bin/bash
+ virtualenv $WORKSPACE/venv-tox
+ source $WORKSPACE/venv-tox/bin/activate
+ pip install --upgrade pip
+ pip install --upgrade tox argparse
+ pip freeze
+ cd $WORKSPACE/{path}
+ tox
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
+ # Job template for merging/publishing Sphinx/Restructured Text at RTD
+ #
+ # The purpose of this job template is to trigger updates after
+ # a merge of documentation source in gerrit
+ #
+ # Required Variables:
+ # branch: git branch
+ # rtdproject: name of a project at readthedocs.io
+ # Optional Variables:
+ # path: directory containing the project's tox.ini relative to
+ # the workspace. The default is the project root.
+ # pattern: ant file-path pattern relative to the workspace used to
+ # trigger the job
+
+ name: '{project-name}-{stream}-merge-rtd'
+ path: '$WORKSPACE'
+
+ project-type: freestyle
+ concurrent: false
+ 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:
+ server-name: '{server-name}'
+ trigger-on:
+ - change-merged-event
+ - comment-added-contains-event:
+ comment-contains-value: 'remerge'
+ projects:
+ - project-compare-type: 'ANT'
+ project-pattern: '**'
+ branches:
+ - branch-compare-type: 'ANT'
+ branch-pattern: '**/{branch}'
+ file-paths:
+ - compare-type: ANT
+ pattern: docs/**/*.rst
+
+ builders:
+ - shell: !include-raw: doc-post-rtd.sh
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
new file mode 100644
index 000000000..40d592240
--- /dev/null
+++ b/jjb/doc/doc.yaml
@@ -0,0 +1,17 @@
+---
+- project:
+ name: doc
+ project-name: 'doc'
+
+ jobs:
+ - '{project-name}-{stream}-verify-rtd':
+ build-node: centos7-basebuild-4c-4g
+ - '{project-name}-{stream}-merge-rtd'
+
+ project: 'doc'
+
+ rtdproject: 'onap'
+
+ stream:
+ - master:
+ branch: 'master'
diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-docker-image.sh
index 9821bfca2..6ca48a2c7 100644
--- a/jjb/msb/build-docker-image.sh
+++ b/jjb/msb/build-docker-image.sh
@@ -7,4 +7,6 @@ echo $CURRENTDIR
chmod 755 *.*
+./build4basedocker.sh
./build4docker.sh
+
diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
index c4ed177f5..c58f5bfa1 100644
--- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml
@@ -8,7 +8,7 @@
- 'master':
branch: 'master'
mvn-settings: 'vfc-gvnfm-vnflcm-settings'
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-redis-4c-4g
subproject:
- 'lcm':
path: 'lcm'
diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
index e1a555446..8c38d48d2 100644
--- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
+++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml
@@ -9,9 +9,9 @@
branch: 'master'
mvn-settings: 'vfc-nfvo-driver-ems-settings'
subproject:
- - 'ems-driver-boco':
- pom: 'ems/ems/sems/boco/ems-driver/pom.xml'
- pattern: 'ems/ems/sems/boco/ems-driver/**'
+ - 'drv-ems-boco':
+ pom: 'ems/boco/pom.xml'
+ pattern: 'ems/boco/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
new file mode 100644
index 000000000..92f84827c
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -0,0 +1,23 @@
+---
+
+- project:
+ name: vfc-nfvo-wfengine
+ project-name: 'vfc-nfvo-wfengine'
+ project: 'vfc/nfvo/wfengine'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-wfengine-settings'
+ subproject:
+ - 'engine-mgr-service':
+ pom: 'wfenginemgrservice/pom.xml'
+ pattern: 'wfenginemgrservice/**'
+ - 'engine-activiti-extension':
+ pom: 'activiti-extension/pom.xml'
+ pattern: 'activiti-extension/**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-java'
+ - '{project-name}-{stream}-{subproject}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g