summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/aai/aai-aai-common.yaml21
-rw-r--r--jjb/aai/aai-data-router.yaml19
-rw-r--r--jjb/aai/aai-esr-server.yaml21
-rw-r--r--jjb/aai/aai-logging-service.yaml16
-rw-r--r--jjb/aai/aai-model-loader.yaml20
-rw-r--r--jjb/aai/aai-resources.yaml22
-rw-r--r--jjb/aai/aai-rest-client.yaml16
-rw-r--r--jjb/aai/aai-router-core-service.yaml16
-rw-r--r--jjb/aai/aai-search-data-service.yaml19
-rw-r--r--jjb/aai/aai-sparky-be.yaml19
-rw-r--r--jjb/aai/aai-traversal.yaml24
-rw-r--r--jjb/ci-management/ci-management.yaml1
m---------jjb/global-jjb0
-rw-r--r--jjb/integration/integration-templates-csit.yaml2
-rw-r--r--jjb/lab/include-raw-lab-retrieve-logs.sh9
-rw-r--r--jjb/lab/lab-templates.yaml33
-rw-r--r--jjb/lab/lab.yaml3
-rw-r--r--jjb/msb/msb-apigateway.yaml3
-rw-r--r--jjb/msb/msb-discovery.yaml3
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml4
20 files changed, 252 insertions, 19 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index faf4ea5cd..421f4c6df 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-aai-common
+ name: aai-aai-common-master
project-name: 'aai-aai-common'
jobs:
- gerrit-maven-clm:
@@ -16,6 +16,25 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-aai-common-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-aai-common-releases
+ project-name: 'aai-aai-common'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+
+ project: 'aai/aai-common'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-aai-common-settings'
diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml
index ae83d7f80..8d1a83779 100644
--- a/jjb/aai/aai-data-router.yaml
+++ b/jjb/aai/aai-data-router.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-data-router
+ name: aai-data-router-master
project-name: 'aai-data-router'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-data-router-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-data-router-releases
+ project-name: 'aai-data-router'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/data-router'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-data-router-settings'
diff --git a/jjb/aai/aai-esr-server.yaml b/jjb/aai/aai-esr-server.yaml
index ba7003956..3a9f31c1d 100644
--- a/jjb/aai/aai-esr-server.yaml
+++ b/jjb/aai/aai-esr-server.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-esr-server
+ name: aai-esr-server-master
project-name: 'aai-esr-server'
jobs:
- gerrit-maven-clm:
@@ -14,6 +14,25 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-esr-server-settings'
+ files: '**'
+ archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: docker
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-esr-server-releases
+ project-name: 'aai-esr-server'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-docker-java-daily'
+
+ project: 'aai/esr-server'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-esr-server-settings'
diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml
index 948447db6..326b0c51a 100644
--- a/jjb/aai/aai-logging-service.yaml
+++ b/jjb/aai/aai-logging-service.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-logging-service
+ name: aai-logging-service-master
project-name: 'aai-logging-service'
jobs:
- gerrit-maven-clm:
@@ -12,6 +12,20 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-logging-service-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-logging-service-releases
+ project-name: 'aai-logging-service'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ project: 'aai/logging-service'
+ stream:
- 'release-1.0.0':
branch: 'release-1.0.0'
- 'amsterdam':
diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml
index 0b2381d7b..a75a7126c 100644
--- a/jjb/aai/aai-model-loader.yaml
+++ b/jjb/aai/aai-model-loader.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-model-loader
+ name: aai-model-loader-master
project-name: 'aai-model-loader'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,24 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-model-loader-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-model-loader-releases
+ project-name: 'aai-model-loader'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/model-loader'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-model-loader-settings'
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 6caccad3b..5bf70c882 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -19,6 +19,28 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-resources-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-resources-amsterdam
+ project-name: 'aai-resources'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-version-daily':
+ pom: 'aai-resources/pom.xml'
+ mvn-goals: 'docker:build docker:push'
+
+ project: 'aai/resources'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-resources-settings'
diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml
index c9dcd790b..0bd90eb0c 100644
--- a/jjb/aai/aai-rest-client.yaml
+++ b/jjb/aai/aai-rest-client.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-rest-client
+ name: aai-rest-client-master
project-name: 'aai-rest-client'
jobs:
- gerrit-maven-clm:
@@ -12,6 +12,20 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-rest-client-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-rest-client-releases
+ project-name: 'aai-rest-client'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ project: 'aai/rest-client'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-rest-client-settings'
diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml
index d454d8c86..4dd1c1f22 100644
--- a/jjb/aai/aai-router-core-service.yaml
+++ b/jjb/aai/aai-router-core-service.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-router-core
+ name: aai-router-core-master
project-name: 'aai-router-core'
jobs:
- gerrit-maven-clm:
@@ -12,6 +12,20 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-router-core-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-router-core-releases
+ project-name: 'aai-router-core'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ project: 'aai/router-core'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-router-core-settings'
diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml
index e6a67b694..05c43015c 100644
--- a/jjb/aai/aai-search-data-service.yaml
+++ b/jjb/aai/aai-search-data-service.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-search-data-service
+ name: aai-search-data-service-master
project-name: 'aai-search-data-service'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-search-data-service-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-search-data-service-releases
+ project-name: 'aai-search-data-service'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/search-data-service'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-search-data-service-settings'
diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml
index 80b159662..8fc52a8ae 100644
--- a/jjb/aai/aai-sparky-be.yaml
+++ b/jjb/aai/aai-sparky-be.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-sparky-be
+ name: aai-sparky-be-master
project-name: 'aai-sparky-be'
jobs:
- gerrit-maven-clm:
@@ -15,6 +15,23 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-sparky-be-settings'
+ files: '**'
+ archive-artifacts: ''
+- project:
+ name: aai-sparky-be-releases
+ project-name: 'aai-sparky-be'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'pom.xml'
+ mvn-goals: 'docker:build'
+ project: 'aai/sparky-be'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-sparky-be-settings'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index c8d8ec058..808d741eb 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -1,6 +1,6 @@
---
- project:
- name: aai-traversal
+ name: aai-traversal-master
project-name: 'aai-traversal'
jobs:
- gerrit-maven-clm:
@@ -19,6 +19,28 @@
stream:
- 'master':
branch: 'master'
+ mvn-settings: 'aai-traversal-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g
+- project:
+ name: aai-traversal-amsterdam
+ project-name: 'aai-traversal'
+ jobs:
+ - gerrit-maven-clm:
+ java-version: ''
+ - '{project-name}-{stream}-verify-java'
+ - '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-stage-site-java':
+ site-pom: 'pom.xml'
+ trigger-job: '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-aai-docker-java-version-daily':
+ pom: 'aai-traversal/pom.xml'
+ mvn-goals: 'docker:build docker:push'
+
+ project: 'aai/traversal'
+ stream:
- 'amsterdam':
branch: 'amsterdam'
mvn-settings: 'aai-traversal-settings'
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index c1dea93fe..56a6c585b 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -10,6 +10,7 @@
branch: 'master'
build-timeout: '60'
build-node: 'centos7-basebuild-2c-1g'
+ jjb-version: 2.0.0
- project:
name: packer-jobs
diff --git a/jjb/global-jjb b/jjb/global-jjb
-Subproject 064e85f576fecfaea7ec24ad6ebc10c32a1317d
+Subproject 779110b5cd63f3eabb63598a1be79d9b9ba8546
diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml
index 7bb16cb6b..1cd96b4cf 100644
--- a/jjb/integration/integration-templates-csit.yaml
+++ b/jjb/integration/integration-templates-csit.yaml
@@ -245,7 +245,6 @@
- integration-robot:
unstable-if: 0.0
pass-if: 100.0
- - lf-infra-publish
- testng:
pattern: archives/testng-results.xml
escape-test-description: true
@@ -264,3 +263,4 @@
keep-all: false
link-to-last-build: false
name: ExtentReport
+ - lf-infra-publish
diff --git a/jjb/lab/include-raw-lab-retrieve-logs.sh b/jjb/lab/include-raw-lab-retrieve-logs.sh
new file mode 100644
index 000000000..6335e49d7
--- /dev/null
+++ b/jjb/lab/include-raw-lab-retrieve-logs.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -xe -o pipefail
+
+echo Job triggered by $SRC_BUILD_URL
+echo Retriving logs from $LOG_DIR_URL
+
+rm -rf archives
+wget -r -nv -nd --no-parent -l 1 --reject="index.html*" -P archives "$LOG_DIR_URL"
+cat archives/console.log
diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml
index 12bc88bd9..6d37da5e0 100644
--- a/jjb/lab/lab-templates.yaml
+++ b/jjb/lab/lab-templates.yaml
@@ -2,4 +2,35 @@
- job-template:
name: 'lab-{lab-name}-{env-name}-{job-name}'
disabled: false
- project-type: externaljob
+ project-type: freestyle
+ build-node: ubuntu1604-basebuild-2c-1g
+ auth-token: lab
+
+ properties:
+ - lf-infra-properties:
+ project: 'integration'
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - string:
+ name: LOG_DIR_URL
+ description: 'URL for the log directory produced by the external job'
+ - string:
+ name: SRC_BUILD_URL
+ description: 'URL for the external Jenkins build triggering this build'
+
+ wrappers:
+ - lf-infra-wrappers:
+ build-timeout: '{build-timeout}'
+ jenkins-ssh-credential: '{jenkins-ssh-credential}'
+
+ builders:
+ - shell:
+ !include-raw:
+ - include-raw-lab-retrieve-logs.sh
+
+ publishers:
+ - integration-robot:
+ unstable-if: 0.0
+ pass-if: 100.0
+ - lf-infra-publish
diff --git a/jjb/lab/lab.yaml b/jjb/lab/lab.yaml
index fde9b7e79..550c2e780 100644
--- a/jjb/lab/lab.yaml
+++ b/jjb/lab/lab.yaml
@@ -6,7 +6,8 @@
lab-name:
- "windriver"
env-name:
- - "jenkins"
+ - "beijing-heat"
+ - "beijing-oom"
job-name:
- "deploy"
- "healthcheck"
diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml
index 1f65a3611..dce818193 100644
--- a/jjb/msb/msb-apigateway.yaml
+++ b/jjb/msb/msb-apigateway.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{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'
diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml
index 5b3899499..a3cc0d947 100644
--- a/jjb/msb/msb-discovery.yaml
+++ b/jjb/msb/msb-discovery.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- - '{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'
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 5351623dc..410fd75e6 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -18,6 +18,10 @@
path: 'ocata'
pattern: 'ocata/**'
pom: 'ocata/pom.xml'
+ - 'ocata_share':
+ path: 'ocata'
+ pattern: 'share/**'
+ pom: 'ocata/pom.xml'
- 'windriver':
path: 'windriver'
pattern: 'windriver/**'