summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/aai/aai-aai-config.yaml15
-rw-r--r--jjb/aai/aai-aai-data.yaml15
-rw-r--r--jjb/aai/aai-aai-service.yaml15
-rw-r--r--jjb/aai/aai-logging-service.yaml15
-rw-r--r--jjb/aai/aai-model-loader.yaml15
-rw-r--r--jjb/global-macros.yaml33
-rw-r--r--jjb/global-templates-java.yaml43
-rw-r--r--jjb/mso/mso.yaml7
8 files changed, 157 insertions, 1 deletions
diff --git a/jjb/aai/aai-aai-config.yaml b/jjb/aai/aai-aai-config.yaml
new file mode 100644
index 000000000..c477ad896
--- /dev/null
+++ b/jjb/aai/aai-aai-config.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: aai-aai-config
+ project-name: 'aai-aai-config'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'aai/aai-config'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-aai-config-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-aai-data.yaml b/jjb/aai/aai-aai-data.yaml
new file mode 100644
index 000000000..5e5632d41
--- /dev/null
+++ b/jjb/aai/aai-aai-data.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: aai-aai-data
+ project-name: 'aai-aai-data'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'aai/aai-data'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-aai-data-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-aai-service.yaml b/jjb/aai/aai-aai-service.yaml
new file mode 100644
index 000000000..f95e79c6c
--- /dev/null
+++ b/jjb/aai/aai-aai-service.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: aai-aai-service
+ project-name: 'aai-aai-service'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'aai/aai-service'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-aai-service-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
new file mode 100644
index 000000000..484028e39
--- /dev/null
+++ b/jjb/aai/aai-logging-service.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: aai-logging-service
+ project-name: 'aai-logging-service'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'aai/logging-service'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-logging-service-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
new file mode 100644
index 000000000..8d5f9399c
--- /dev/null
+++ b/jjb/aai/aai-model-loader.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: aai-model-loader
+ project-name: 'aai-model-loader'
+ jobs:
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+
+ project: 'aai/model-loader'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aai-model-loader-settings'
+ files: '**'
+ archive-artifacts: ''
diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml
index a9681033f..d8ced3498 100644
--- a/jjb/global-macros.yaml
+++ b/jjb/global-macros.yaml
@@ -20,6 +20,38 @@
- file-id: '{settings-file}'
variable: 'SETTINGS_FILE'
+- builder:
+ name: maven-docker-push-release
+ builders:
+ - maven-target:
+ maven-version: 'mvn33'
+ pom: '{pom}'
+ goals: 'clean deploy -P {profile-name} -B'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+ properties:
+ - maven.test.skip=true
+ - docker.pull.registry=nexus3.openecomp.org:10001
+ - docker.push.registry=nexus3.openecomp.org:10002
+
+- builder:
+ name: maven-docker-push-daily
+ builders:
+ - maven-target:
+ maven-version: 'mvn33'
+ pom: '{pom}'
+ goals: 'clean deploy -P {profile-name} -B'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+ properties:
+ - maven.test.skip=true
+ - docker.pull.registry=nexus3.openecomp.org:10001
+ - docker.push.registry=nexus3.openecomp.org:10003
+
# PARAMETERS
- parameter:
name: ecomp-infra-parameters
@@ -221,7 +253,6 @@
wipe-workspace: false
basedir: '{checkout-dir}'
-
# TRIGGERS
# This is a single macro to use for all jobs who vote on every (relevant) patch
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 039bc2ee1..370f616ea 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -303,3 +303,46 @@
# publishers:
# - ecomp-infra-shiplogs:
# maven-version: 'mvn33'
+
+- job-template:
+ name: '{project-name}-{stream}-docker-java-daily'
+ project-type: freestyle
+
+ properties:
+ - ecomp-infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - ecomp-infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+
+ - git-extra-project:
+ refspec: 'refs/heads/{extra-branch}'
+ project: '{extra-project}'
+ branch: '{extra-branch}'
+ checkout-dir: '{extra-checkout-dir}'
+
+ wrappers:
+ - ecomp-infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 11 AM UTC
+ - timed: 'H 12 * * *'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+ - maven-docker-push-daily:
+ profile-name: '{profile-name}'
+ mvn-settings: '{mvn-settings}'
+ pom: '{docker-pom}'
diff --git a/jjb/mso/mso.yaml b/jjb/mso/mso.yaml
index c007b0097..0496a5d88 100644
--- a/jjb/mso/mso.yaml
+++ b/jjb/mso/mso.yaml
@@ -1,4 +1,5 @@
---
+
- project:
name: mso
project-name: 'mso'
@@ -6,6 +7,12 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-docker-java-daily':
+ extra-project: '/mso/chef-repo'
+ extra-branch: 'master'
+ extra-checkout-dir: './packages/docker/src/main/docker/docker-files/chef-repo'
+ docker-pom: './packages/docker/src/main/docker/docker-files/chef-repo/pom.xml'
+ profile-name: 'docker'
project: 'mso'
stream: