diff options
Diffstat (limited to 'jjb')
| -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 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 1 | ||||
| -rw-r--r-- | jjb/vvp/vvp-cms.yaml | 1 |
6 files changed, 5 insertions, 13 deletions
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: '' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 325b0fe1a..e28bd2889 100644 --- 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 39c5c8783..ab38f3def 100644 --- 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' |