summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/global-templates-java.yaml143
-rw-r--r--jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh10
-rw-r--r--jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh (renamed from jjb/vfc/build-nfvo-wfengine-docker-image.sh)3
-rw-r--r--jjb/vfc/vfc-nfvo-wfengine-java.yaml9
4 files changed, 157 insertions, 8 deletions
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 379429e8c..c8d566500 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1616,6 +1616,79 @@
maven-version: '{maven-version}'
- job-template:
+ name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily'
+ project-type: freestyle
+ node: 'ubuntu1604-docker-8c-8g'
+
+ 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: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 12 AM UTC
+ - timed: 'H 12 * * *'
+ - gerrit-trigger-release-manually:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+
+ builders:
+
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+
+ - inject:
+ properties-file: version.properties
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
+ properties:
+ - 'newVersion=${{release_version}}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ - docker-login
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: '{mvn-goals}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ - shell: '{script}'
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
name: '{project-name}-{stream}-docker-version-java-daily'
project-type: freestyle
node: 'ubuntu1604-docker-8c-8g'
@@ -1684,6 +1757,76 @@
maven-version: '{maven-version}'
- job-template:
+ name: '{project-name}-{stream}-{subproject}-docker-version-java-daily'
+ project-type: freestyle
+ node: 'ubuntu1604-docker-8c-8g'
+
+ 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: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 12 AM UTC
+ - timed: 'H 12 * * *'
+ - gerrit-trigger-release-manually:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+
+ builders:
+
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+
+ - inject:
+ properties-file: version.properties
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: 'versions:set versions:update-child-modules versions:commit -B'
+ properties:
+ - 'newVersion=${{release_version}}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ - docker-login
+
+ - maven-docker-push-daily:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ mvn-settings: '{mvn-settings}'
+ pom: '{docker-pom}'
+ # use default as mvn-profile if profile is not needed
+ mvn-profile: '{mvn-profile}'
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
name: '{project-name}-{stream}-aai-docker-java-daily'
project-type: freestyle
node: 'ubuntu1604-docker-8c-8g'
diff --git a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
new file mode 100644
index 000000000..495220f26
--- /dev/null
+++ b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+#
+echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
+
+CURRENTDIR="$(pwd)"
+echo $CURRENTDIR
+
+chmod 755 ./activiti-extension/src/main/docker/*.sh
+./activiti-extension/src/main/docker/activiti-docker-build_image.sh
+
diff --git a/jjb/vfc/build-nfvo-wfengine-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh
index de7d13bd1..3a27413df 100644
--- a/jjb/vfc/build-nfvo-wfengine-docker-image.sh
+++ b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh
@@ -5,9 +5,6 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
CURRENTDIR="$(pwd)"
echo $CURRENTDIR
-chmod 755 ./activiti-extension/src/main/docker/*.sh
-./activiti-extension/src/main/docker/activiti-docker-build_image.sh
-
chmod 755 ./wfenginemgrservice/src/main/docker/*.sh
./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh
diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
index 8759a56d0..b25c43922 100644
--- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml
+++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml
@@ -12,18 +12,17 @@
- 'engine-mgr-service':
pom: 'wfenginemgrservice/pom.xml'
pattern: 'wfenginemgrservice/**'
+ script: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh'
- 'engine-activiti-extension':
pom: 'activiti-extension/pom.xml'
pattern: 'activiti-extension/**'
+ script: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-version-java-daily'
- - '{project-name}-{stream}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- script:
- !include-raw-escape: 'build-nfvo-wfengine-docker-image.sh'
+ - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
+ mvn-goals: 'clean'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g