diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml | 2 | ||||
| -rw-r--r-- | jjb/holmes/holmes-common.yaml | 5 | ||||
| -rw-r--r-- | jjb/holmes/holmes-engine-mgt.yaml | 5 | ||||
| -rw-r--r-- | jjb/holmes/holmes-rule-mgt.yaml | 5 | ||||
| -rw-r--r-- | packer/provision/local-builder.yaml | 9 | ||||
| -rw-r--r-- | packer/provision/local-docker.yaml | 9 |
6 files changed, 34 insertions, 1 deletions
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml index 4f5f99764..affa258c4 100644 --- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -21,6 +21,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-platform-servicechange-handler-settings' @@ -38,6 +39,7 @@ jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' + java-version: openjdk11 project: dcaegen2/platform/servicechange-handler build-node: ubuntu1804-docker-8c-8g project-name: 'dcaegen2-platform-servicechange-handler' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 5a3c5cbe3..94f6deffb 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -15,9 +15,10 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - + java-version: openjdk11 project: 'holmes/common' stream: - 'master': @@ -45,6 +46,7 @@ mvn-settings: 'holmes-common-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-common-clm @@ -55,6 +57,7 @@ project-name: 'holmes-common' branch: 'master' mvn-settings: 'holmes-common-settings' + java-version: openjdk11 - project: name: holmes-common-info diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index c27a6267c..85322581e 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -9,11 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'holmes/engine-management' stream: - 'master': @@ -43,6 +46,7 @@ mvn-settings: 'holmes-engine-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-engine-management-clm @@ -53,6 +57,7 @@ project-name: 'holmes-engine-management' branch: 'master' mvn-settings: 'holmes-engine-management-settings' + java-version: openjdk11 - project: name: holmes-engine-management-info diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index fee52ac63..9aa9c9dbe 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -9,11 +9,14 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + java-version: openjdk11 - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g + java-version: openjdk11 - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + java-version: openjdk11 project: 'holmes/rule-management' stream: - 'master': @@ -43,6 +46,7 @@ mvn-settings: 'holmes-rule-management-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + java-version: openjdk11 - project: name: holmes-rule-management-clm @@ -53,6 +57,7 @@ project-name: 'holmes-rule-management' branch: 'master' mvn-settings: 'holmes-rule-management-settings' + java-version: openjdk11 - project: name: holmes-rule-management-info diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 346098144..077c52f65 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -52,6 +52,15 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.8 + apt: + name: + - python3.8 + - python3.8-dev + - python3.8-tk + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install libssl1.0-dev dep apt: name: libssl1.0-dev diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 0948cd004..9f590ea48 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -106,6 +106,15 @@ become: true when: ansible_distribution == 'Ubuntu' + - name: Install Python 3.8 + apt: + name: + - python3.8 + - python3.8-dev + - python3.8-tk + become: true + when: ansible_distribution == 'Ubuntu' + - name: Install nodejs-dev libssl1.0-dev dep apt: name: |