summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-champ.yaml6
-rw-r--r--jjb/aai/aai-esr-gui.yaml13
-rw-r--r--jjb/aai/aai-event-client.yaml13
-rw-r--r--jjb/aai/aai-sparky-fe.yaml12
-rw-r--r--jjb/ccsdk/distribution.yaml12
-rw-r--r--jjb/global-templates-golang.yaml4
-rw-r--r--jjb/oom/oom-registrator.yaml12
-rw-r--r--jjb/sdnc/sdnc-oam.yaml12
8 files changed, 21 insertions, 63 deletions
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index 527c0c6b3..ba37c2433 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -3,9 +3,13 @@
name: aai-champ
project-name: 'aai-champ'
jobs:
- - gerrit-maven-clm:
+ - gerrit-maven-clm
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-java-daily'
+ - '{project-name}-{stream}-aai-docker-java-daily':
+ pom: 'champ-service/pom.xml'
+ mvn-goals: 'docker:build'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
- '{project-name}-{stream}-stage-site-java':
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index aa0cd3ac4..f8324c4ca 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -19,15 +19,4 @@
docker-pom: 'pom.xml'
mvn-profile: docker
build-node: ubuntu1604-basebuild-4c-4g
-- project:
- name: aai-esr-gui-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'aai/esr-gui'
- project-name: 'aai-esr-gui'
- branch: 'master'
- mvn-settings: 'aai-esr-gui-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml
index c47d72fa4..6133cbeb6 100644
--- a/jjb/aai/aai-event-client.yaml
+++ b/jjb/aai/aai-event-client.yaml
@@ -16,3 +16,16 @@
mvn-settings: 'aai-event-client-settings'
files: '**'
archive-artifacts: ''
+
+- project:
+ name: aai-event-client-sonar
+ jobs:
+ - gerrit-maven-sonar
+ cron: 'H 11 * * *'
+ build-node: ubuntu1604-basebuild-4c-4g
+ project: 'aai/event-client'
+ project-name: 'aai-event-client'
+ branch: 'master'
+ mvn-settings: 'aai-event-client-settings'
+ mvn-goals: 'clean install'
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml
index 3f46ae14b..47e7f6f4e 100644
--- a/jjb/aai/aai-sparky-fe.yaml
+++ b/jjb/aai/aai-sparky-fe.yaml
@@ -16,15 +16,3 @@
mvn-settings: 'aai-sparky-fe-settings'
files: '**'
archive-artifacts: ''
-- project:
- name: aai-sparky-fe-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'aai/sparky-fe'
- project-name: 'aai-sparky-fe'
- branch: 'master'
- mvn-settings: 'aai-sparky-fe-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml
index cd4b11cd9..5072b999c 100644
--- a/jjb/ccsdk/distribution.yaml
+++ b/jjb/ccsdk/distribution.yaml
@@ -20,15 +20,3 @@
docker-pom: 'pom.xml'
mvn-profile: docker
build-node: ubuntu1604-docker-8c-8g
-- project:
- name: ccsdk-distribution-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'ccsdk/distribution'
- project-name: 'ccsdk-distribution'
- branch: 'master'
- mvn-settings: 'ccsdk-distribution-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
index 82eae4851..d3ceac5e2 100644
--- a/jjb/global-templates-golang.yaml
+++ b/jjb/global-templates-golang.yaml
@@ -111,8 +111,8 @@
settings-file: '{mvn-settings}'
- shell: |
#!/bin/bash
- curl -O https://dl.google.com/go/go1.9.4.linux-amd64.tar.gz
- tar -zxf go1.9.4.linux-amd64.tar.gz
+ curl -O https://dl.google.com/go/go1.10.linux-amd64.tar.gz
+ tar -zxf go1.10.linux-amd64.tar.gz
export GOROOT=$PWD/go
export PATH=$PATH:$GOROOT/bin
cd $WORKSPACE/{path}
diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml
index 8a39dd4d3..befce135d 100644
--- a/jjb/oom/oom-registrator.yaml
+++ b/jjb/oom/oom-registrator.yaml
@@ -20,15 +20,3 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
-- project:
- name: oom-registrator-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'oom/registrator'
- project-name: 'oom-registrator'
- branch: 'master'
- mvn-settings: 'oom-registrator-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml
index c35655170..e4bfb4c9a 100644
--- a/jjb/sdnc/sdnc-oam.yaml
+++ b/jjb/sdnc/sdnc-oam.yaml
@@ -20,15 +20,3 @@
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
-- project:
- name: sdnc-oam-sonar
- jobs:
- - gerrit-maven-sonar
- cron: 'H 11 * * *'
- build-node: ubuntu1604-basebuild-4c-4g
- project: 'sdnc/oam'
- project-name: 'sdnc-oam'
- branch: 'master'
- mvn-settings: 'sdnc-oam-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'