From: Jessica Wagantall Date: Mon, 22 Oct 2018 16:33:56 +0000 (+0000) Subject: Merge "Add job to trigger csit tests for azure plugin" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=6172536339ed3788c467ca3f290eb5a2e4be1d66;hp=cee1b2f90408e72f9d77ae2a07807df5e0ffd436;p=ci-management.git Merge "Add job to trigger csit tests for azure plugin" --- diff --git a/.gitmodules b/.gitmodules index 0fbb91acd..4e7fbade6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,5 +1,5 @@ -[submodule "jjb/global-jjb"] - path = jjb/global-jjb +[submodule "global-jjb"] + path = global-jjb url = https://github.com/lfit/releng-global-jjb [submodule "packer/common-packer"] path = packer/common-packer diff --git a/global-jjb b/global-jjb new file mode 160000 index 000000000..e907c5af3 --- /dev/null +++ b/global-jjb @@ -0,0 +1 @@ +Subproject commit e907c5af374f9d7bf3196543d853921697dbf17c diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8d0cd1136..a63bb8dff 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-apps-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 @@ -39,14 +41,14 @@ name: ccsdk-apps-docker project-name: 'ccsdk-apps' jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' project: 'ccsdk/apps' stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-apps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 44d203078..2890a4e43 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -5,7 +5,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'ccsdk' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index c93263077..af8f12592 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -22,14 +24,14 @@ name: ccsdk-distribution-docker project-name: 'ccsdk-distribution' jobs: - - 'docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' project: 'ccsdk/distribution' stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index fc7020f2b..4aa05b17e 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-features-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 diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 2efb907aa..3d50184bb 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-parent-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 diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 817b5b6d1..9d6a1aecf 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-platform-plugins-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 diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 06785a5f1..3ef1af8c1 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-adaptors-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 diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index c23a10eab..82e15527f 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-core-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 diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 9b71c92e0..26d8372b9 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-northbound-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 diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 4c011a05e..d95f60fd3 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-sli-plugins-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 diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 192899adf..f1498551a 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'ccsdk-utils-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 diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index f6b05b5dc..b160f2a1f 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -3,7 +3,6 @@ name: externalapi-nbi project-name: 'externalapi-nbi' jobs: - - gerrit-maven-clm - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -22,6 +21,15 @@ archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g +- project: + name: externalapi-nbi-clm + jobs: + - gerrit-maven-clm + project: 'externalapi/nbi' + project-name: 'externalapi-nbi' + branch: 'master' + mvn-settings: 'externalapi-nbi-settings' + - project: name: externalapi-nbi-sonar jobs: diff --git a/jjb/global-jjb b/jjb/global-jjb deleted file mode 160000 index 75cd5909d..000000000 --- a/jjb/global-jjb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 75cd5909da184179c77a55d1909f7159d9eea34b diff --git a/jjb/global-jjb/jenkins-admin b/jjb/global-jjb/jenkins-admin new file mode 120000 index 000000000..8e7fe05cc --- /dev/null +++ b/jjb/global-jjb/jenkins-admin @@ -0,0 +1 @@ +../../global-jjb/jenkins-admin \ No newline at end of file diff --git a/jjb/global-jjb/jenkins-init-scripts b/jjb/global-jjb/jenkins-init-scripts new file mode 120000 index 000000000..c7c6a9553 --- /dev/null +++ b/jjb/global-jjb/jenkins-init-scripts @@ -0,0 +1 @@ +../../global-jjb/jenkins-init-scripts \ No newline at end of file diff --git a/jjb/global-jjb/jjb b/jjb/global-jjb/jjb new file mode 120000 index 000000000..23c884f04 --- /dev/null +++ b/jjb/global-jjb/jjb @@ -0,0 +1 @@ +../../global-jjb/jjb \ No newline at end of file diff --git a/jjb/global-jjb/shell b/jjb/global-jjb/shell new file mode 120000 index 000000000..d37c43f86 --- /dev/null +++ b/jjb/global-jjb/shell @@ -0,0 +1 @@ +../../global-jjb/shell \ No newline at end of file diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml new file mode 100644 index 000000000..3c48c662d --- /dev/null +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -0,0 +1,41 @@ +--- +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder + project-name: logging-analytics-pomba-pomba-sdnc-context-builder + jobs: + - gerrit-maven-clm + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + project: logging-analytics/pomba/pomba-sdnc-context-builder + stream: + - 'master': + branch: 'master' + mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-builder-4c-4g + project: logging-analytics/pomba/pomba-sdnc-context-builder + project-name: logging-analytics-pomba-pomba-sdnc-context-builder + branch: master + mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: logging-analytics-pomba-pomba-sdnc-context-builder-info + project-name: 'logging-analytics-pomba-pomba-sdnc-context-builder' + jobs: + - gerrit-info-yaml-verify + project: 'logging-analytics/pomba/pomba-sdnc-context-builder' + branch: 'master' diff --git a/jjb/multicloud/build-multicloud-azure-docker-image.sh b/jjb/multicloud/build-multicloud-azure-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-framework-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-k8s-docker-image.sh b/jjb/multicloud/build-multicloud-k8s-docker-image.sh new file mode 100755 index 000000000..af19340c0 --- /dev/null +++ b/jjb/multicloud/build-multicloud-k8s-docker-image.sh @@ -0,0 +1,15 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 Intel Corporation +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +set -o xtrace + +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' +cd ./deployments +./build.sh diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh old mode 100644 new mode 100755 diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index 94595ed92..00ac9f7c6 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -7,6 +7,9 @@ - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-golang' - '{project-name}-{stream}-merge-golang' + - '{project-name}-{stream}-docker-golang-shell-daily': + script: + !include-raw-escape: 'build-multicloud-k8s-docker-image.sh' project: 'multicloud/k8s' subproject: - validation-scripts: diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index e6ef1f980..788e75217 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -1,64 +1,50 @@ ---- -- project: - name: optf-cmso - project-name: 'optf-cmso' - project: 'optf/cmso' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-cmso-settings' - subproject: - - 'cmso': - path: '.' - pattern: '**' - pom: 'pom.xml' - jobs: - - gerrit-maven-clm - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: - name: optf-cmso-docker - project-name: 'optf-cmso' - project: 'optf/cmso' - stream: - - 'master': - branch: 'master' - mvn-settings: 'optf-cmso-settings' - subproject: - - 'cmso': - path: '.' - pattern: '**' - 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-cmso-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-cmso-docker-image.sh' - build-node: queue-docker-4c-4g - -- project: - name: optf-cmso-sonar - jobs: - - gerrit-maven-sonar - cron: 'H 11 * * *' - build-node: ubuntu1604-builder-4c-4g - project: 'optf/cmso' - project-name: 'optf-cmso' - branch: 'master' - mvn-settings: 'optf-cmso-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' +--- + +- project: + name: optf-cmso + project-name: 'optf-cmso' + jobs: + - gerrit-maven-clm: + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + - '{project-name}-{stream}-verify-java-checkstyle': + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + - '{project-name}-{stream}-merge-properties-java': + mvn_properties: + - docker.pull.registry=nexus3.onap.org:10001 + - docker.push.registry=nexus3.onap.org:10003 + - '{project-name}-{stream}-release-java-daily-checkstyle': + setVersion: 'DoSetVersion' + mvn_properties: + - docker.pull.registry=nexus3.onap.org:10001 + - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DoSetVersion' + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + maven-properties: | + cmso.registry=$ + + build-node: ubuntu1604-docker-8c-8g + project: 'optf/cmso' + stream: + - 'master': + branch: 'master' + mvn-settings: 'optf-cmso-settings' + subproject: + - 'cmso': + path: '.' + pattern: '**' + pom: 'pom.xml' + +- project: + name: optf-cmso-sonar + jobs: + - gerrit-maven-sonar + cron: 'H 11 * * *' + build-node: ubuntu1604-docker-8c-8g + project: 'optf/cmso' + project-name: 'optf-cmso' + branch: 'master' + mvn-settings: 'optf-cmso-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 21ddfb05f..cd04a351c 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -40,7 +42,7 @@ name: sdnc-apps-docker project-name: 'sdnc-apps' jobs: - - 'docker-java-daily': + - 'docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' @@ -48,6 +50,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-apps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 12d697518..dbbfb7c17 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -5,7 +5,11 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'sdnc' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index dc82689a9..45daa08f2 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 5c5a6743b..f9bc31a67 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -21,7 +23,7 @@ name: sdnc-oam-docker project-name: 'sdnc-oam' jobs: - - 'docker-java-daily': + - 'docker-version-java-daily': docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' @@ -29,6 +31,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 288e6f4dc..b194d853a 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -5,9 +5,12 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'so' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'integration-testing': - trigger_jobs: 'so-master-docker-version-java-daily' + trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' robot-options: '' - branch: 'master' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 2fa46c00c..2ec6a80a1 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -11,8 +11,8 @@ stream: - 'master': branch: 'master' - - 'Dublin_dev': - branch: 'Dublin_dev' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'so-libs-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 diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index a25b20bcb..67681c458 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -16,8 +16,8 @@ stream: - 'master': branch: 'master' - - 'Dublin_dev': - branch: 'Dublin_dev' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' diff --git a/packer/common-packer b/packer/common-packer index 0029afef9..6961de60e 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit 0029afef91fd71afbd62ad41d09a3c4b05cceaa8 +Subproject commit 6961de60eb1b20375b7b6839f05bff9deed6f621