summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xjenkins-scripts/create_jenkins_user.sh6
-rwxr-xr-xjenkins-scripts/docker.sh15
-rwxr-xr-xjenkins-scripts/system_type.sh1
-rw-r--r--jjb/aai/aai-esr-gui.yaml6
-rw-r--r--jjb/demo/demo.yaml2
-rw-r--r--jjb/global-templates-java.yaml76
-rw-r--r--jjb/oparent/oparent.yaml2
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml3
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml1
-rw-r--r--jjb/vfc/vfc-gvnfm-vnfres-java.yaml1
-rw-r--r--jjb/vfc/vfc-nfvo-catalog.yaml3
-rw-r--r--jjb/vnfsdk/vnfsdk-lctest-csit.yaml13
-rw-r--r--jjb/vnfsdk/vnfsdk-validation.yaml3
13 files changed, 110 insertions, 22 deletions
diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
index 86a5c92d0..10e47091c 100755
--- a/jenkins-scripts/create_jenkins_user.sh
+++ b/jenkins-scripts/create_jenkins_user.sh
@@ -23,6 +23,12 @@ if [ "$?" == '0' ]
then
# Add jenkins user to docker group
usermod -a -G docker jenkins
+
+ # If /data exists it needs to be owned by jenkins
+ if [ -d /data ]
+ then
+ chown jenkins:jenkins /data
+ fi
fi
# Check if mock group exists
diff --git a/jenkins-scripts/docker.sh b/jenkins-scripts/docker.sh
new file mode 100755
index 000000000..e6b06a2ba
--- /dev/null
+++ b/jenkins-scripts/docker.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+# @License EPL-1.0 <http://spdx.org/licenses/EPL-1.0>
+##############################################################################
+# Copyright (c) 2016 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+
+# INT-216 add write permission to /data
+mkdir -p /data
+
+# vim: sw=2 ts=2 sts=2 et :
diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh
index 9aeea20d2..1482a20fe 100755
--- a/jenkins-scripts/system_type.sh
+++ b/jenkins-scripts/system_type.sh
@@ -15,6 +15,7 @@ SYSTEM_TYPE=''
IFS=','
for i in "basebuild,basebuild" \
+ "docker,docker" \
"centos,centos" \
"trusty,trusty" \
"xenial,xenial"
diff --git a/jjb/aai/aai-esr-gui.yaml b/jjb/aai/aai-esr-gui.yaml
index f62a5a063..d834a3c7b 100644
--- a/jjb/aai/aai-esr-gui.yaml
+++ b/jjb/aai/aai-esr-gui.yaml
@@ -7,9 +7,7 @@
- '{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-daily'
project: 'aai/esr-gui'
stream:
@@ -18,4 +16,6 @@
mvn-settings: 'aai-esr-gui-settings'
files: '**'
archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: docker
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml
index 71c74e40a..7e388552c 100644
--- a/jjb/demo/demo.yaml
+++ b/jjb/demo/demo.yaml
@@ -7,7 +7,7 @@
- '{project-name}-{stream}-clm'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'demo'
stream:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index a3f0a7655..5e69145a0 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -1494,6 +1494,82 @@
maven-version: '{maven-version}'
- job-template:
+ name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily'
+ project-type: freestyle
+ node: 'ubuntu1604-docker-8c-8g'
+ docker-image-name: ''
+
+ 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}'
+ - docker-image-name:
+ docker-image-name: '{docker-image-name}'
+
+ 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}'
+
+ - docker-login
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: 'pom.xml'
+ goals: 'clean install -DskipTests -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ - 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
+ properties:
+ - maven.test.skip=true
+ - docker.pull.registry=nexus3.onap.org:10001
+ - docker.push.registry=nexus3.onap.org:10003
+
+ - shell: !include-raw-escape: include-docker-push.sh
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
# Job template for Java daily release jobs
#
# The purpose of this job template is to run
diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml
index e758f06d4..548e9270d 100644
--- a/jjb/oparent/oparent.yaml
+++ b/jjb/oparent/oparent.yaml
@@ -12,7 +12,7 @@
- '{project-name}-{stream}-{subproject}-release-version2-java-daily'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
project: 'oparent'
stream:
- 'master':
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index a5830d797..9fb346bd2 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -7,6 +7,7 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-docker-java-daily'
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
@@ -18,4 +19,6 @@
mvn-settings: 'sdc-sdc-workflow-designer-settings'
files: '**'
archive-artifacts: ''
+ docker-pom: 'pom.xml'
+ mvn-profile: docker
build-node: ubuntu1604-basebuild-4c-4g
diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
index 05c01dd85..2aedb0faa 100644
--- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml
@@ -14,6 +14,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
index 02c95959a..22a103dad 100644
--- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
+++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml
@@ -15,6 +15,7 @@
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml
index 208e89ccb..ec079cd97 100644
--- a/jjb/vfc/vfc-nfvo-catalog.yaml
+++ b/jjb/vfc/vfc-nfvo-catalog.yaml
@@ -16,6 +16,7 @@
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
+ - '{project-name}-{stream}-release-version-java-daily-no-sonar'
- '{project-name}-{stream}-docker-java-version-shell-daily':
docker-pom: 'pom.xml'
mvn-goals: 'install'
@@ -23,4 +24,4 @@
!include-raw-escape: 'build-nfvo-catalog-docker-image.sh'
files: '**'
archive-artifacts: ''
- build-node: centos7-redis-4c-4g \ No newline at end of file
+ build-node: centos7-redis-4c-4g
diff --git a/jjb/vnfsdk/vnfsdk-lctest-csit.yaml b/jjb/vnfsdk/vnfsdk-lctest-csit.yaml
deleted file mode 100644
index 954cb35f5..000000000
--- a/jjb/vnfsdk/vnfsdk-lctest-csit.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
- name: vnfsdk-lctest-csit
- jobs:
- - '{project-name}-{stream}-verify-csit-{functionality}'
- - '{project-name}-{stream}-csit-{functionality}'
- project-name: 'vnfsdk-lctest'
- stream: 'master'
- functionality:
- - 'sanity-check':
- trigger_jobs:
- robot-options: ''
- branch: 'master'
diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml
index 39135eb50..b3e2cbdbc 100644
--- a/jjb/vnfsdk/vnfsdk-validation.yaml
+++ b/jjb/vnfsdk/vnfsdk-validation.yaml
@@ -7,9 +7,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: 'vnfsdk/validation'
stream: