diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/ci-management/ci-management-packer-jobs.yaml | 5 | ||||
-rw-r--r-- | jjb/ci-management/ci-management.yaml | 29 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-analytics-tca.yaml | 69 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-ves.yaml | 1 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml | 4 | ||||
-rw-r--r-- | jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml | 15 | ||||
-rw-r--r-- | jjb/integration/xtesting/integration-xtesting.yaml | 4 | ||||
-rw-r--r-- | jjb/multicloud/multicloud-framework-java.yaml | 3 | ||||
-rw-r--r-- | jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml | 2 | ||||
-rw-r--r-- | jjb/oom-platform-cert-service/oom-platform-cert-service.yaml | 4 | ||||
-rw-r--r-- | jjb/optf/optf-fgps.yaml | 121 | ||||
-rw-r--r-- | jjb/sdc/sdc.yaml | 12 | ||||
-rw-r--r-- | jjb/vnfsdk/vnfsdk-refrepo.yaml | 36 | ||||
-rw-r--r-- | jjb/vnfsdk/vnfsdk-validation.yaml | 10 |
14 files changed, 87 insertions, 228 deletions
diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 79b4853f8..7115b5d36 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -16,6 +16,7 @@ - centos-7 - ubuntu-18.04 templates: builder + update-cloud-image: true - project: name: packer-docker-jobs @@ -35,6 +36,7 @@ - ubuntu-18.04-arm64 - ubuntu-18.04 templates: docker + update-cloud-image: true - project: name: packer-memcached-jobs @@ -52,6 +54,7 @@ platforms: - ubuntu-18.04 templates: memcached + update-cloud-image: true - project: name: packer-redis-jobs @@ -68,6 +71,7 @@ platforms: - centos-7 templates: redis + update-cloud-image: true - project: name: packer-helm-jobs @@ -84,3 +88,4 @@ platforms: - ubuntu-18.04 templates: helm + update-cloud-image: true diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 8b4d6e5bb..74d02d674 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -6,6 +6,15 @@ - project-view - project: + name: ci-management-info + project-name: ci-management + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: ci-management + branch: master + +- project: name: ci-management-jobs jobs: - '{project-name}-ci-jobs' @@ -35,3 +44,23 @@ https://jenkins.onap.org https://jenkins.onap.org/sandbox openstack-cloud: vex + +- project: + name: openstack-update-cloud-images + jobs: + - gerrit-openstack-update-cloud-image + + project: ci-management + project-name: ci-management + branch: master + archive-artifacts: '**/*.log' + jenkins-ssh-credential: "{jenkins-ssh-credential}" + + build-node: centos7-builder-2c-1g + # update-cloud-image: true + build-timeout: 10 + + gerrit-user: "jenkins-$SILO" + gerrit-host: "gerrit.onap.org" + gerrit-topic: "update-cloud-image" + reviewers-email: "onap-jobbuilder@jenkins.onap.org" diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca.yaml deleted file mode 100644 index e0e4c059f..000000000 --- a/jjb/dcaegen2/dcaegen2-analytics-tca.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: dcaegen2-analytics-tca - - # job template iterators - project-name: 'dcaegen2-analytics-tca' - stream: - - 'master': - branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - # apply to all jobs - project: 'dcaegen2/analytics/tca' - mvn-settings: 'dcaegen2-analytics-tca-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-builder-4c-4g - - jobs: - - '{project-name}-{stream}-verify-java': - mvn-params: '-DskipTests=true' - - '{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-builder-4c-4g - maven-versions-plugin: true - mvn-params: '-DskipTests=true' - -- project: - name: dcaegen2-analytics-tca-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: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - mvn-settings: 'dcaegen2-analytics-tca-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-analytics-tca-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: 'dcaegen2/analytics/tca' - project-name: 'dcaegen2-analytics-tca' - branch: 'master' - build-node: ubuntu1804-builder-4c-4g - mvn-settings: 'dcaegen2-analytics-tca-settings' - -- project: - name: dcaegen2-analytics-tca-info - project-name: dcaegen2-analytics-tca - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: dcaegen2/analytics/tca - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 889623774..4586ab144 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -55,6 +55,7 @@ - project: name: dcaegen2-collectors-ves-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 468b07a86..5b8fc9819 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -13,6 +13,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -44,6 +45,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -75,6 +77,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'frankfurt': branch: 'frankfurt' mvn-settings: 'dcaegen2-services-settings' @@ -86,6 +89,7 @@ - project: name: dcaegen2-services-datalake-handler-sonar + java-version: openjdk11 jobs: - gerrit-maven-sonar sonarcloud: true diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml new file mode 100644 index 000000000..34b4a63ce --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-son-handler-csit.yaml @@ -0,0 +1,15 @@ +- project: + name: dcaegen2-services-son-handler-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-services-son-handler' + recipients: 'vv770d@att.com reshmasree.chamarthi2@wipro.com niranjana.y60@wipro.com' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 2065813c5..7e634a118 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -123,6 +123,10 @@ - 'master': branch: 'master' files: '' + - 'frankfurt': + branch: 'frankfurt' + files: '' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g + cron: '@daily' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 323311824..d28e62eb0 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 mvn-settings: 'multicloud-framework-settings' subproject: - 'multivimbroker': @@ -102,6 +103,7 @@ project: 'multicloud/framework' project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' @@ -115,5 +117,6 @@ project: multicloud/framework project-name: 'multicloud-framework-artifactbroker' branch: 'master' + java-version: openjdk11 mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml index 5cf656acf..33d89f943 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -11,5 +11,5 @@ functionality: - "certservice": trigger_jobs: - - "{project-name}-{stream}-merge-java" + - "oom-platform-cert-service-{stream}-merge-java" robot-options: "" diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml index 99a63873b..5bcd5f327 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -69,10 +69,12 @@ - project: name: oom-platform-cert-service-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' - project: 'oom/platform/cert-service' + project: oom/platform/cert-service project-name: 'oom-platform-cert-service' branch: 'master' + build-node: ubuntu1804-docker-8c-8g mvn-settings: 'oom-platform-cert-service-settings' diff --git a/jjb/optf/optf-fgps.yaml b/jjb/optf/optf-fgps.yaml deleted file mode 100644 index 5f4509b24..000000000 --- a/jjb/optf/optf-fgps.yaml +++ /dev/null @@ -1,121 +0,0 @@ ---- -- project: - name: optf-fgps-engine - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'engine': - path: 'engine' - pattern: 'engine/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-docker-8c-8g - maven-versions-plugin: 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 - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: optf-fgps-valetapi - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'valetapi': - path: 'valetapi' - pattern: 'valetapi/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-builder-4c-4g' - -- project: - name: optf-fgps-docker - project-name: 'optf-fgps' - project: 'optf/fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - subproject: - - 'valetapi': - path: 'valetapi' - pattern: 'valetapi/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-fgps-docker-image.sh' - build-node: queue-docker-4c-4g - - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-fgps-docker-image.sh' - build-node: queue-docker-4c-4g - -- project: - name: optf-fgps-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: 'optf/fgps' - project-name: 'optf-fgps' - branch: 'master' - mvn-settings: 'optf-fgps-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: optf-fgps-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: optf/fgps - project-name: 'optf-fgps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-fgps-settings' - -- project: - name: optf-fgps-info - project-name: optf-fgps - jobs: - - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g - project: optf/fgps - branch: master diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 862447a95..43234f873 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -1,11 +1,5 @@ --- - project: - name: sdc-master-project-view - project-name: sdc-master - views: - - project-view - -- project: name: sdc-sdc-docker-project-view project-name: sdc-sdc-docker views: @@ -24,6 +18,12 @@ - project-view - project: + name: sdc-project-view + project-name: sdc + views: + - project-view + +- project: name: sdc project-name: 'sdc' jobs: diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index d43564192..ffc6c064b 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -17,45 +17,24 @@ container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# build-node: ubuntu1804-docker-8c-8g project: 'vnfsdk/refrepo' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'vnfsdk-refrepo-settings' files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g -#- project: -# name: vnfsdk-refrepo-arm64 -# project-name: 'vnfsdk-refrepo-arm64' -# jobs: -# - '{project-name}-{stream}-aai-docker-java-daily': -# pom: 'vnfmarket-be/deployment/docker/docker-refrepo/pom.xml' -# mvn-goals: 'docker:build' -# docker-image-name: 'onap/vnfsdk/refrepo' -# - '{project-name}-{stream}-docker-version-java-daily': -# docker-pom: 'vnfmarket-be/deployment/docker/docker-postgres/pom.xml' -# mvn-profile: 'docker' -# mvn-params: '-Dmaven.test.skip=true' -# project: 'vnfsdk/refrepo' -# stream: -# - 'master': -# branch: 'master' -# mvn-settings: 'vnfsdk-refrepo-settings' -# files: '**' -# archive-artifacts: '' -# build-node: ubuntu1804-docker-arm64-4c-2g -# - project: name: vnfsdk-refrepo-sonar jobs: - gerrit-maven-sonar + java-version: openjdk11 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -81,6 +60,7 @@ - project: name: vnfsdk-refrepo-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 3d5a602a1..d7f4b2789 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -13,8 +13,12 @@ build-node: centos7-docker-8c-8g project: 'vnfsdk/validation' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + java-version: openjdk11 + - 'frankfurt': + branch: 'frankfurt' + java-version: openjdk8 mvn-settings: 'vnfsdk-validation-settings' files: '**' archive-artifacts: '' @@ -24,6 +28,7 @@ name: vnfsdk-validation-sonar jobs: - gerrit-maven-sonar + java-version: openjdk11 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' @@ -49,6 +54,7 @@ - project: name: vnfsdk-validation-clm + java-version: openjdk11 jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' |