diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/clamp/clamp.yaml | 10 | ||||
-rw-r--r-- | jjb/clamp/dashboard/clamp-dashboard.yaml | 10 | ||||
-rw-r--r-- | jjb/demo/demo.yaml | 28 | ||||
-rw-r--r-- | jjb/integration/integration-docker.yaml | 1 | ||||
-rw-r--r-- | jjb/integration/integration-templates-docker.yaml | 4 | ||||
-rw-r--r-- | jjb/usecaseui/usecase-ui-server.yaml | 8 | ||||
-rw-r--r-- | jjb/usecaseui/usecase-ui.yaml | 6 |
7 files changed, 47 insertions, 20 deletions
diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index dae241880..b14841404 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -10,10 +10,10 @@ project-name: 'clamp' jobs: - gerrit-maven-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -37,7 +37,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: clamp-sonar @@ -50,7 +50,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'clamp' project-name: 'clamp' branch: 'master' @@ -69,7 +69,7 @@ project-name: 'clamp' branch: 'master' mvn-settings: 'clamp-settings' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g build-timeout: 120 java-version: openjdk11 diff --git a/jjb/clamp/dashboard/clamp-dashboard.yaml b/jjb/clamp/dashboard/clamp-dashboard.yaml index 2cea7f56e..ce70c1903 100644 --- a/jjb/clamp/dashboard/clamp-dashboard.yaml +++ b/jjb/clamp/dashboard/clamp-dashboard.yaml @@ -10,10 +10,10 @@ project-name: 'clamp-dashboard' jobs: - gerrit-maven-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -35,7 +35,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g #- project: # name: clamp-dashboard-sonar @@ -48,7 +48,7 @@ # sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' # sonar-mvn-goal: '{sonar_mvn_goal}' # cron: '@daily' -# build-node: ubuntu1604-docker-8c-8g +# build-node: ubuntu1804-docker-8c-8g # project: 'clamp/dashboard' # project-name: 'clamp-dashboard' # branch: 'master' @@ -67,6 +67,6 @@ project-name: 'clamp-dashboard' branch: 'master' mvn-settings: 'clamp-settings' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g build-timeout: 120 java-version: openjdk11 diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 5c4028ee7..305ca378b 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -54,3 +54,31 @@ build-node: centos7-builder-2c-1g project: demo branch: master + +- project: + name: demo-linters + project: 'demo' + project-name: 'demo' + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index 10660572b..1d105d762 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -22,4 +22,3 @@ mvn-settings: 'integration-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/integration/integration-templates-docker.yaml b/jjb/integration/integration-templates-docker.yaml index a01e82f96..0bf309756 100644 --- a/jjb/integration/integration-templates-docker.yaml +++ b/jjb/integration/integration-templates-docker.yaml @@ -2,7 +2,7 @@ - job-template: name: '{project-name}-{stream}-{subproject}-docker-merge' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' properties: @@ -64,7 +64,7 @@ - job-template: name: '{project-name}-{stream}-{subproject}-docker-verify' project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' + node: 'ubuntu1804-docker-8c-8g' docker-image-name: '' properties: diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 917ff2970..a4241e71f 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -17,14 +17,14 @@ maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: usecase-ui-server-sonar @@ -36,7 +36,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'usecase-ui/server' project-name: 'usecase-ui-server' branch: 'master' @@ -51,7 +51,7 @@ nexus-iq-namespace: 'onap-' project: usecase-ui/server project-name: 'usecase-ui-server' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-server-settings' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index cc1a04b6f..4965f82c7 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -22,14 +22,14 @@ maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: usecase-ui-clm @@ -38,7 +38,7 @@ nexus-iq-namespace: 'onap-' project: usecase-ui project-name: 'usecase-ui' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-settings' |