summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-csit.yaml13
-rw-r--r--jjb/dcaegen2/apod-analytics.yaml33
-rw-r--r--jjb/doc/doc-templates-rtd.yaml25
-rw-r--r--jjb/doc/doc.yaml11
-rw-r--r--jjb/holmes/holmes-common.yaml1
-rw-r--r--jjb/holmes/holmes-dsa.yaml1
-rw-r--r--jjb/holmes/holmes-engine-mgt.yaml1
-rw-r--r--jjb/holmes/holmes-rule-mgt.yaml1
-rw-r--r--jjb/msb/build-apigateway-docker-image.sh (renamed from jjb/msb/build-docker-image.sh)0
-rw-r--r--jjb/msb/build-discovery-docker-image.sh11
-rw-r--r--jjb/msb/msb-apigateway.yaml2
-rw-r--r--jjb/msb/msb-discovery.yaml6
-rw-r--r--jjb/policy/policy-common.yaml2
-rw-r--r--jjb/policy/policy-engine.yaml3
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml21
15 files changed, 114 insertions, 17 deletions
diff --git a/jjb/aai/aai-csit.yaml b/jjb/aai/aai-csit.yaml
new file mode 100644
index 000000000..41a6805f6
--- /dev/null
+++ b/jjb/aai/aai-csit.yaml
@@ -0,0 +1,13 @@
+---
+- project:
+ name: aai-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'aai'
+ stream: 'master'
+ functionality:
+ - 'search-data-service':
+ trigger_jobs:
+ robot-options: ''
+ branch: 'master'
diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml
new file mode 100644
index 000000000..d79679018
--- /dev/null
+++ b/jjb/dcaegen2/apod-analytics.yaml
@@ -0,0 +1,33 @@
+---
+- project:
+ name: dcaegen2-analytics
+
+ # job template iterators
+ project-name: 'dcaegen2-analytics'
+ stream:
+ - 'master':
+ branch: 'master'
+ - 'release-1.0.0':
+ branch: 'release-1.0.0'
+
+ # apply to all jobs
+ project: 'dcaegen2/analytics/tca'
+ mvn-settings: 'dcaegen2-analytics-tca-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+
+ jobs:
+ - '{project-name}-{stream}-release-java-daily':
+ mvn-goals-versioning:
+ 'versions:set versions:update-child-modules versions:commit'
+ mvn-goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}}'
+ maven-deploy-properties: |
+ deployAtEnd=true
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-verify-java-skip-tests':
+ mvn-goals: 'clean install'
+ - '{project-name}-{stream}-merge-java':
+ mvn-goals: 'clean deploy'
diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml
index 4f54322cd..ff5a75f98 100644
--- a/jjb/doc/doc-templates-rtd.yaml
+++ b/jjb/doc/doc-templates-rtd.yaml
@@ -9,8 +9,6 @@
# 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'
@@ -33,9 +31,15 @@
maven-version: '{maven-version}'
scm:
- - gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
+ - git:
+ credentials-id: '{jenkins-ssh-credential}'
+ url: '$GIT_BASE'
+ refspec: ''
choosing-strategy: 'gerrit'
+ branches:
+ - 'refs/heads/{branch}'
+ skip-tag: true
+ wipe-workspace: true
submodule-recursive: '{submodule-recursive}'
wrappers:
@@ -84,8 +88,6 @@
# 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'
@@ -108,11 +110,18 @@
maven-version: '{maven-version}'
scm:
- - gerrit-trigger-scm:
- refspec: '$GERRIT_REFSPEC'
+ - git:
+ credentials-id: '{jenkins-ssh-credential}'
+ url: '$GIT_BASE'
+ refspec: ''
choosing-strategy: 'gerrit'
+ branches:
+ - 'refs/heads/{branch}'
+ skip-tag: true
+ wipe-workspace: true
submodule-recursive: '{submodule-recursive}'
+
wrappers:
- infra-wrappers:
build-timeout: '{build-timeout}'
diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml
index 40d592240..b8c33dfa2 100644
--- a/jjb/doc/doc.yaml
+++ b/jjb/doc/doc.yaml
@@ -4,14 +4,15 @@
project-name: 'doc'
jobs:
- - '{project-name}-{stream}-verify-rtd':
- build-node: centos7-basebuild-4c-4g
- - '{project-name}-{stream}-merge-rtd'
+ - '{project-name}-{stream}-verify-rtd':
+ build-node: centos7-basebuild-4c-4g
+ - '{project-name}-{stream}-merge-rtd'
project: 'doc'
+
rtdproject: 'onap'
stream:
- - master:
- branch: 'master'
+ - master:
+ branch: 'master'
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml
index ebd8ef381..7a6f273fe 100644
--- a/jjb/holmes/holmes-common.yaml
+++ b/jjb/holmes/holmes-common.yaml
@@ -6,6 +6,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
project: 'holmes/common'
stream:
diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml
index f795f324c..8b5468611 100644
--- a/jjb/holmes/holmes-dsa.yaml
+++ b/jjb/holmes/holmes-dsa.yaml
@@ -6,6 +6,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
project: 'holmes/dsa'
stream:
diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml
index 3b18f85da..0e5c856e2 100644
--- a/jjb/holmes/holmes-engine-mgt.yaml
+++ b/jjb/holmes/holmes-engine-mgt.yaml
@@ -6,6 +6,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
project: 'holmes/engine-management'
stream:
diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml
index 01f553c23..cf4b5e0e1 100644
--- a/jjb/holmes/holmes-rule-mgt.yaml
+++ b/jjb/holmes/holmes-rule-mgt.yaml
@@ -6,6 +6,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily'
project: 'holmes/rule-management'
stream:
diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-apigateway-docker-image.sh
index 6ca48a2c7..6ca48a2c7 100644
--- a/jjb/msb/build-docker-image.sh
+++ b/jjb/msb/build-apigateway-docker-image.sh
diff --git a/jjb/msb/build-discovery-docker-image.sh b/jjb/msb/build-discovery-docker-image.sh
new file mode 100644
index 000000000..ae7f5a275
--- /dev/null
+++ b/jjb/msb/build-discovery-docker-image.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 *.*
+
+./build4docker.sh
+
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 54f178562..69042cb5f 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -14,7 +14,7 @@
docker-pom: 'pom.xml'
mvn-goals: 'install'
script:
- !include-raw-escape: 'build-docker-image.sh'
+ !include-raw-escape: 'build-apigateway-docker-image.sh'
project: 'msb/apigateway'
stream:
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index f35572caa..bb20c4b03 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -10,7 +10,11 @@
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
+ - '{project-name}-{stream}-docker-java-version-shell-daily':
+ docker-pom: 'pom.xml'
+ mvn-goals: 'install'
+ script:
+ !include-raw-escape: 'build-discovery-docker-image.sh'
project: 'msb/discovery'
stream:
- 'master':
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 9a2b7fdd8..53d6726e2 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -4,7 +4,7 @@
project-name: 'policy-common'
jobs:
- '{project-name}-{stream}-clm'
- - '{project-name}-{stream}-verify-java-skip-tests'
+ - '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-stage-site-java':
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index e50cffa90..e657192b4 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -7,7 +7,8 @@
build-node: 'ubuntu1604-basebuild-4c-4g'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily':
+ build-node: 'ubuntu1604-basebuild-4c-4g'
- '{project-name}-{stream}-stage-site-java':
build-node: 'ubuntu1604-basebuild-4c-4g'
site-pom: 'pom.xml'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
new file mode 100644
index 000000000..834d2a898
--- /dev/null
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -0,0 +1,21 @@
+---
+
+- project:
+ name: vfc-nfvo-catalog
+ project-name: 'vfc-nfvo-catalog'
+ project: 'vfc/nfvo/catalog'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'vfc-nfvo-catalog-settings'
+ subproject:
+ - 'catalog':
+ path: '.'
+ pattern: '**'
+ jobs:
+ - '{project-name}-{stream}-{subproject}-verify-python'
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-redis-4c-4g \ No newline at end of file