Merge "Update test name in sdc csit jjb"

diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh
index 10e4709..3a86002 100755 (executable)
--- a/jenkins-scripts/create_jenkins_user.sh
+++ b/jenkins-scripts/create_jenkins_user.sh
@@ -39,6 +39,12 @@ then
   usermod -a -G mock jenkins
 fi
 
+# Grant the Jenkins user sudo rights
+cat <<EOFSUDO >/etc/sudoers.d/89-jenkins-user-defaults
+Defaults:jenkins !requiretty
+jenkins     ALL = NOPASSWD: ALL
+EOFSUDO
+
 mkdir /home/jenkins/.ssh
 mkdir /w
 cp -r /home/${OS}/.ssh/authorized_keys /home/jenkins/.ssh/authorized_keys

diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml
index 19e48e4..e66f815 100644 (file)
--- a/jjb/ccsdk/dashboard.yaml
+++ b/jjb/ccsdk/dashboard.yaml
@@ -6,7 +6,6 @@
       - '{project-name}-{stream}-clm'
       - '{project-name}-{stream}-verify-java'
       - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily-no-sonar'
 
     project: 'ccsdk/dashboard'
     stream:

diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 9cee53c..7ddd070 100644 (file)
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -611,7 +611,7 @@
 
     triggers:
       # 11 AM UTC
-      - timed: 'H 11 * * *'
+      - timed: 'H H(10-17) * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
@@ -688,7 +688,7 @@
 
     triggers:
       # 11 AM UTC
-      - timed: 'H 11 * * *'
+      - timed: 'H H(10-17) * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'
@@ -766,7 +766,7 @@
 
     triggers:
       # 11 AM UTC
-      - timed: 'H 11 * * *'
+      - timed: 'H H(10-17) * * *'
       - gerrit-trigger-release-manually:
           server: '{server-name}'
           project: '{project}'

diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 9387a78..712e490 100644 (file)
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -17,10 +17,6 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 3457738..ef05814 100644 (file)
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -7,15 +7,10 @@
       - '{project-name}-{stream}-stage-site-java':
           site-pom: 'pom.xml'
           trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
     project: 'portal'
     stream:
       - 'master':
           branch: 'master'
-      - 'release-1.0.0':
-          branch: 'release-1.0.0'
-      - 'release-1.1.0':
-          branch: 'release-1.1.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index 325b0fe..e28bd28 100644 (file)
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -14,6 +14,7 @@
           archive-artifacts: 'packages/arquillian-unit-tests/target/**/*'
       - '{project-name}-{stream}-release-version-profile-java-daily':
           mvn-profile: 'with-integration-tests'
+          build-node: 'ubuntu1604-basebuild-8c-8g'
       - '{project-name}-{stream}-docker-version-java-daily':
           docker-pom: 'pom.xml'
           mvn-profile: 'docker'

diff --git a/jjb/vvp/vvp-cms.yaml b/jjb/vvp/vvp-cms.yaml
index 39c5c87..ab38f3d 100644 (file)
--- a/jjb/vvp/vvp-cms.yaml
+++ b/jjb/vvp/vvp-cms.yaml
@@ -15,5 +15,6 @@
     build-node: ubuntu1604-basebuild-4c-4g
     jobs:
       - '{project-name}-{stream}-{subproject}-verify-python'
+      - '{project-name}-{stream}-docker-java-daily'
     docker-pom: 'pom.xml'
     mvn-profile: 'default'