diff options
Diffstat (limited to 'jjb')
38 files changed, 61 insertions, 1308 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml deleted file mode 100644 index 0b4b46423..000000000 --- a/jjb/aaf/aaf-authz.yaml +++ /dev/null @@ -1,79 +0,0 @@ ---- -- project: - name: aaf-project-view - project-name: aaf - views: - - project-view - -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-authz - project-name: 'aaf-authz' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-docker-stage: - mvn-params: '-Dmaven.test.skip install exec:exec -Pbuild-docker' - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' -# LF said on 2019-08-01 that this was deprecated -# - '{project-name}-{stream}-docker-java-shell-daily': -# mvn-goals: 'clean install' -# settings: '{mvn-settings}' -# script: -# !include-raw-escape: 'build-aaf-docker-image.sh' -# build-node: ubuntu1804-docker-8c-8g' - project: 'aaf/authz' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'aaf-authz-settings' - files: '**' - archive-artifacts: '' - -# This was not cleared with PTL, nor is it appropriate to add for CasaBlanca See PTL before adding this kind of thing -#- project: -# name: aaf-authz-arm64 -# project-name: 'aaf-authz-arm64' -# jobs: -# - '{project-name}-{stream}-docker-java-shell-daily': -# mvn-goals: 'clean install' -# settings: '{mvn-settings}' -# script: -# !include-raw-escape: 'build-aaf-docker-image.sh' -# build-node: ubuntu1804-docker-arm64-4c-2g' -# project: 'aaf/authz' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'aaf-authz-settings' -# files: '**' -# archive-artifacts: '' - -- project: - name: aaf-authz-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aaf/authz' - project-name: 'aaf-authz' - branch: 'master' - mvn-settings: 'aaf-authz-settings' - -- project: - name: aaf-authz-info - project-name: aaf-authz - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/authz - branch: master diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml deleted file mode 100644 index d8417badf..000000000 --- a/jjb/aaf/aaf-cadi.yaml +++ /dev/null @@ -1,148 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-cadi - project-name: 'aaf-cadi' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - project: 'aaf/cadi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aaf-cadi-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aaf-cadi-shiro-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aaf/cadi' - project-name: 'aaf-cadi-shiro' - branch: 'master' - mvn-params: '-f shiro/pom.xml' - mvn-settings: 'aaf-cadi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' -# Though the below docker jobs have "aai" in the name, there is no aai code involved. -- project: - name: aaf-cadi-fproxy - project-name: 'aaf-cadi-fproxy' - jobs: - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'sidecar/fproxy/pom.xml' - mvn-goals: 'docker:build' - build-node: ubuntu1804-docker-8c-8g - project: 'aaf/cadi' - docker-image-name: 'onap/fproxy' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aaf-cadi-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aaf-cadi-fproxy-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aaf/cadi' - project-name: 'aaf-cadi-fproxy' - branch: 'master' - mvn-params: '-f sidecar/fproxy/pom.xml' - mvn-settings: 'aaf-cadi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aaf-cadi-rproxy - project-name: 'aaf-cadi-rproxy' - jobs: - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'sidecar/rproxy/pom.xml' - mvn-goals: 'docker:build' - build-node: ubuntu1804-docker-8c-8g - project: 'aaf/cadi' - docker-image-name: 'onap/rproxy' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aaf-cadi-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aaf-cadi-rproxy-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aaf/cadi' - project-name: 'aaf-cadi-rproxy' - branch: 'master' - mvn-params: '-f sidecar/rproxy/pom.xml' - mvn-settings: 'aaf-cadi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aaf-cadi-tproxy-config - project-name: 'aaf-cadi-tproxy-config' - jobs: - - '{project-name}-{stream}-aai-docker-java-daily': - pom: 'sidecar/tproxy-config/pom.xml' - mvn-goals: 'docker:build' - build-node: ubuntu1804-docker-8c-8g - project: 'aaf/cadi' - docker-image-name: 'onap/tproxy-config' - stream: - - 'master': - branch: 'master' - mvn-settings: 'aaf-cadi-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aaf-cadi-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aaf/cadi' - project-name: 'aaf-cadi' - branch: 'master' - mvn-settings: 'aaf-cadi-settings' - -- project: - name: aaf-cadi-info - project-name: aaf-cadi - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/cadi - branch: master diff --git a/jjb/aaf/aaf-certservice-csit.yaml b/jjb/aaf/aaf-certservice-csit.yaml deleted file mode 100644 index 4876ba6bb..000000000 --- a/jjb/aaf/aaf-certservice-csit.yaml +++ /dev/null @@ -1,16 +0,0 @@ -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-certservice-csit - jobs: - - "{project-name}-{stream}-verify-csit-{functionality}" - - "{project-name}-{stream}-csit-{functionality}" - project-name: "aaf" - disabled: true - stream: - - "frankfurt": - branch: "frankfurt" - functionality: - - "certservice": - trigger_jobs: - - "aaf-certservice-{stream}-merge-java" - robot-options: "" diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml deleted file mode 100644 index 8aa7518bd..000000000 --- a/jjb/aaf/aaf-certservice.yaml +++ /dev/null @@ -1,64 +0,0 @@ ---- -# Note: 202003, LF says ubuntu1604 is deprecated. Use ubuntu1804 when needed -- project: - name: aaf-certservice - project-name: 'aaf-certservice' - stream: - - 'frankfurt': - branch: 'frankfurt' - java-version: openjdk11 - project: 'aaf/certservice' - mvn-settings: 'aaf-certservice-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - jobs: - - '{project-name}-{stream}-verify-java': - mvn-goals: 'clean install' - - '{project-name}-{stream}-merge-java': - mvn-goals: 'clean deploy' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-goals: 'clean deploy -P docker' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' - -- project: - name: aaf-certservice-sonar - subproject: 'aaf-certservice-ws' - path: 'certService' - java-version: openjdk11 - 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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-docker-8c-8g - project: 'aaf/certservice' - project-name: 'aaf-certservice' - branch: 'frankfurt' - mvn-settings: 'aaf-certservice-settings' - mvn-pom: 'certService/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aaf-certservice-info - project-name: aaf-certservice - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aaf/certservice - branch: frankfurt diff --git a/jjb/aaf/build-aaf-docker-image.sh b/jjb/aaf/build-aaf-docker-image.sh deleted file mode 100644 index 2c713c9fb..000000000 --- a/jjb/aaf/build-aaf-docker-image.sh +++ /dev/null @@ -1,8 +0,0 @@ -CURRENTDIR="$(pwd)" -echo $CURRENTDIR -ls -ltr -cd auth/docker/ -ls -ltr -chmod 755 * -sh dbuild.sh -sh dpush.sh
\ No newline at end of file diff --git a/jjb/aaf/build-sms-docker-image.sh b/jjb/aaf/build-sms-docker-image.sh deleted file mode 100755 index 8f31cad34..000000000 --- a/jjb/aaf/build-sms-docker-image.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -cd sms-service/bin/ -chmod 755 *.sh -./build_image.sh
\ No newline at end of file diff --git a/jjb/aaf/build-sshsm-docker-images.sh b/jjb/aaf/build-sshsm-docker-images.sh deleted file mode 100755 index b0c888231..000000000 --- a/jjb/aaf/build-sshsm-docker-images.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -echo 'Building AAF/sshsm containers' -cd bin -chmod 755 build_images.sh -./build_images.sh diff --git a/jjb/aaf/build-sshsm.sh b/jjb/aaf/build-sshsm.sh deleted file mode 100644 index f5702cf85..000000000 --- a/jjb/aaf/build-sshsm.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash -# - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -echo 'Building AAF/sshsm project' -sh build.sh - diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml deleted file mode 100644 index 8e1418c78..000000000 --- a/jjb/aai/aai-event-client.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: aai-event-client-project-view - project-name: aai-event-client - views: - - project-view - -- project: - name: aai-event-client-master - project-name: 'aai-event-client' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'aai/event-client' - stream: - - 'istanbul': - branch: 'istanbul' - - 'master': - branch: 'master' - mvn-settings: 'aai-event-client-settings' - files: '**' - archive-artifacts: '' - -- project: - name: aai-event-client-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'aai/event-client' - project-name: 'aai-event-client' - branch: 'master' - mvn-settings: 'aai-event-client-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: aai-event-client-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'aai/event-client' - project-name: 'aai-event-client' - stream: - - 'master': - branch: 'master' - - 'istanbul': - branch: 'istanbul' - mvn-settings: 'aai-event-client-settings' - -- project: - name: aai-event-client-info - project-name: aai-event-client - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: aai/event-client - branch: master diff --git a/jjb/appc/appc-csit.yaml b/jjb/appc/appc-csit.yaml deleted file mode 100644 index 0b3324a35..000000000 --- a/jjb/appc/appc-csit.yaml +++ /dev/null @@ -1,16 +0,0 @@ ---- -- project: - name: appc-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'appc' - disabled: true - recipients: 'tc012c@att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'healthcheck': - trigger_jobs: - robot-options: '' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml deleted file mode 100644 index 513126b17..000000000 --- a/jjb/appc/appc-master.yaml +++ /dev/null @@ -1,78 +0,0 @@ ---- -- project: - name: appc-master - project-name: 'appc' - jobs: - - '{project-name}-{stream}-verify-java': - build-node: ubuntu1804-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - '{project-name}-{stream}-merge-java': - build-node: ubuntu1804-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - - project: 'appc' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - mvn-settings: 'appc-settings' - maven-version: "mvn35" - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: appc-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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-docker-8c-8g - project: 'appc' - project-name: 'appc' - branch: 'master' - mvn-settings: 'appc-settings' - maven-version: "mvn35" - mvn-goals: 'clean install' - mvn-opts: '-Xmx4096m' - -- project: - name: appc-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-DskipTests' - build-timeout: 60 - build-node: ubuntu1804-docker-8c-8g - mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" - nexus-iq-namespace: 'onap-' - project: 'appc' - project-name: 'appc' - branch: 'master' - mvn-settings: 'appc-settings' - maven-version: "mvn35" - -- project: - name: appc-info - project-name: appc - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: appc - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index cb614e5e0..2fd96bd34 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -55,6 +55,22 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +- project: + name: dcaegen2-platform-ves-openapi-clm + java-version: openjdk11 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/platform/ves-openapi-manager + build-node: ubuntu1804-docker-8c-8g + project-name: 'dcaegen2-platform-ves-openapi-manager' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' + mvn-settings: 'dcaegen2-platform-ves-openapi-manager-settings' + - project: name: dcaegen2-platform-ves-openapi-manager-project-view diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 57f797bdf..0c52baec4 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -77,8 +77,8 @@ DNAME={container-snapshot-registry}/{docker-name} docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 docker push $DNAME:$DOCKER_IMAGE_TAG2 - stream: honolulu - branch: honolulu + stream: istanbul + branch: istanbul cron: '' - gerrit-whitesource-scan: build-timeout: 120 @@ -101,11 +101,12 @@ - dcaegen2-services-pmsh: src-dir: components/pm-subscription-handler docker-name: onap/org.onap.dcaegen2.services.pmsh + - dcaegen2-services-ml-prediction-ms: + src-dir: components/ml-prediction-ms + docker-name: onap/org.onap.dcaegen2.services.ml-prediction-ms stream: - master: branch: master - - honolulu: - branch: honolulu - istanbul: branch: istanbul views: diff --git a/jjb/externalapi/externalapi-nbi-csit.yaml b/jjb/externalapi/externalapi-nbi-csit.yaml deleted file mode 100644 index e5adc35af..000000000 --- a/jjb/externalapi/externalapi-nbi-csit.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: externalapi-nbi-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'externalapi-nbi' - recipients: 'adrian.osullivan@huawei.com' - stream: 'master' - functionality: - - 'healthcheck': - trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - robot-options: '' - branch: 'master' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml deleted file mode 100644 index 6bda3cba0..000000000 --- a/jjb/externalapi/externalapi-nbi.yaml +++ /dev/null @@ -1,94 +0,0 @@ ---- -- project: - name: externalapi-project-view - project-name: externalapi - views: - - project-view - -- project: - name: externalapi-nbi - project-name: 'externalapi-nbi' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - mvn-params: '-Dmaven.test.skip=true' - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - maven-versions-plugin: true - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-Dmaven.test.skip=true -P docker' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'externalapi/nbi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - java-version: openjdk11 - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: externalapi-nbi-arm64 - project-name: 'externalapi-nbi-arm64' - jobs: - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1804-docker-arm64-4c-2g' - project: 'externalapi/nbi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - files: '**' - archive-artifacts: '' - -- project: - name: externalapi-nbi-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'externalapi/nbi' - project-name: 'externalapi-nbi' - stream: - - 'master': - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - java-version: openjdk11 - -- project: - name: externalapi-nbi-sonar - jobs: - - gerrit-maven-sonar-prescan-script - 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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'externalapi/nbi' - project-name: 'externalapi-nbi' - branch: 'master' - mvn-settings: 'externalapi-nbi-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - java-version: openjdk11 - sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: externalapi-nbi-info - project-name: externalapi-nbi - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: externalapi/nbi - branch: master diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml index d1fd1f967..92a46d906 100644 --- a/jjb/integration/integration-data-provider.yaml +++ b/jjb/integration/integration-data-provider.yaml @@ -45,6 +45,14 @@ tox-dir: '.' tox-envs: 'md' pattern: '**/*.md' + - 'cov': + tox-dir: '.' + tox-envs: 'cov' + pattern: '**/*.py' + - 'mypy': + tox-dir: '.' + tox-envs: 'mypy' + pattern: '**/*.py' stream: - 'master': branch: 'master' diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index da2b798d9..8a4cf0d85 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -43,7 +43,7 @@ # To simplify the references inside tox.ini and tests/settings.py docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" netconf-pnp-simulator:latest tox - build-node: centos7-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g build-timeout: 20 jobs: - gerrit-docker-verify diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml deleted file mode 100644 index d78d785e1..000000000 --- a/jjb/logging-analytics/logging-analytics.yaml +++ /dev/null @@ -1,94 +0,0 @@ ---- -- project: - name: logging-analytics-project-view - project-name: logging-analytics - views: - - project-view - -- project: - name: logging-analytics - project-name: 'logging-analytics' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'logging-analytics' - stream: - - 'master': - branch: 'master' - mvn-settings: 'logging-analytics-settings' - # due to a strange macro / variable translation problem this needs to be - # passed as a string block to properly get the properties correctly defined - # in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - maven-version: "mvn35" - build-node: ubuntu1804-builder-4c-4g - -#- project: -# name: logging-analytics-arm64 -# project-name: 'logging-analytics-arm64' -# jobs: -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: 'logging-analytics' -# stream: -# - 'master': -# branch: 'master' -# - 'casablanca': -# branch: 'casablanca' -# mvn-settings: 'logging-analytics-settings' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# - -- project: - name: logging-analytics-pylog - project-name: 'logging-analytics' - project: 'logging-analytics' - python-version: python3.6 - tox-dir: 'pylog/' - tox-envs: '' - stream: - - 'master': - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - mvn-settings: 'logging-analytics-settings' - subproject: - - 'pylog': - pattern: 'pylog/**' - path: 'pylog' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{subproject}-python-staging-{stream}' - - '{project-name}-{subproject}-python-release-{stream}' - -- project: - name: logging-analytics-info - project-name: 'logging-analytics' - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'logging-analytics' - branch: 'master' - -- project: - name: logging-analytics-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: logging-analytics - project-name: 'logging-analytics' - branch: 'master' - mvn-settings: 'logging-analytics-settings' diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 86f13e2d8..56d1660d3 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -132,122 +132,3 @@ trigger_jobs: - 'policy-api-{stream}-merge-java' - 'policy-docker-{stream}-merge-java' - -- project: - name: policy-api-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' - stream: - - 'guilin': - branch: guilin - functionality: - - 'api' - trigger_jobs: - - 'policy-api-{stream}-merge-java' - robot-options: '' - -- project: - name: policy-apex-pdp-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca' - stream: - - 'guilin': - branch: guilin - functionality: - - 'apex-pdp' - trigger_jobs: - - 'policy-apex-pdp-{stream}-merge-java' - robot-options: '' - -- project: - name: policy-distribution-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'ram_krishna.verma@bell.ca' - stream: - - 'guilin': - branch: guilin - functionality: - - 'distribution' - trigger_jobs: - - 'policy-distribution-{stream}-merge-java' - robot-options: '' - -- project: - name: policy-xacml-pdp-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' - stream: - - 'guilin': - branch: guilin - functionality: - - 'xacml-pdp' - trigger_jobs: - - 'policy-xacml-pdp-{stream}-merge-java' - robot-options: '' - -- project: - name: policy-pap-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'jrh3@att.com ram_krishna.verma@bell.ca' - stream: - - 'guilin': - branch: guilin - functionality: - - 'pap' - trigger_jobs: - - 'policy-pap-{stream}-merge-java' - robot-options: '' - -- project: - name: policy-drools-pdp-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' - stream: - - 'guilin': - branch: guilin - functionality: - - 'drools-pdp' - trigger_jobs: - - 'policy-drools-pdp-{stream}-merge-java' - robot-options: '' - -- project: - name: policy-drools-applications-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'policy' - java-version: openjdk11 - recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com' - stream: - - 'guilin': - branch: guilin - functionality: - - 'drools-applications' - trigger_jobs: - - 'policy-drools-applications-{stream}-merge-java' - robot-options: '' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml deleted file mode 100644 index 86b4e69c8..000000000 --- a/jjb/portal-sdk/portal-sdk.yaml +++ /dev/null @@ -1,73 +0,0 @@ ---- -- project: - name: portal-sdk - project-name: 'portal-sdk' - subproject: - - 'onap-sdk': - pom: 'ecomp-sdk/pom.xml' - pattern: 'ecomp-sdk/**' - subproject-name: 'onap-sdk' - - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'ecomp-sdk/pom.xml' - mvn-params: '-f ecomp-sdk/pom.xml -Dskiptests=true' - pattern: 'ecomp-sdk/**' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'portal/sdk' - stream: - - 'master': - branch: 'master' - - 'release-3.4.0': - branch: 'release-3.4.0' - mvn-settings: 'portal-sdk-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: portal-sdk-sonar - jobs: - - gerrit-maven-sonar-prescan-script - 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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'portal/sdk' - project-name: 'portal-sdk' - branch: 'master' - mvn-params: '-f ecomp-sdk/pom.xml' - mvn-settings: 'portal-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: portal-sdk-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f ecomp-sdk/pom.xml' - nexus-iq-namespace: 'onap-' - build-node: ubuntu1804-builder-4c-4g - project: portal/sdk - project-name: 'portal-sdk' - branch: 'master' - mvn-settings: 'portal-sdk-settings' - -- project: - name: portal-sdk-info - project-name: portal-sdk - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: portal/sdk - branch: master diff --git a/jjb/portal/docker-build-deploy.sh b/jjb/portal/docker-build-deploy.sh deleted file mode 100644 index 5e211fefc..000000000 --- a/jjb/portal/docker-build-deploy.sh +++ /dev/null @@ -1,7 +0,0 @@ -CURRENTDIR="$(pwd)" -echo $CURRENTDIR -ls -ltr -cd deliveries -ls -ltr -chmod 755 *.sh -./build_portalapps_dockers.sh diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh deleted file mode 100644 index d05190c26..000000000 --- a/jjb/portal/docker-build-push.sh +++ /dev/null @@ -1,7 +0,0 @@ -CURRENTDIR="$(pwd)" -echo $CURRENTDIR -ls -ltr -cd deliveries -ls -ltr -chmod 755 *.sh -./os_docker_push.sh diff --git a/jjb/portal/docker-build-release.sh b/jjb/portal/docker-build-release.sh deleted file mode 100644 index 0bbd2c8e4..000000000 --- a/jjb/portal/docker-build-release.sh +++ /dev/null @@ -1,7 +0,0 @@ -CURRENTDIR="$(pwd)" -echo $CURRENTDIR -ls -ltr -cd deliveries -ls -ltr -chmod 755 *.sh -./os_docker_release.sh diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml deleted file mode 100644 index 5fd34556d..000000000 --- a/jjb/portal/portal-docker.yaml +++ /dev/null @@ -1,29 +0,0 @@ ---- - -- project: - name: portal-docker - project-name: 'portal-docker' - jobs: - - '{project-name}-{stream}-two-scm-verify-script': - script: - !include-raw-escape: 'docker-build-deploy.sh' - - '{project-name}-{stream}-two-scm-merge-docker-script': - script: - !include-raw-escape: 'docker-build-push.sh' - - '{project-name}-{stream}-two-scm-release-docker-script-manual': - script: - !include-raw-escape: 'docker-build-release.sh' - project: 'portal' - stream: - - 'master': - branch: 'master' - - 'guilin': - branch: 'guilin' - mvn-settings: 'portal-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - extra-project: 'portal/sdk' - extra-branch: '{branch}' - extra-refspec: 'refs/heads/{branch}' - checkout-dir: 'sdk' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml deleted file mode 100644 index ec3377276..000000000 --- a/jjb/portal/portal.yaml +++ /dev/null @@ -1,103 +0,0 @@ ---- -- project: - name: portal-project-view - project-name: portal - views: - - project-view - -- project: - name: portal - project-name: 'portal' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - project: 'portal' - stream: - - 'master': - branch: 'master' - - 'guilin': - branch: 'guilin' - mvn-settings: 'portal-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - maven-deploy-properties: -Dbuild.number=$BUILD_NUMBER - -- project: - name: portal-sonar - jobs: - - gerrit-maven-sonar-prescan-script - 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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'portal' - project-name: 'portal' - branch: 'master' - mvn-settings: 'portal-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: 'portal-coverity' - jobs: - - 'onap-gerrit-maven-coverity' - cron: '@daily' - max-git-repo-age-hours: 48 - build-node: 'ubuntu1804-builder-4c-4g' - project: 'portal' - project-name: 'portal' - branch: 'master' - mvn-settings: 'portal-settings' - # FIXME: it does not build without building tests at the moment - #mvn-params: '-Dmaven.test.skip=true' - mvn-params: '-DskipTests' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - coverity-project-name: 'onap-portal' - coverity-token: 'ViM5eI953g1mE2vb8MiHtA' - coverity-user-email: 'A.Naluzhnyy@samsung.com' - coverity-search-paths: > - ecomp-portal-FE-os/client - ecomp-portal-FE-os/mock - ecomp-portal-FE-os/server - ecomp-portal-widget-ms - ecomp-portal-FE-common/client/app - coverity-search-exclude-regexs: > - /cov-int/ - /cov-analysis- - ^/usr/ - ^/home/ - /node_modules/ - /bower_components/ - /bower_components_external/ - /src/test/ - /__test__/ - -- project: - name: portal-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: portal - project-name: 'portal' - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - mvn-settings: 'portal-settings' - -- project: - name: portal-info - project-name: portal - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: portal - branch: master diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 7bdd67135..0ff396d95 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -18,12 +18,8 @@ branch: 'Custom_Workflow' java-version: openjdk11 functionality: -# integration testing suites disabled until brought up to date, -# see https://jira.onap.org/browse/SO-3632 -# - 'integration-testing': -# trigger_jobs: -# - 'integration-etsi-testing': -# trigger_jobs: + - 'integration-etsi-testing': + trigger_jobs: - 'macroflow': trigger_jobs: robot-options: '' diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index fd84d7e8a..e4983fdc2 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -17,7 +17,7 @@ mvn-settings: 'testsuite-python-testing-utils-settings' files: '**' archive-artifacts: '' - build-node: 'centos7-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: testsuite-python-testing-utils-verify @@ -27,7 +27,7 @@ - 'master': branch: 'master' mvn-settings: 'testsuite-python-testing-utils-settings' - build-node: 'centos7-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'robotframework-onap': path: 'robotframework-onap' @@ -40,6 +40,6 @@ project-name: testsuite-python-testing-utils jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g project: testsuite/python-testing-utils branch: master diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index bb984aebb..8d6444e1f 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'usecase-ui-nlp-settings' jobs: - '{project-name}-{stream}-verify-java' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index a4241e71f..00113f27e 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -7,6 +7,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'usecase-ui-server-settings' jobs: - '{project-name}-{stream}-verify-java' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 4965f82c7..aab7438b2 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'usecase-ui-settings' jobs: - '{project-name}-{stream}-verify-java' diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml deleted file mode 100644 index 7722ce035..000000000 --- a/jjb/vid/vid-csit.yaml +++ /dev/null @@ -1,15 +0,0 @@ ---- -- project: - name: vid-csit - jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'vid' - recipients: 'ittay.stern@intl.att.com' - stream: - - 'master': - branch: 'master' - functionality: - - 'healthCheck': - trigger_jobs: - robot-options: '' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml deleted file mode 100644 index 748bb5e16..000000000 --- a/jjb/vid/vid.yaml +++ /dev/null @@ -1,90 +0,0 @@ ---- -- project: - name: vid-project-view - project-name: vid - views: - - project-view - -- project: - name: vid - project-name: 'vid' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: true - - gerrit-maven-docker-stage: - build-node: queue-docker-4c-4g - maven-versions-plugin: true - mvn-params: '-P docker' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - project: 'vid' - stream: - - 'master': - branch: 'master' - - 'guilin': - branch: 'guilin' - mvn-settings: 'vid-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -#- project: -# name: vid-docker-arm64 -# project-name: 'vid-arm64' -# jobs: -# - 'docker-version-java-daily': -# docker-pom: 'pom.xml' -# mvn-profile: 'docker' -# project: 'vid' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'vid-settings' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# -- project: - name: vid-sonar - jobs: - - gerrit-maven-sonar-prescan-script - 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: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1804-builder-4c-4g - project: 'vid' - project-name: 'vid' - branch: 'master' - mvn-settings: 'vid-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: vid-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: vid - project-name: 'vid' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vid-settings' - -- project: - name: vid-info - project-name: vid - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: vid - branch: master diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 5c7716f25..49c7c019d 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -81,5 +81,9 @@ project: vnfsdk/dovetail-integration project-name: 'vnfsdk-dovetail-integration' build-node: ubuntu1804-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'vnfsdk-dovetail-integration-settings' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index c19beeab3..19c88c39b 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -36,5 +36,9 @@ project: vnfsdk/functest project-name: 'vnfsdk-functest' build-node: ubuntu1804-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'vnfsdk-functest-settings' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index ffc6c064b..9702e88ad 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -67,5 +67,9 @@ project: vnfsdk/refrepo project-name: 'vnfsdk-refrepo' build-node: ubuntu1804-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'vnfsdk-refrepo-settings' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 55a011703..1d6940621 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -61,7 +61,11 @@ project: vnfsdk/validation project-name: 'vnfsdk-validation' build-node: ubuntu1804-builder-4c-4g - branch: 'master' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' mvn-settings: 'vnfsdk-validation-settings' - project: diff --git a/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh b/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh deleted file mode 100644 index 4a2a76a21..000000000 --- a/jjb/vnfsdk/vnfsdk-ves-agent-cpp.sh +++ /dev/null @@ -1,75 +0,0 @@ -#!/bin/bash -set -x - -#3rd party -cmake_build_type=RELEASE -LEVELDB_VER=1.22 -THRIFT_VER=0.12.0 -JSON_VER=3.5.0 -SPDLOG_VER=1.3.1 - -sudo yum install -y cppcheck bison libcurl-devel; yum clean all -sudo pip install gcovr - -#cmake -cd /tmp/ -wget https://github.com/Kitware/CMake/releases/download/v3.15.3/cmake-3.15.3-Linux-x86_64.tar.gz -tar xzvf cmake*.tar.gz -sudo rpm -e cmake -sudo ln -s $(pwd)/cmake-3.15.3-Linux-x86_64/bin/cmake /usr/bin/cmake - -#leveldb -cd /tmp -curl -o leveldb.zip https://codeload.github.com/google/leveldb/zip/$LEVELDB_VER -unzip leveldb.zip -rm leveldb.zip -mv leveldb-$LEVELDB_VER leveldb -mkdir leveldb/_build -cd leveldb/_build;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DCMAKE_POSITION_INDEPENDENT_CODE=ON; make -j 10; sudo make install - -#json -cd /tmp -curl -o json.zip https://codeload.github.com/nlohmann/json/zip/v$JSON_VER -unzip json.zip -rm json.zip -mv json-$JSON_VER json -cd json;mkdir _build -cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DJSON_BuildTests=OFF;make -j 10;sudo make install - -#spdlog -cd /tmp -curl -o spdlog.zip https://codeload.github.com/gabime/spdlog/zip/v$SPDLOG_VER -unzip spdlog.zip -rm spdlog.zip -mv spdlog-$SPDLOG_VER spdlog -cd spdlog;mkdir _build -cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DSPDLOG_BUILD_EXAMPLES=OFF -DSPDLOG_BUILD_BENCH=OFF -DSPDLOG_BUILD_TESTS=OFF; make -j 10; sudo make install - -#thrift -cd /tmp -curl -o thrift.zip https://codeload.github.com/apache/thrift/zip/v$THRIFT_VER -unzip thrift.zip -rm thrift.zip -mv thrift-$THRIFT_VER thrift -cd thrift;mkdir _build -cd _build/;cmake .. -DCMAKE_BUILD_TYPE=$cmake_build_type -DBUILD_PYTHON=OFF -DBUILD_JAVA=OFF -DBUILD_C_GLIB=OFF -DWITH_LIBEVENT=OFF -DWITH_ZLIB=OFF -DWITH_OPENSSL=OFF -DBUILD_TESTING=OFF -DCMAKE_POSITION_INDEPENDENT_CODE=ON;make -j 10;sudo make install - -#verify/sonar -if [[ "${JOB_NAME}" == "vnfsdk-ves-agent-cmake-sonar" ]]; then -echo "sonar" -mkdir -p ${BUILD_DIR} -cppcheck --enable=all --inconclusive --xml --xml-version=2 --output-file=${BUILD_DIR}/cppcheck.xml . - -cd ${BUILD_DIR} -cat >> sonar-project.properties <<EOF -sonar.cfamily.gcov.reportsPath=${BUILD_DIR}/coverage -sonar.cppcheck.reportPath=${BUILD_DIR}/cppcheck.xml -sonar.exclusions=**/gen-cpp/**/*,**/build/**/* -sonar.projectBaseDir=${WORKSPACE}/veslibrary/ves_cpplibrary -sonar.cfamily.threads=4 -EOF - -ls ${BUILD_DIR}/sonar-project.properties -cat ${BUILD_DIR}/sonar-project.properties - -fi diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml deleted file mode 100644 index 15795df19..000000000 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ /dev/null @@ -1,55 +0,0 @@ ---- -- project: - name: vnfsdk-ves-agent - project-name: 'vnfsdk-ves-agent' - subproject: - - 'veslibrary': - pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - pattern: 'veslibrary/**' - jobs: - - '{project-name}-{stream}-verify-java': - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - 'gerrit-cmake-verify': - build-timeout: 30 - pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh - build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build - make-opts: -j6 - build-node: centos7-builder-4c-4g - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-pom: 'veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - pattern: 'veslibrary/**' - project: 'vnfsdk/ves-agent' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vnfsdk-ves-agent-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - -- project: - name: vnfsdk-ves-agent-info - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: 'vnfsdk/ves-agent' - project-name: 'vnfsdk-ves-agent' - branch: 'master' - -- project: - name: vnfsdk-ves-agent-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - nexus-iq-namespace: 'onap-' - project: vnfsdk/ves-agent - project-name: 'vnfsdk-ves-agent' - build-node: ubuntu1804-builder-4c-4g - branch: 'master' - mvn-settings: 'vnfsdk-ves-agent-settings' |