diff options
-rwxr-xr-x | jenkins-scripts/create_jenkins_user.sh | 6 | ||||
-rw-r--r-- | jjb/ccsdk/dashboard.yaml | 1 | ||||
-rw-r--r-- | jjb/global-templates-java.yaml | 6 | ||||
-rw-r--r-- | jjb/portal/portal-docker.yaml | 4 | ||||
-rw-r--r-- | jjb/portal/portal.yaml | 5 |
5 files changed, 9 insertions, 13 deletions
diff --git a/jenkins-scripts/create_jenkins_user.sh b/jenkins-scripts/create_jenkins_user.sh index 10e47091c..3a8600274 100755 --- 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 19e48e48f..e66f815ec 100644 --- 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 9cee53c8c..7ddd0707f 100644 --- 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 9387a7846..712e490e2 100644 --- 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 345773853..ef05814cc 100644 --- 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: '' |