summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--jjb/aaf/aaf-sms.yaml16
-rw-r--r--jjb/ccsdk/parent.yaml12
-rw-r--r--jjb/ccsdk/utils.yaml12
-rw-r--r--jjb/clamp/clamp.yaml4
-rw-r--r--jjb/global-templates-golang.yaml123
-rw-r--r--jjb/policy/policy-common.yaml23
-rw-r--r--jjb/policy/policy-docker.yaml5
-rw-r--r--jjb/policy/policy-drools-applications.yaml23
-rw-r--r--jjb/policy/policy-drools-pdp.yaml23
-rw-r--r--jjb/policy/policy-engine.yaml23
-rw-r--r--jjb/policy/policy-pdp.yaml2
-rw-r--r--jjb/sdnc/sdnc-adaptors.yaml36
-rw-r--r--jjb/sdnc/sdnc-core.yaml44
-rw-r--r--jjb/sdnc/sdnc-plugins.yaml12
14 files changed, 146 insertions, 212 deletions
diff --git a/jjb/aaf/aaf-sms.yaml b/jjb/aaf/aaf-sms.yaml
new file mode 100644
index 000000000..0cec0060d
--- /dev/null
+++ b/jjb/aaf/aaf-sms.yaml
@@ -0,0 +1,16 @@
+---
+- project:
+ name: aaf-sms
+ project-name: 'aaf-sms'
+ path: 'sms-service/src/sms'
+ jobs:
+ - '{project-name}-{stream}-verify-golang'
+ - '{project-name}-{stream}-merge-golang'
+ project: 'aaf/sms'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'aaf-sms-settings'
+ files: '**'
+ archive-artifacts: ''
+ build-node: ubuntu1604-basebuild-4c-4g \ No newline at end of file
diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml
index 1f76950ab..ac8024c1c 100644
--- a/jjb/ccsdk/parent.yaml
+++ b/jjb/ccsdk/parent.yaml
@@ -23,15 +23,3 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
-- project:
- name: ccsdk-parent-sonar
- jobs:
- - gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
- project: 'ccsdk/parent'
- project-name: 'ccsdk-parent'
- branch: 'master'
- mvn-settings: 'ccsdk-parent-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml
index f8203ac26..26d7b002e 100644
--- a/jjb/ccsdk/utils.yaml
+++ b/jjb/ccsdk/utils.yaml
@@ -23,15 +23,3 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
-- project:
- name: ccsdk-utils-sonar
- jobs:
- - gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
- project: 'ccsdk/utils'
- project-name: 'ccsdk-utils'
- branch: 'master'
- mvn-settings: 'ccsdk-utils-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml
index d648d4f36..847fcaf59 100644
--- a/jjb/clamp/clamp.yaml
+++ b/jjb/clamp/clamp.yaml
@@ -41,11 +41,11 @@
name: clamp-sonar
jobs:
- gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
+ build-node: ubuntu1604-docker-8c-8g
java-version: ''
project: 'clamp'
project-name: 'clamp'
branch: 'master'
mvn-settings: 'clamp-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml
new file mode 100644
index 000000000..73ebcd278
--- /dev/null
+++ b/jjb/global-templates-golang.yaml
@@ -0,0 +1,123 @@
+---
+- job-template:
+ # Job template for Golang verify jobs
+ #
+ # The purpose of this job template is to run:
+ # 1. make build
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+
+ name: '{project-name}-{stream}-verify-golang'
+ path: '$WORKSPACE'
+
+ project-type: freestyle
+ concurrent: true
+ node: '{build-node}'
+
+ 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}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: '$GERRIT_REFSPEC'
+ choosing-strategy: 'gerrit'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ - gerrit-trigger-patch-submitted:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '**'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ 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
+ export GOROOT=$WORKSPACE/go
+ export PATH=$PATH:$GOROOT/bin
+ cd $WORKSPACE/{path}
+ make build
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
+ # Job template for Golang merge jobs
+ #
+ # The purpose of this job template is to run:
+ # 1. make deploy
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+
+ name: '{project-name}-{stream}-merge-golang'
+ path: $WORKSPACE
+
+ project-type: freestyle
+ node: '{build-node}'
+
+ 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:
+ - gerrit-trigger-patch-merged:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+ files: '**'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ 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
+ export GOROOT=$PWD/go
+ export PATH=$PATH:$GOROOT/bin
+ cd $WORKSPACE/{path}
+ make deploy
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 779dbcec2..69922ed14 100644
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -21,27 +21,6 @@
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
- project:
- name: policy-common-release-1.0.0
- project-name: 'policy-common'
- jobs:
- - '{project-name}-{stream}-verify-java-skip-tests'
- - '{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: 'policy/common'
- stream:
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- - 'amsterdam':
- branch: 'amsterdam'
- mvn-settings: 'policy-common-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-4g
-- project:
name: policy-common-sonar
jobs:
- gerrit-maven-sonar
@@ -52,4 +31,4 @@
branch: 'master'
mvn-settings: 'policy-common-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml
index f2b19e4a0..0ee0c854f 100644
--- a/jjb/policy/policy-docker.yaml
+++ b/jjb/policy/policy-docker.yaml
@@ -16,16 +16,11 @@
mvn-goals: 'prepare-package'
script:
!include-raw-escape: 'include-raw-docker-release.sh'
- - '{project-name}-docker-image-blessing'
project: 'policy/docker'
stream:
- 'master':
branch: 'master'
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- - 'amsterdam':
- branch: 'amsterdam'
mvn-settings: 'policy-docker-settings'
files: '**'
archive-artifacts: ''
diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 93d277e25..da990ebd3 100644
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -21,27 +21,6 @@
archive-artifacts: ''
build-node: 'ubuntu1604-basebuild-4c-4g'
- project:
- name: policy-drools-applications-release-1.0.0
- project-name: 'policy-drools-applications'
- jobs:
- - '{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: 'policy/drools-applications'
- stream:
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- - 'amsterdam':
- branch: 'amsterdam'
- mvn-settings: 'policy-drools-applications-settings'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
-- project:
name: policy-drools-applications-sonar
jobs:
- gerrit-maven-sonar
@@ -52,4 +31,4 @@
branch: 'master'
mvn-settings: 'policy-drools-applications-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index ddf6fd1ca..a25d11ad6 100644
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -22,27 +22,6 @@
archive-artifacts: ''
build-node: 'ubuntu1604-basebuild-4c-4g'
- project:
- name: policy-drools-pdp-release-1.0.0
- project-name: 'policy-drools-pdp'
- jobs:
- - '{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: 'policy/drools-pdp'
- stream:
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- - 'amsterdam':
- branch: 'amsterdam'
- mvn-settings: 'policy-drools-pdp-settings'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
-- project:
name: policy-drools-pdp-sonar
jobs:
- gerrit-maven-sonar
@@ -53,4 +32,4 @@
branch: 'master'
mvn-settings: 'policy-drools-pdp-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml
index a66e006fc..9edcd1dbf 100644
--- a/jjb/policy/policy-engine.yaml
+++ b/jjb/policy/policy-engine.yaml
@@ -22,27 +22,6 @@
archive-artifacts: ''
build-node: 'ubuntu1604-basebuild-4c-4g'
- project:
- name: policy-engine-release-1.0.0
- project-name: 'policy-engine'
- jobs:
- - '{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: 'policy/engine'
- stream:
- - 'release-1.0.0':
- branch: 'release-1.0.0'
- - 'amsterdam':
- branch: 'amsterdam'
- mvn-settings: 'policy-engine-settings'
- files: '**'
- archive-artifacts: ''
- build-node: 'ubuntu1604-basebuild-4c-4g'
-- project:
name: policy-engine-sonar
jobs:
- gerrit-maven-sonar
@@ -53,4 +32,4 @@
branch: 'master'
mvn-settings: 'policy-engine-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/policy/policy-pdp.yaml b/jjb/policy/policy-pdp.yaml
index 1c7338966..821d5671b 100644
--- a/jjb/policy/policy-pdp.yaml
+++ b/jjb/policy/policy-pdp.yaml
@@ -30,4 +30,4 @@
branch: 'master'
mvn-settings: 'policy-pdp-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdnc/sdnc-adaptors.yaml b/jjb/sdnc/sdnc-adaptors.yaml
deleted file mode 100644
index 991ed9390..000000000
--- a/jjb/sdnc/sdnc-adaptors.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
----
-- project:
- name: sdnc-adaptors
- project-name: 'sdnc-adaptors'
- jobs:
- - gerrit-maven-clm:
- java-version: ''
- - '{project-name}-{stream}-verify-java-skip-tests'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'sdnc/adaptors'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdnc-adaptors-settings'
-
- # due to a strange macro / variable translation problem this needs to be
- # passed as a string block to properly get the properties correctly defined
- # in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
-- project:
- name: sdnc-adaptors-sonar
- jobs:
- - gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
- project: 'sdnc/adaptors'
- project-name: 'sdnc-adaptors'
- branch: 'master'
- mvn-settings: 'sdnc-adaptors-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdnc/sdnc-core.yaml b/jjb/sdnc/sdnc-core.yaml
deleted file mode 100644
index 090ea6b50..000000000
--- a/jjb/sdnc/sdnc-core.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-- project:
- name: sdnc-core
- project-name: 'sdnc-core'
- subproject:
- - 'rootpom':
- pom: 'rootpom/pom.xml'
- pattern: 'rootpom/**'
- jobs:
- - gerrit-maven-clm:
- java-version: ''
- - '{project-name}-{stream}-{subproject}-verify-java'
- - '{project-name}-{stream}-{subproject}-merge-java'
- - '{project-name}-{stream}-{subproject}-release-java-daily'
- - '{project-name}-{stream}-verify-java-skip-tests'
- - '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
-
- project: 'sdnc/core'
- stream:
- - 'master':
- branch: 'master'
- mvn-settings: 'sdnc-core-settings'
-
- # due to a strange macro / variable translation problem this needs to be
- # passed as a string block to properly get the properties correctly defined
- # in the job
- maven-deploy-properties: |
- deployAtEnd=true
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1604-basebuild-4c-2g
-- project:
- name: sdnc-core-sonar
- jobs:
- - gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
- project: 'sdnc/core'
- project-name: 'sdnc-core'
- branch: 'master'
- mvn-settings: 'sdnc-core-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdnc/sdnc-plugins.yaml b/jjb/sdnc/sdnc-plugins.yaml
index 06774de23..d4bb0178d 100644
--- a/jjb/sdnc/sdnc-plugins.yaml
+++ b/jjb/sdnc/sdnc-plugins.yaml
@@ -22,15 +22,3 @@
deployAtEnd=true
files: '**'
archive-artifacts: ''
-- project:
- name: sdnc-plugins-sonar
- jobs:
- - gerrit-maven-sonar
- build-node: ubuntu1604-basebuild-4c-4g
- java-version: ''
- project: 'sdnc/plugins'
- project-name: 'sdnc-plugins'
- branch: 'master'
- mvn-settings: 'sdnc-plugins-settings'
- mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'