diff options
| -rwxr-xr-x | jenkins-scripts/create_jenkins_user.sh | 6 | ||||
| -rwxr-xr-x | jenkins-scripts/docker.sh | 15 | ||||
| -rwxr-xr-x | jenkins-scripts/system_type.sh | 1 | ||||
| -rw-r--r-- | jjb/demo/demo.yaml | 2 | ||||
| -rw-r--r-- | jjb/oparent/oparent.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 3 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-lctest-csit.yaml | 13 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-validation.yaml | 3 |
8 files changed, 27 insertions, 18 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/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/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/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: |