Merge "Update java to version 11 in pnf-simulator project"
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index 1ee505f..81ef487 100644
--- a/jjb/global-templates-script.yaml
+++ b/jjb/global-templates-script.yaml
@@ -41,6 +41,10 @@
branch: '{branch}'
files: '{pattern}'
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
builders:
- shell: '{script}'
diff --git a/jjb/integration/docker/info-integration-docker.yaml b/jjb/integration/docker/info-integration-docker.yaml
deleted file mode 100644
index 071f816..0000000
--- a/jjb/integration/docker/info-integration-docker.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- project:
- name: integration-docker-onap-java11-info
- project-name: integration-docker-onap-java11
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: integration/docker/onap-java11
- branch: master
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
new file mode 100644
index 0000000..512acc1
--- /dev/null
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -0,0 +1,70 @@
+---
+- project:
+ name: integration-docker-onap-java11-info
+ project-name: integration-docker-onap-java11
+ jobs:
+ - gerrit-info-yaml-verify
+ build-node: centos7-builder-2c-1g
+ project: integration/docker/onap-java11
+ branch: master
+
+- project:
+ name: integration-docker-onap-java11-linters
+ project: integration/docker/onap-java11
+ project-name: integration-docker-onap-java11
+ python-version: python3
+ jobs:
+ - integration-linters
+ 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'
+ - 'md':
+ tox-dir: '.'
+ tox-envs: 'md'
+ pattern: '**/*.md'
+ stream:
+ - 'master':
+ branch: 'master'
+
+- project:
+ name: integration-docker-onap-java11-release
+ project-name: 'integration-docker-onap-java11'
+ project: 'integration/docker/onap-java11'
+ mvn-settings: 'integration-settings'
+ jobs:
+ - '{project-name}-gerrit-release-jobs':
+ build-node: centos7-docker-8c-8g
+
+- project:
+ name: 'integration-docker-onap-java11-docker'
+ jobs:
+ - '{project-name}-{stream}-verify-docker'
+ - '{project-name}-{stream}-merge-docker'
+ - gerrit-maven-docker-stage:
+ mvn-params: '-P docker -Dmaven.test.skip=true'
+ build-node: ubuntu1804-docker-8c-8g
+ container-public-registry: 'nexus3.onap.org:10001'
+ container-staging-registry: 'nexus3.onap.org:10003'
+ project-name: 'integration-docker-onap-java11'
+ project: 'integration/docker/onap-java11'
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-params: '-P spring-boot-2-1'
+ docker_name: 'onap/integration-java11'
+ docker_build_args: '-f ./Dockerfile'
+ docker_root: '$WORKSPACE'
+ mvn-settings: 'integration-settings'
+ mvn-version: 'mvn35'
+ files: '**'
+ build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml
index 283aa34..5bb4eeb 100644
--- a/jjb/multicloud/multicloud-k8s.yaml
+++ b/jjb/multicloud/multicloud-k8s.yaml
@@ -13,6 +13,7 @@
!include-raw-escape: 'build-multicloud-k8s-docker-image.sh'
- '{project-name}-{stream}-{area}-verify-shell':
area: kud-deployment
+ build-timeout: 45
script:
!include-raw-escape: 'kud-deployment.sh'
- '{project-name}-gerrit-release-jobs':