diff options
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-son-handler.yaml | 4 | ||||
| -rwxr-xr-x | jjb/vfc/build-driver-ems-docker-image.sh | 11 | ||||
| -rw-r--r-- | jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh | 10 | ||||
| -rw-r--r-- | jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh | 10 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-ems-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-ems-java.yaml | 70 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-wfengine-java.yaml | 139 | ||||
| -rw-r--r-- | packer/provision/local-builder.yaml | 9 | ||||
| -rw-r--r-- | packer/provision/local-docker.yaml | 9 |
10 files changed, 24 insertions, 254 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/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index d536d1a34..c400367d9 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -21,6 +21,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-son-handler-settings' @@ -32,6 +33,7 @@ - project: name: dcaegen2-services-son-handler-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true @@ -50,6 +52,7 @@ - project: name: dcaegen2-services-son-handler-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' @@ -61,6 +64,7 @@ - project: name: dcaegen2-services-son-handler-info + java-version: openjdk11 project-name: dcaegen2-services-son-handler jobs: - gerrit-info-yaml-verify diff --git a/jjb/vfc/build-driver-ems-docker-image.sh b/jjb/vfc/build-driver-ems-docker-image.sh deleted file mode 100755 index 6804198b5..000000000 --- a/jjb/vfc/build-driver-ems-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./ems/microservice-standalone/src/main/assembly/docker/*.* - -./ems/microservice-standalone/src/main/assembly/docker/build_image.sh - diff --git a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh deleted file mode 100644 index 495220f26..000000000 --- a/jjb/vfc/build-nfvo-wfengine-engine-activiti-extension-docker-image.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./activiti-extension/src/main/docker/*.sh -./activiti-extension/src/main/docker/activiti-docker-build_image.sh - diff --git a/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh b/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh deleted file mode 100644 index 3a27413df..000000000 --- a/jjb/vfc/build-nfvo-wfengine-engine-mgr-service-docker-image.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./wfenginemgrservice/src/main/docker/*.sh -./wfenginemgrservice/src/main/docker/wfenginemgrservice-docker-build_image.sh - diff --git a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml b/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml deleted file mode 100644 index 390228f7a..000000000 --- a/jjb/vfc/vfc-nfvo-driver-ems-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-ems-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vfc-nfvo-driver-ems' - recipients: 'yangyanyj@chinamobile.com' - stream: 'master' - functionality: - - 'sanity-check': - trigger_jobs: 'vfc-nfvo-driver-ems-master-docker-java-version-shell-daily' - robot-options: '' - branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml deleted file mode 100644 index 85e9d6852..000000000 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ /dev/null @@ -1,70 +0,0 @@ ---- - -- project: - name: vfc-nfvo-driver-ems-java - project-name: 'vfc-nfvo-driver-ems' - project: 'vfc/nfvo/driver/ems' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - subproject: - - 'drv-ems-boco': - pom: 'ems/pom.xml' - pattern: 'ems/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-driver-ems-docker-image.sh' - build-node: ubuntu1804-docker-8c-8g - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-driver-ems-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/driver/ems' - project-name: 'vfc-nfvo-driver-ems' - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-driver-ems-java-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/driver/ems - project-name: 'vfc-nfvo-driver-ems' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-ems-settings' - -- project: - name: vfc-nfvo-driver-ems-info - project-name: vfc-nfvo-driver-ems - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/driver/ems - branch: master diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml deleted file mode 100644 index ca51fc3c3..000000000 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ /dev/null @@ -1,139 +0,0 @@ ---- -- project: - name: vfc-nfvo-wfengine - project-name: 'vfc-nfvo-wfengine' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-mgr-service': - pom: 'wfenginemgrservice/pom.xml' - pattern: 'wfenginemgrservice/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - - 'engine-activiti-extension': - pom: 'activiti-extension/pom.xml' - pattern: 'activiti-extension/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - mvn-goals: 'clean' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-wfengine-engine-mgr-service-stage - project-name: 'vfc-nfvo-wfengine-engine-mgr-service' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-mgr-service': - pom: 'wfenginemgrservice/pom.xml' - pattern: 'wfenginemgrservice/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-mgr-service-docker-image.sh' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'wfenginemgrservice/pom.xml' - mvn-params: '-f wfenginemgrservice/pom.xml' - - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-wfengine-engine-activiti-extension-stage - project-name: 'vfc-nfvo-wfengine-engine-activiti-extension' - project: 'vfc/nfvo/wfengine' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - subproject: - - 'engine-activiti-extension': - pom: 'activiti-extension/pom.xml' - pattern: 'activiti-extension/**' - script: - !include-raw-escape: 'build-nfvo-wfengine-engine-activiti-extension-docker-image.sh' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'activiti-extension/pom.xml' - mvn-params: '-f activiti-extension/pom.xml' - - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vfc-nfvo-wfengine-wfenginemgrservice-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - mvn-params: '-f wfenginemgrservice/pom.xml' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/wfengine' - project-name: 'vfc-nfvo-wfengine-wfenginemgrservice' - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -- project: - name: vfc-nfvo-wfengine-activiti-extension-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - mvn-params: '-f activiti-extension/pom.xml' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'vfc/nfvo/wfengine' - project-name: 'vfc-nfvo-wfengine-activiti-extension' - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-wfengine-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/wfengine - project-name: 'vfc-nfvo-wfengine' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-wfengine-settings' - -- project: - name: vfc-nfvo-wfengine-info - project-name: vfc-nfvo-wfengine - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vfc/nfvo/wfengine - branch: master 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: |