diff options
140 files changed, 1699 insertions, 289 deletions
diff --git a/Sandbox_Setup.md b/Sandbox_Setup.md index 9afb39d76..abdc7c73c 100644 --- a/Sandbox_Setup.md +++ b/Sandbox_Setup.md @@ -25,8 +25,9 @@ please send email to helpdesk@onap.org (LF helpdesk team) To download **ci-management**, execute the following command to clone the **ci-managment** repository. -`git clone ssh://<LFID>@gerrit.onap.org:29418/ci-management --recursive && scp -p -P 29418 \ -<LFID>@gerrit.onap.org:hooks/commit-msg ci-management/.git/hooks/` +`git clone https://gerrit.onap.org/r/ci-management && (cd ci-management && curl -Lo \ +$(git rev-parse --git-dir)/hooks/commit-msg https://gerrit.onap.org/r/tools/hooks/commit-msg; \ +chmod +x $(git rev-parse --git-dir)/hooks/commit-msg)` Make sure to sync global-jjb submodule using: @@ -72,7 +73,9 @@ ignore_cache=True ``` ### How to retrieve API token? Login to the [Jenkins Sandbox](https://jenkins.onap.org/sandbox/), go to your user -page by clicking on your username. Click **Configure** and then click **Show API Token**. +page by clicking on your username. Click **Configure** and then click **Add new Token**. +After that specify a token name (optional) and click on **Generate** to generate and show +new token. Please note down your token and store it securely. To work on existing jobs or create new jobs, navigate to the `/jjb` directory where you will find all job templates for the project. Follow the below commands to test, diff --git a/global-jjb b/global-jjb -Subproject 1f1f893e77014a6b08d61e88614ff928b2c1758 +Subproject bfea76c9bead88faf10a3ad41ae98ad741ac1b9 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg index c328e94f3..f47c417cb 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu16.04-docker-arm64-4c-2g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20181031-164620.606 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - arm64 - 20190410-005349.357 LABELS=ubuntu1604-docker-arm64-4c-2g HARDWARE_ID=lf-standard-2 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg index 5b7d179f6..a3bdd73ff 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1604-docker-v1-8c-8g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - x86_64 - 20180903-000118.904 LABELS=ubuntu1604-docker-8c-8g -HARDWARE_ID=v1-standard-4 +HARDWARE_ID=v1-standard-8 diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh index 67987b54d..dd76d8a74 100755 --- a/jenkins-scripts/jenkins-init-script.sh +++ b/jenkins-scripts/jenkins-init-script.sh @@ -25,3 +25,6 @@ fi # Create the jenkins user last so that hopefully we don't have to deal with # guard files ./create_jenkins_user.sh + +# Nexus3 port forwarding rules for ARM64 +./nexus3_port_forwarding.sh diff --git a/jenkins-scripts/nexus3_port_forwarding.sh b/jenkins-scripts/nexus3_port_forwarding.sh new file mode 100755 index 000000000..31d41b2c8 --- /dev/null +++ b/jenkins-scripts/nexus3_port_forwarding.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2019 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## +echo "---> nexus3_port_forwarding.sh" +set +e # DON'T fail build if script fails. + +NEXUS3_IP=`host nexus3.onap.org | awk '/has address/ { print $4 ; exit }'` +OS_ARCH=$(ANSIBLE_STDOUT_CALLBACK=json ANSIBLE_LOAD_CALLBACK_PLUGINS=1 \ + ansible all -i "localhost," --connection=local -m setup | jq -r \ + '.. | .ansible_architecture? | select(type != "null")' \ + | tr '[:upper:]' '[:lower:]') + + +if [[ "${OS_ARCH}" == "aarch64" ]] ;then + echo "os_arch: $OS_ARCH" + iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10001 -j DNAT --to-destination ${NEXUS3_IP}:11001 + iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10002 -j DNAT --to-destination ${NEXUS3_IP}:11002 + iptables -t nat -I OUTPUT 1 -p tcp -d ${NEXUS3_IP} --dport 10003 -j DNAT --to-destination ${NEXUS3_IP}:11003 +fi + +# DON'T fail build if script fails. +exit 0 diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml new file mode 100644 index 000000000..816ecff2e --- /dev/null +++ b/jjb/aai/aai-oom.yaml @@ -0,0 +1,37 @@ +--- +- project: + name: aai-oom-project-view + project-name: aai-oom + views: + - project-view + +- project: + name: aai-oom + helm-module: 'aai' + project-name: 'aai-oom' + project: 'aai/oom' + jobs: + - '{project-name}-{stream}-verify-external-helm' + - '{project-name}-{stream}-merge-external-helm': + build_script: '{oom_build_script}' + post_build_script: !include-raw-escape: shell/publish_helm_charts.sh + files: '**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'aai-oom-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-helm-2c-1g + pre_build_script: !include-raw-escape: shell/helm-repo-init.sh + oom_build_script: | + #!/bin/bash + set -e -o pipefail + cd kubernetes/ + make all + build_script: | + #!/bin/bash + cd kubernetes/ + make common + make {helm-module} + oom_post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index c31a51d62..bcd0c822d 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -12,6 +12,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-cdt-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index 027e1812c..0289ee4e6 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' @@ -50,6 +52,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-deployment-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index d623f832b..56ce45ba9 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 8733f80e8..032b8fd49 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -18,6 +18,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'appc-parent-settings' build-node: ubuntu1604-builder-2c-1g diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index a8644fd83..9ee4277e5 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -3,9 +3,7 @@ name: ccsdk-project-view project-name: ccsdk views: - - common-view - view-name: ccsdk - view-regex: '(?!.*-maven-stage-)(ccsdk-.*)$' + - project-view - project: name: ccsdk-apps @@ -13,15 +11,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/apps' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -57,6 +59,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1604-builder-4c-4g @@ -72,6 +76,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-apps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 2890a4e43..c97d1936b 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -10,6 +10,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index eddee6c61..421785491 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -5,13 +5,17 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/cds' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-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 @@ -45,6 +49,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' build-node: ubuntu1604-builder-4c-4g @@ -58,6 +64,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-cds-settings' files: '**' archive-artifacts: '' diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index e5ecc104e..c3f6d0e69 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -5,12 +5,16 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' project: 'ccsdk/dashboard' stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-dashboard-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 @@ -19,7 +23,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: centos7-redis-4c-4g + build-node: ubuntu1604-docker-8c-8g - project: name: ccsdk-dashboard-sonar @@ -44,6 +48,26 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-dashboard-settings' build-node: centos7-redis-4c-4g +- project: + name: ccsdk-dashboard-docker + project-name: 'ccsdk-dashboard' + jobs: + - 'docker-version-java-daily': + mvn-params: '-Dmaven.test.skip=true' + project: 'ccsdk/dashboard' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + mvn-settings: 'ccsdk-dashboard-settings' + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker + build-node: queue-docker-4c-4g diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 0eecad645..ce8015e13 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -5,14 +5,18 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/distribution' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -32,6 +36,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -68,6 +74,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-distribution-settings' build-node: ubuntu1604-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 3d84e613b..3950c9869 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/features' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -49,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-features-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index d1e97e83a..c0d576b84 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/parent' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -35,6 +39,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-parent-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/platform-plugins.yaml b/jjb/ccsdk/platform-plugins.yaml index 9f467ee3a..b024a7a76 100644 --- a/jjb/ccsdk/platform-plugins.yaml +++ b/jjb/ccsdk/platform-plugins.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/platform/plugins' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -49,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-platform-plugins-settings' build-node: centos7-redis-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 9d73572ba..1b3237f98 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/adaptors' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -49,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-adaptors-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index a1c5753b1..a3feadd15 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/core' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -49,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-core-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 986e051a1..66c753b0b 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/northbound' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -49,6 +53,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-northbound-settings' build-node: ubuntu1604-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 4f3780cf5..290cb9b90 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/sli/plugins' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -48,6 +52,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-sli-plugins-settings' diff --git a/jjb/ccsdk/utils.yaml b/jjb/ccsdk/utils.yaml index 261c9f193..5c5e31633 100644 --- a/jjb/ccsdk/utils.yaml +++ b/jjb/ccsdk/utils.yaml @@ -5,15 +5,19 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g - '{project-name}-{stream}-release-version-java-daily' + sign-artifacts: true project: 'ccsdk/utils' stream: - 'master': branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -35,6 +39,8 @@ branch: 'master' - 'casablanca': branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'ccsdk-utils-settings' diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index d812804f7..f4f46f3ca 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -14,10 +14,8 @@ platforms: - centos-7 - - centos-7-arm64 - ubuntu-16.04 - ubuntu-16.04-arm64 - - ubuntu-18.04-arm64 templates: builder - project: @@ -36,7 +34,6 @@ platforms: - ubuntu-16.04 - ubuntu-16.04-arm64 - - ubuntu-18.04-arm64 templates: docker - project: diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml index 5a81ffa8b..d069aa59f 100644 --- a/jjb/clamp/clamp-csit.yaml +++ b/jjb/clamp/clamp-csit.yaml @@ -5,11 +5,14 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'clamp' - stream: 'master' + stream: + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'APIs': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' - 'UIs': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' - branch: 'master' diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index 20d7f451e..b941a2c3d 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -29,8 +29,10 @@ project: 'clamp' stream: - - 'master': - branch: 'master' + - 'master': + branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'clamp-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index c48deda16..f5d60d892 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -13,7 +13,8 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: 'ubuntu1604-docker-v1-8c-8g' + build-timeout: 300 jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml new file mode 100644 index 000000000..6740daefc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile-csit.yaml @@ -0,0 +1,20 @@ +- project: + name: dcaegen2-collectors-datafile-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-collectors-datafile' + stream: + - 'master': + branch: 'master' + - 'dublin': + branch: 'dublin' + functionality: + - 'ManagementInterface-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + - 'Functional-suite': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index dc4b98b44..7f065240c 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -6,6 +6,8 @@ stream: - 'master': branch: 'master' + - 'dublin': + branch: 'dublin' # apply to all jobs project: 'dcaegen2/collectors/datafile' mvn-settings: 'dcaegen2-collectors-datafile-settings' diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml new file mode 100644 index 000000000..5720a64dc --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: dcaegen2-collectors-restconf-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-collectors-restconf' + stream: + - 'master': + branch: 'master' + functionality: + - 'testsuites': + trigger_jobs: + - '{project-name}-{stream}-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml new file mode 100644 index 000000000..559370c57 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-csit.yaml @@ -0,0 +1,14 @@ +- project: + name: dcaegen2-bbs-event-processor-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'dcaegen2-services-bbs-event-processor' + stream: + - 'master': + branch: 'master' + functionality: + - 'bbs-testsuites': + trigger_jobs: + - 'dcaegen2-services-master-bbs-event-processor-merge-java' + robot-options: '' diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml new file mode 100644 index 000000000..670cbd844 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -0,0 +1,48 @@ +--- +- project: + name: dcaegen2-services-bbs-event-processor + project: 'dcaegen2/services' + project-name: 'dcaegen2-services' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + subproject: + - 'bbs-event-processor': + pom: 'components/bbs-event-processor/pom.xml' + pattern: 'components/bbs-event-processor/**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-services-bbs-event-processor-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-bbs-event-processor' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-params: '-f components/bbs-event-processor/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: dcaegen2-services-bbs-event-processor-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-bbs-event-processor-clm' + mvn-params: '-f components/bbs-event-processor/pom.xml' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml new file mode 100644 index 000000000..2d8973637 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -0,0 +1,36 @@ +--- +- project: + name: dcaegen2-services-datalake-handler + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' + subproject: + - 'datalake-handler': + pom: 'components/datalake-handler/pom.xml' + pattern: 'components/datalake-handler/**' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-docker-8c-8g' + +- project: + name: dcaegen2-services-datalake-handler-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-docker-8c-8g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services-datalake-handler' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' + mvn-params: '-f components/datalake-handler/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-services-java.yaml b/jjb/dcaegen2/dcaegen2-services-java.yaml new file mode 100644 index 000000000..dc0475994 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-services-java.yaml @@ -0,0 +1,11 @@ +--- +- project: + name: dcaegen2-services-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + build-node: ubuntu1604-docker-4c-4g + project: 'dcaegen2/services' + project-name: 'dcaegen2-services' + branch: 'master' + mvn-settings: 'dcaegen2-services-settings' diff --git a/jjb/dcaegen2/dcaegen2-csit.yaml b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml index db0b4f680..2d11c7fbd 100644 --- a/jjb/dcaegen2/dcaegen2-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-ves-prh-csit.yaml @@ -1,5 +1,5 @@ - project: - name: dcaegen2-testsuites-csit + name: dcaegen2-collectors-ves-testsuites-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' @@ -10,7 +10,6 @@ functionality: - 'testsuites' trigger_jobs: - - 'dcaegen2-master-merge-java' - 'dcaegen2-collectors-ves-master-merge-java' robot-options: '' - project: @@ -25,6 +24,5 @@ functionality: - 'prh-testsuites' trigger_jobs: - - 'dcaegen2-{stream}-merge-java' - - '{project-name}-{stream}-merge-java' + - 'dcaegen2-services-prh-master-merge-java' robot-options: '' diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index a48009671..2420436b6 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -17,7 +17,7 @@ # - '{project-name}-{stream}-docker-java-daily': # doesn't support mvn-goals override, so trying this... - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean package -P docker docker:build -DpushImage' + mvn-goals: 'clean package -P docker docker:build docker:push' # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 4d948f61e..ac8aade16 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -10,7 +10,7 @@ # - '{project-name}-{stream}-docker-java-daily': # doesn't support mvn-goals override, so trying this... - '{project-name}-{stream}-docker-java-shell-daily': - mvn-goals: 'clean package -P docker docker:build -DpushImage' + mvn-goals: 'clean package -P docker docker:build docker:push' # No-op script: '/bin/true' build-node: 'ubuntu1604-docker-8c-8g' @@ -19,6 +19,29 @@ stream: - 'master': branch: 'master' + mvn-settings: 'dmaap-datarouter-settings' + files: '**' + archive-artifacts: '' + +- project: + name: dmaap-datarouter-casablanca + project-name: 'dmaap-datarouter' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + # + # see DMAAP-334 for more details, but + # - '{project-name}-{stream}-docker-java-daily': + # doesn't support mvn-goals override, so trying this... + - '{project-name}-{stream}-docker-java-shell-daily': + mvn-goals: 'clean package -P docker docker:build -DpushImage' + # No-op + script: '/bin/true' + build-node: 'ubuntu1604-docker-8c-8g' + + project: 'dmaap/datarouter' + stream: - 'casablanca': branch: 'casablanca' mvn-settings: 'dmaap-datarouter-settings' diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 8515d7378..e06166ad0 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -25,3 +25,11 @@ branch: 'beijing' - casablanca: branch: 'casablanca' + +- project: + name: doc-info + project-name: doc + jobs: + - gerrit-info-yaml-verify + project: doc + branch: master diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index bdd15418d..d3021cc8f 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -70,4 +70,12 @@ branch: 'casablanca' mvn-settings: 'externalapi-nbi-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: externalapi-nbi-info + project-name: externalapi-nbi + jobs: + - gerrit-info-yaml-verify + project: externalapi/nbi + branch: master diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index b7a56afb1..c78301521 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -487,6 +487,15 @@ </org.jenkinsci.plugins.golang.GolangBuildWrapper> - wrapper: + name: golang112 + wrappers: + - raw: + xml: | + <org.jenkinsci.plugins.golang.GolangBuildWrapper plugin="golang@1.2"> + <goVersion>Golang 1.12</goVersion> + </org.jenkinsci.plugins.golang.GolangBuildWrapper> + +- wrapper: # This wrapper is required for all jobs as it configures the wrappers # needed by the eCOMP infra. name: infra-wrappers diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 6c139ddb8..f5c6bcde4 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -13,9 +13,11 @@ submodule-recursive: true # default params for helm jobs - pre_build_script: '' build_script: '' + git-url: '$GIT_URL/$PROJECT' post_build_script: '' + pre_build_script: '' + submodule-recursive: true submodule-timeout: 10 ##################### @@ -107,6 +109,92 @@ - lf-provide-maven-settings-cleanup - job-template: + name: '{project-name}-{stream}-verify-external-helm' + # Job template for helm verify jobs + + <<: *helm_job_boiler_plate + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '$GERRIT_BRANCH' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + choosing-strategy: default + + triggers: + - gerrit-trigger-helm-patch-submitted: + status-context: '{project}-Helm-Verify' + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - inject: + properties-content: 'HELM_MODULE={helm-module}' + - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh + - shell: '{obj:pre_build_script}' + - shell: '{obj:build_script}' + +- job-template: + name: '{project-name}-{stream}-merge-external-helm' + # Job template for Helm merge jobs + + <<: *helm_job_boiler_plate + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - lf-infra-gerrit-scm: + jenkins-ssh-credential: '{jenkins-ssh-credential}' + git-url: '{git-url}' + refspec: '$GERRIT_BRANCH' + branch: '$GERRIT_BRANCH' + submodule-recursive: '{submodule-recursive}' + submodule-timeout: '{submodule-timeout}' + choosing-strategy: default + + triggers: + - gerrit-trigger-helm-patch-merged: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '{files}' + + builders: + - lf-infra-pre-build + - inject: + properties-content: 'HELM_MODULE={helm-module}' + - lf-provide-maven-settings: + global-settings-file: 'global-settings' + settings-file: '{mvn-settings}' + - shell: '{obj:pre_build_script}' + - shell: '{obj:build_script}' + - lf-infra-create-netrc: + server-id: oom-helm + - inject: + properties-content: | + BUILD_TYPE=snapshot + - shell: '{obj:post_build_script}' + - lf-provide-maven-settings-cleanup + +- job-template: name: '{project-name}-{stream}-stage-helm' # Job template for Helm stage jobs diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 70d8c097e..c7fe3cf80 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -490,6 +490,7 @@ project-type: freestyle node: '{build-node}' disabled: '{disabled}' + version-properties: 'version.properties' maven-deploy-properties: properties: - infra-properties: @@ -529,7 +530,7 @@ settings-file: '{mvn-settings}' - inject: - properties-file: version.properties + properties-file: '{version-properties}' - maven-set-release-version: maven-version: '{maven-version}' mvn-settings: '{mvn-settings}' diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index fe37740b6..517643eb1 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -44,3 +44,11 @@ project-name: 'holmes-common' branch: 'master' mvn-settings: 'holmes-common-settings' + +- project: + name: holmes-common-info + project-name: holmes-common + jobs: + - gerrit-info-yaml-verify + project: holmes/common + branch: master diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml deleted file mode 100644 index 82e03fe04..000000000 --- a/jjb/holmes/holmes-dsa.yaml +++ /dev/null @@ -1,44 +0,0 @@ ---- -- project: - name: holmes-dsa - project-name: 'holmes-dsa' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-daily': - mvn-params: '-Dmaven.test.skip=true' - build-node: ubuntu1604-docker-8c-8g - project: 'holmes/dsa' - stream: - - 'master': - branch: 'master' - mvn-settings: 'holmes-dsa-settings' - files: '**' - archive-artifacts: '' - docker-pom: 'pom.xml' - mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g - -- project: - name: holmes-dsa-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'holmes/dsa' - project-name: 'holmes-dsa' - branch: 'master' - mvn-settings: 'holmes-dsa-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: holmes-dsa-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: holmes/dsa - project-name: 'holmes-dsa' - branch: 'master' - mvn-settings: 'holmes-dsa-settings' diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index fb36947be..06315de24 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -42,3 +42,11 @@ project-name: 'holmes-engine-management' branch: 'master' mvn-settings: 'holmes-engine-management-settings' + +- project: + name: holmes-engine-management-info + project-name: holmes-engine-management + jobs: + - gerrit-info-yaml-verify + project: holmes/engine-management + branch: master diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 42f82ba43..089a55f1f 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -42,3 +42,11 @@ project-name: 'holmes-rule-management' branch: 'master' mvn-settings: 'holmes-rule-management-settings' + +- project: + name: holmes-rule-management-info + project-name: holmes-rule-management + jobs: + - gerrit-info-yaml-verify + project: holmes/rule-management + branch: master diff --git a/jjb/integration/integration-devtool.yaml b/jjb/integration/integration-devtool.yaml index 175dffa5a..b656b4fbd 100644 --- a/jjb/integration/integration-devtool.yaml +++ b/jjb/integration/integration-devtool.yaml @@ -14,3 +14,11 @@ branch: 'master' mvn-settings: 'integration-devtool-settings' build-node: ubuntu1604-builder-2c-1g + +- project: + name: integration-devtool-info + project-name: integration-devtool + jobs: + - gerrit-info-yaml-verify + project: integration/devtool + branch: master diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index cb253c666..03480eeb1 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -41,3 +41,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'integration-settings' + +- project: + name: integration-info + project-name: integration + jobs: + - gerrit-info-yaml-verify + project: integration + branch: master diff --git a/jjb/modeling/build-modeling-genericparser-docker-image.sh b/jjb/modeling/build-modeling-genericparser-docker-image.sh new file mode 100644 index 000000000..d570d18a2 --- /dev/null +++ b/jjb/modeling/build-modeling-genericparser-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./docker/*.* + +./docker/build_image.sh + diff --git a/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml new file mode 100644 index 000000000..032881c2c --- /dev/null +++ b/jjb/modeling/modeling-toscaparsers-genericparser-csit.yaml @@ -0,0 +1,13 @@ +--- +- project: + name: modeling-genericparser-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'modeling-genericparser' + stream: 'master' + functionality: + - 'sanity-check': + trigger_jobs: 'modeling-genericparser-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master'
\ No newline at end of file diff --git a/jjb/modeling/modeling-toscaparsers-genericparser.yaml b/jjb/modeling/modeling-toscaparsers-genericparser.yaml new file mode 100644 index 000000000..f21e60cd7 --- /dev/null +++ b/jjb/modeling/modeling-toscaparsers-genericparser.yaml @@ -0,0 +1,60 @@ +--- + +- project: + name: modeling-genericparser + project-name: 'modeling-genericparser' + project: 'modeling/genericparser' + stream: + - 'master': + branch: 'master' + mvn-settings: 'modeling-genericparser-settings' + subproject: + - 'genericparser': + path: '.' + pattern: '**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-modeling-genericparser-docker-image.sh' + build-node: ubuntu1604-docker-8c-8g + files: '**' + archive-artifacts: '' + build-node: centos7-redis-4c-4g + +- project: + name: modeling-genericparser-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: centos7-redis-4c-4g + project: 'modeling/genericparser' + project-name: 'modeling-genericparser' + branch: 'master' + mvn-settings: 'modeling-genericparser-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: modeling-genericparser-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: modeling/genericparser + project-name: 'modeling-genericparser' + build-node: centos7-redis-4c-4g + branch: 'master' + mvn-settings: 'modeling-genericparser-settings' + +- project: + name: modeling-genericparser-info + project-name: modeling-genericparser + jobs: + - gerrit-info-yaml-verify + project: modeling/genericparser + branch: master diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml b/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml deleted file mode 100644 index 5b72b09cd..000000000 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker.yaml +++ /dev/null @@ -1,59 +0,0 @@ ---- -- project: - name: modeling-project-view - project-name: modeling - views: - - project-view - -- project: - name: modeling-toscaparsers-javatoscachecker - project-name: 'modeling-toscaparsers-javatoscachecker' - project: 'modeling/toscaparsers' - stream: - - 'master': - branch: 'master' - mvn-settings: 'modeling-toscaparsers-settings' - build-node: ubuntu1604-docker-8c-8g - subproject: - - 'javatoscachecker': - pattern: 'javatoscachecker/**' - pom: 'javatoscachecker/pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-properties-daily': - setVersion: 'DontSetVersion' - docker-pom: 'javatoscachecker/pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - maven-properties: | - skip.docker.build=false - skip.docker.tag=false - skip.docker.push=false - -- project: - name: modeling-toscaparsers-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'modeling/toscaparsers' - project-name: 'modeling-toscaparsers' - branch: 'master' - mvn-params: '-f javatoscachecker/pom.xml' - mvn-settings: 'modeling-toscaparsers-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: modeling-toscaparsers-javatoscachecker-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f javatoscachecker/pom.xml' - nexus-iq-namespace: 'onap-' - project: modeling/toscaparsers - project-name: 'modeling-toscaparsers-javatoscachecker' - build-node: ubuntu1604-docker-8c-8g - branch: 'master' - mvn-settings: 'modeling-toscaparsers-settings' diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 4c5e188e7..75294851b 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -68,3 +68,11 @@ project-name: 'msb-apigateway' branch: 'master' mvn-settings: 'msb-apigateway-settings' + +- project: + name: msb-apigateway-info + project-name: msb-apigateway + jobs: + - gerrit-info-yaml-verify + project: msb/apigateway + branch: master diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index ed89cab54..fe84a2c81 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -61,3 +61,11 @@ project-name: 'msb-discovery' branch: 'master' mvn-settings: 'msb-discovery-settings' + +- project: + name: msb-discovery-info + project-name: msb-discovery + jobs: + - gerrit-info-yaml-verify + project: msb/discovery + branch: master diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 537f1f444..5394ba135 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -37,3 +37,11 @@ project-name: 'msb-java-sdk' branch: 'master' mvn-settings: 'msb-java-sdk-settings' + +- project: + name: msb-java-sdk-info + project-name: msb-java-sdk + jobs: + - gerrit-info-yaml-verify + project: msb/java-sdk + branch: master diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index 476dee3fe..732d61897 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -37,3 +37,11 @@ project-name: 'msb-swagger-sdk' branch: 'master' mvn-settings: 'msb-swagger-sdk-settings' + +- project: + name: msb-swagger-sdk-info + project-name: msb-swagger-sdk + jobs: + - gerrit-info-yaml-verify + project: msb/swagger-sdk + branch: master diff --git a/jjb/multicloud/build-multicloud-framework-docker-image.sh b/jjb/multicloud/build-multicloud-framework-docker-image.sh index b749b30ef..9d78d73ff 100755 --- a/jjb/multicloud/build-multicloud-framework-docker-image.sh +++ b/jjb/multicloud/build-multicloud-framework-docker-image.sh @@ -6,5 +6,7 @@ CURRENTDIR="$(pwd)" echo $CURRENTDIR chmod 755 ./multivimbroker/docker/*.* +chmod 755 ./artifactbroker/docker/*.* -./multivimbroker/docker/build_image.sh
\ No newline at end of file +./multivimbroker/docker/build_image.sh +./artifactbroker/docker/build_image.sh
\ No newline at end of file diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index ac4fd2212..10c8d3edf 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -71,3 +71,11 @@ project-name: 'multicloud-azure' branch: 'master' mvn-settings: 'multicloud-azure-settings' + +- project: + name: multicloud-azure-info + project-name: multicloud-azure + jobs: + - gerrit-info-yaml-verify + project: multicloud/azure + branch: master diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 52ab6416b..14ebfc30a 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -11,12 +11,15 @@ - 'multivimbroker': pom: 'multivimbroker/pom.xml' pattern: 'multivimbroker/**' + - 'artifactbroker': + pom: 'artifactbroker/pom.xml' + pattern: 'artifactbroker/**' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' @@ -50,24 +53,51 @@ # build-node: ubuntu1604-docker-arm64-4c-2g # - project: - name: multicloud-framework-sonar + name: multicloud-framework-multivimbroker-sonar jobs: - gerrit-maven-sonar cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'multicloud/framework' - project-name: 'multicloud-framework' + project-name: 'multicloud-framework-multivimbroker' branch: 'master' + mvn-params: '-f multivimbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: - name: multicloud-framework-java-clm + name: multicloud-framework-multivimbroker-clm jobs: - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: multicloud/framework - project-name: 'multicloud-framework' + project-name: 'multicloud-framework-multivimbroker' + branch: 'master' + mvn-params: '-f multivimbroker/pom.xml' + mvn-settings: 'multicloud-framework-settings' + +- project: + name: multicloud-framework-artifactbroker-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/framework' + project-name: 'multicloud-framework-artifactbroker' + branch: 'master' + mvn-params: '-f artifactbroker/pom.xml' + mvn-settings: 'multicloud-framework-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-framework-artifactbroker-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: multicloud/framework + project-name: 'multicloud-framework-artifactbroker' branch: 'master' + mvn-params: '-f artifactbroker/pom.xml' mvn-settings: 'multicloud-framework-settings' diff --git a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml b/jjb/multicloud/multicloud-k8s-csit.yaml index 5c9335f29..a5a1540e7 100644 --- a/jjb/modeling/modeling-toscaparsers-javatoscachecker-csit.yaml +++ b/jjb/multicloud/multicloud-k8s-csit.yaml @@ -1,13 +1,13 @@ --- - project: - name: modeling-toscaparsers-javatoscachecker-csit + name: multicloud-k8s-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' - project-name: 'modeling-toscaparsers-javatoscachecker' + project-name: 'multicloud-k8s' stream: 'master' functionality: - - 'APIs': - trigger_jobs: '{project-name}-{stream}-release-version-java-daily' + - 'functionality1': + trigger_jobs: 'multicloud-k8s-master-docker-golang-shell-daily' robot-options: '' branch: 'master' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index c15eeed7f..d4aa0befd 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -3,7 +3,7 @@ name: multicloud-k8s project-name: 'multicloud-k8s' path: 'src/k8splugin' - golangver: 'golang111' + golangver: 'golang112' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-verify-golang' @@ -28,7 +28,7 @@ # name: multicloud-k8s-arm64 # project-name: 'multicloud-k8s-arm64' # path: 'src/k8splugin' -# golangver: 'golang111' +# golangver: 'golang112' # jobs: # - '{project-name}-{stream}-docker-golang-shell-daily': # script: @@ -45,3 +45,11 @@ # files: '**' # archive-artifacts: '' # build-node: ubuntu1604-docker-arm64-4c-2g + +- project: + name: multicloud-k8s-info + project-name: multicloud-k8s + jobs: + - gerrit-info-yaml-verify + project: multicloud/k8s + branch: master diff --git a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml index 93ccc824a..9630ab3f5 100644 --- a/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-fcaps-csit.yaml @@ -2,6 +2,7 @@ - project: name: multicloud-openstack-fcaps-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'multicloud-fcaps' stream: 'master' diff --git a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml index 74b087d51..b97abdae1 100644 --- a/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml +++ b/jjb/multicloud/multicloud-openstack-lenovo-csit.yaml @@ -2,6 +2,7 @@ - project:
name: multicloud-openstack-lenovo-csit
jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
- '{project-name}-{stream}-csit-{functionality}'
project-name: 'multicloud-lenovo'
stream: 'master'
diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 7660d58c6..8a1ec577a 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -71,3 +71,11 @@ project-name: 'multicloud-openstack-vmware' branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' + +- project: + name: multicloud-openstack-vmware-info + project-name: multicloud-openstack-vmware + jobs: + - gerrit-info-yaml-verify + project: multicloud/openstack/vmware + branch: master diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index b3fec07bd..c9151f793 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -185,3 +185,11 @@ mvn-settings: 'multicloud-openstack-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: multicloud-openstack-info + project-name: multicloud-openstack + jobs: + - gerrit-info-yaml-verify + project: multicloud/openstack + branch: master diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 69fa0c471..261c94a07 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -17,3 +17,11 @@ files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: music-distributed-kv-store-info + project-name: music-distributed-kv-store + jobs: + - gerrit-info-yaml-verify + project: music/distributed-kv-store + branch: master diff --git a/jjb/music/music-mdbc.yaml b/jjb/music/music-mdbc.yaml index 172d1e583..957a55ebd 100644 --- a/jjb/music/music-mdbc.yaml +++ b/jjb/music/music-mdbc.yaml @@ -25,3 +25,11 @@ project-name: 'music-mdbc' branch: 'master' mvn-settings: 'music-mdbc-settings' + +- project: + name: music-mdbc-info + project-name: music-mdbc + jobs: + - gerrit-info-yaml-verify + project: music/mdbc + branch: master diff --git a/jjb/music/music-prom.yaml b/jjb/music/music-prom.yaml index a86189221..c0369a4c4 100644 --- a/jjb/music/music-prom.yaml +++ b/jjb/music/music-prom.yaml @@ -32,3 +32,11 @@ project-name: 'music-prom' branch: 'master' mvn-settings: 'music-prom-settings' + +- project: + name: music-prom-info + project-name: music-prom + jobs: + - gerrit-info-yaml-verify + project: music/prom + branch: master diff --git a/jjb/music/music-trigger.yaml b/jjb/music/music-trigger.yaml deleted file mode 100644 index 105dedd25..000000000 --- a/jjb/music/music-trigger.yaml +++ /dev/null @@ -1,31 +0,0 @@ ---- -- project: - name: music-trigger - project-name: 'music' - subproject: - - 'music-trigger': - pom: 'musictrigger/pom.xml' - pattern: 'musictrigger/**' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - project: 'music' - stream: - - 'trigger-casablanca': - branch: 'casablanca' - mvn-settings: 'music-settings' - files: '**' - archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g - - -- project: - name: music-trigger-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f musictrigger/pom.xml assembly:single' - nexus-iq-namespace: 'onap-' - project: music - project-name: 'music-trigger' - branch: 'master' - mvn-settings: 'music-settings' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index 698799662..33cc586f6 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -21,10 +21,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' - - 'dev-cassandra-only': - branch: 'dev-cassandra-only' + - 'dublin': + branch: 'dublin' mvn-settings: 'music-settings' files: '**' archive-artifacts: '' @@ -53,3 +51,11 @@ project-name: 'music' branch: 'master' mvn-settings: 'music-settings' + +- project: + name: music-info + project-name: music + jobs: + - gerrit-info-yaml-verify + project: music + branch: master diff --git a/jjb/oom/include-yaml-check.sh b/jjb/oom/include-yaml-check.sh new file mode 100755 index 000000000..27359e597 --- /dev/null +++ b/jjb/oom/include-yaml-check.sh @@ -0,0 +1,14 @@ +#!/bin/bash + +# setting-up bash flags +set -x -e -o pipefail + +# remove old ansible - current centos build minion +# is quite old and using incompatible ansible 2.4.x +sudo yum -y remove ansible +sudo pip install ansible ansible-lint + +# perform check +ansible --version +ansible-lint --version +ansible-lint ./ansible/site.yml -vvv diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml new file mode 100644 index 000000000..ca2f15fc9 --- /dev/null +++ b/jjb/oom/offline-installer.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: offline-installer + project-name: 'offline-installer' + build-node: centos7-builder-2c-1g + offline_build_script: !include-raw-escape: include-yaml-check.sh + + stream: + - 'master': + branch: 'master' + + jobs: + - '{project-name}-{stream}-yaml-lint': + build_script: '{offline_build_script}' diff --git a/jjb/oom/oom-jobs.yaml b/jjb/oom/oom-jobs.yaml new file mode 100644 index 000000000..02eae3fe3 --- /dev/null +++ b/jjb/oom/oom-jobs.yaml @@ -0,0 +1,34 @@ +--- +- job-template: + name: '{project-name}-{stream}-yaml-lint' + node: '{build-node}' + type: freestyle + build_script: '' + pattern: '**' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: 'oom/{project-name}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + submodule-recursive: '{submodule-recursive}' + choosing-strategy: 'gerrit' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: 'oom/{project-name}' + branch: '{branch}' + files: '{obj:pattern}' + + builders: + - shell: '{obj:build_script}' + + publishers: + - lf-infra-publish + diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 8e4b001b0..2daca91e2 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -47,3 +47,11 @@ - shell: !include-raw-escape: oneclick-config-make-tar.sh - shell: !include-raw-escape: oneclick-config-build-docker-image.sh - shell: !include-raw-escape: ../include-docker-push.sh + +- project: + name: oomconfig-info + project-name: oomconfig + jobs: + - gerrit-info-yaml-verify + project: oom + branch: master diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 818d0100b..08380da9d 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -30,3 +30,11 @@ project-name: 'oom-registrator' branch: 'master' mvn-settings: 'oom-registrator-settings' + +- project: + name: oom-registrator-info + project-name: oom-registrator + jobs: + - gerrit-info-yaml-verify + project: oom/registrator + branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index f854c71d4..8773b4c66 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -11,8 +11,10 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage - - '{project-name}-{stream}-release-version-java-daily' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true project: 'oparent' stream: - 'master': @@ -33,3 +35,11 @@ project-name: 'oparent' branch: 'master' mvn-settings: 'oparent-settings' + +- project: + name: oparent-info + project-name: oparent + jobs: + - gerrit-info-yaml-verify + project: oparent + branch: master diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index f9b23856e..093ed28be 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -43,7 +43,7 @@ name: optf-cmso-sonar jobs: - gerrit-maven-sonar: - mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001' + mvn-params: '-Ddocker.pull.registry=nexus3.onap.org:10001 -DskipIntegrationTests=false' cron: 'H 11 * * *' build-node: ubuntu1604-docker-8c-8g project: 'optf/cmso' @@ -65,6 +65,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-cmso-settings' + +- project: + name: optf-cmso-info + project-name: optf-cmso + jobs: + - gerrit-info-yaml-verify + project: optf/cmso + branch: master diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index d5fa4963c..7660a2ef1 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -31,8 +29,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -78,6 +74,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-has-settings' + +- project: + name: optf-has-info + project-name: optf-has + jobs: + - gerrit-info-yaml-verify + project: optf/has + branch: master diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index f066dd824..27d6fcec1 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -6,8 +6,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -30,8 +28,6 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -77,6 +73,12 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' mvn-settings: 'optf-osdf-settings' + +- project: + name: optf-osdf-info + project-name: optf-osdf + jobs: + - gerrit-info-yaml-verify + project: optf/osdf + branch: master diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 1fba9abf7..f23b9c1e8 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -21,7 +21,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/apex-pdp' stream: @@ -81,3 +81,11 @@ project-name: 'policy-apex-pdp' branch: 'master' mvn-settings: 'policy-apex-pdp-settings' + +- project: + name: policy-apex-pdp-info + project-name: policy-apex-pdp + jobs: + - gerrit-info-yaml-verify + project: policy/apex-pdp + branch: master diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index ccf18d31c..946290919 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -12,7 +12,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/api' @@ -46,3 +46,11 @@ project-name: 'policy-api' branch: 'master' mvn-settings: 'policy-api-settings' + +- project: + name: policy-api-info + project-name: policy-api + jobs: + - gerrit-info-yaml-verify + project: policy/api + branch: master diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index d4e80b993..ccf6c75dd 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/common' stream: @@ -57,3 +57,11 @@ project-name: 'policy-common' branch: 'master' mvn-settings: 'policy-common-settings' + +- project: + name: policy-common-info + project-name: policy-common + jobs: + - gerrit-info-yaml-verify + project: policy/common + branch: master diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 33ad95d98..cedbc64a8 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -7,8 +7,6 @@ stream: - 'master': branch: master - - 'casablanca': - branch: casablanca functionality: - 'health' trigger_jobs: @@ -16,6 +14,7 @@ - 'policy-drools-pdp-{stream}-merge-scm-mvn-script' - 'policy-drools-applications-{stream}-merge-java' robot-options: '' + build-timeout: 40 branch: 'master' - project: @@ -27,8 +26,6 @@ stream: - 'master': branch: master - - 'casablanca': - branch: casablanca functionality: - 'apex-pdp' trigger_jobs: @@ -45,8 +42,6 @@ stream: - 'master': branch: master - - 'casablanca': - branch: casablanca functionality: - 'distribution' trigger_jobs: @@ -100,4 +95,37 @@ trigger_jobs: - 'policy-pap-{stream}-merge-java' robot-options: '' - branch: 'master'
\ No newline at end of file + branch: 'master' + +- project: + name: policy-drools-pdp-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'drools-pdp' + trigger_jobs: + - 'policy-drools-pdp-{stream}-merge-java' + robot-options: '' + branch: 'master' + +- project: + name: policy-drools-applications-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'policy' + stream: + - 'master': + branch: master + functionality: + - 'drools-applications' + trigger_jobs: + - 'policy-drools-applications-{stream}-merge-java' + robot-options: '' + branch: 'master' + diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index c2ad0f723..6c5753c69 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -12,7 +12,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/distribution' @@ -71,3 +71,11 @@ project-name: 'policy-distribution' branch: 'master' mvn-settings: 'policy-distribution-settings' + +- project: + name: policy-distribution-info + project-name: policy-distribution + jobs: + - gerrit-info-yaml-verify + project: policy/distribution + branch: master diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml new file mode 100644 index 000000000..c378217a0 --- /dev/null +++ b/jjb/policy/policy-docker-base-common.yaml @@ -0,0 +1,56 @@ +--- +- project: + name: policy-docker-base-common + project-name: 'policy-docker' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: "-P docker" + build-node: ubuntu1604-docker-8c-8g + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-P docker' + disabled: false + build-node: ubuntu1604-docker-8c-8g + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-docker-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-builder-4c-4g + +- project: + name: policy-docker-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'policy/docker' + project-name: 'policy-docker' + branch: 'master' + mvn-settings: 'policy-docker-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: policy-docker-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: policy/docker + project-name: 'policy-docker' + branch: 'master' + mvn-settings: 'policy-docker-settings' + +- project: + name: policy-docker-info + project-name: policy-docker + jobs: + - gerrit-info-yaml-verify + project: policy/docker + branch: master diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 49da3d215..bab2c2e52 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'drools-apps-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-applications' @@ -67,3 +67,11 @@ project-name: 'policy-drools-applications' branch: 'master' mvn-settings: 'policy-drools-applications-settings' + +- project: + name: policy-drools-applications-info + project-name: policy-drools-applications + jobs: + - gerrit-info-yaml-verify + project: policy/drools-applications + branch: master diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 367783742..c7ab5c2b3 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/drools-pdp' stream: @@ -76,3 +76,11 @@ project-name: 'policy-drools-pdp' branch: 'master' mvn-settings: 'policy-drools-pdp-settings' + +- project: + name: policy-drools-pdp-info + project-name: policy-drools-pdp + jobs: + - gerrit-info-yaml-verify + project: policy/drools-pdp + branch: master diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 70d9c3a9f..114adb78e 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -15,7 +15,7 @@ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' script: !include-raw-escape: 'include-raw-docker-release.sh' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/engine' stream: @@ -70,10 +70,18 @@ name: policy-engine-clm jobs: - gerrit-maven-clm: - build-timeout: 30 + build-timeout: 40 nexus-iq-namespace: 'onap-' project: policy/engine project-name: 'policy-engine' branch: 'master' mvn-settings: 'policy-engine-settings' build-node: 'ubuntu1604-builder-4c-4g' + +- project: + name: policy-engine-info + project-name: policy-engine + jobs: + - gerrit-info-yaml-verify + project: policy/engine + branch: master diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 9d332ccbc..b7507abb7 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -5,6 +5,8 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily': + disabled: false project: 'policy/models' stream: @@ -37,3 +39,11 @@ project-name: 'policy-models' branch: 'master' mvn-settings: 'policy-models-settings' + +- project: + name: policy-models-info + project-name: policy-models + jobs: + - gerrit-info-yaml-verify + project: policy/models + branch: master diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index f5b235364..e33bb2380 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -12,7 +12,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/pap' @@ -46,3 +46,11 @@ project-name: 'policy-pap' branch: 'master' mvn-settings: 'policy-pap-settings' + +- project: + name: policy-pap-info + project-name: policy-pap + jobs: + - gerrit-info-yaml-verify + project: policy/pap + branch: master diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 525ffe358..22c1edf17 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -6,7 +6,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - disabled: true + disabled: false project: 'policy/parent' stream: @@ -44,3 +44,11 @@ project-name: 'policy-parent' branch: 'master' mvn-settings: 'policy-parent-settings' + +- project: + name: policy-parent-info + project-name: policy-parent + jobs: + - gerrit-info-yaml-verify + project: policy/parent + branch: master diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 5726eb0f6..1ad7b7a1b 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -12,7 +12,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - disabled: true + disabled: false build-node: ubuntu1604-docker-8c-8g project: 'policy/xacml-pdp' @@ -46,3 +46,11 @@ project-name: 'policy-xacml-pdp' branch: 'master' mvn-settings: 'policy-xacml-pdp-settings' + +- project: + name: policy-xacml-pdp-info + project-name: policy-xacml-pdp + jobs: + - gerrit-info-yaml-verify + project: policy/xacml-pdp + branch: master diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index cba0aba91..d77ea9fe0 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -48,3 +48,11 @@ 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 + project: portal/sdk + branch: master diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 9e7305088..e125984e9 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -45,3 +45,11 @@ branch: 'master' build-node: ubuntu1604-builder-4c-4g mvn-settings: 'portal-settings' + +- project: + name: portal-info + project-name: portal + jobs: + - gerrit-info-yaml-verify + project: portal + branch: master diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index b012061ad..52547b224 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -67,3 +67,11 @@ project-name: 'sdc-dcae-d-ci' branch: 'master' mvn-settings: 'sdc-dcae-d-ci-settings' + +- project: + name: sdc-dcae-d-ci-info + project-name: sdc-dcae-d-ci + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/ci + branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index f5c613eff..70efc8408 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -62,3 +62,11 @@ project-name: 'sdc-dcae-d-dt-be-main' branch: 'master' mvn-settings: 'sdc-dcae-d-dt-be-main-settings' + +- project: + name: sdc-dcae-d-dt-be-main-info + project-name: sdc-dcae-d-dt-be-main + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/dt-be-main + branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml index 5e66fdbc1..08044a1fb 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-property.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-property.yaml @@ -38,3 +38,11 @@ project-name: 'sdc-dcae-d-dt-be-property' branch: 'master' mvn-settings: 'sdc-dcae-d-dt-be-property-settings' + +- project: + name: sdc-dcae-d-dt-be-property-info + project-name: sdc-dcae-d-dt-be-property + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/dt-be-property + branch: master diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 16c0a0a4a..ee6eec04d 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -64,3 +64,11 @@ build-node: ubuntu1604-builder-4c-2g branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' + +- project: + name: sdc-dcae-d-dt-info + project-name: sdc-dcae-d-dt + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/dt + branch: master diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index 4a273c696..4f459d5f1 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -63,3 +63,11 @@ build-node: ubuntu1604-builder-4c-2g branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' + +- project: + name: sdc-dcae-d-fe-info + project-name: sdc-dcae-d-fe + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/fe + branch: master diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index 0b11da733..397b82957 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -51,3 +51,11 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + +- project: + name: sdc-dcae-d-tosca-lab-info + project-name: sdc-dcae-d-tosca-lab + jobs: + - gerrit-info-yaml-verify + project: sdc/dcae-d/tosca-lab + branch: master diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 5886991ad..bda26b76a 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -45,3 +45,11 @@ project-name: 'sdc-jtosca' branch: 'master' mvn-settings: 'sdc-jtosca-settings' + +- project: + name: sdc-jtosca-info + project-name: sdc-jtosca + jobs: + - gerrit-info-yaml-verify + project: sdc/jtosca + branch: master diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 0f4155c8a..69c6e4a8c 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -45,3 +45,11 @@ project-name: 'sdc-sdc-distribution-client' branch: 'master' mvn-settings: 'sdc-sdc-distribution-client-settings' + +- project: + name: sdc-sdc-distribution-client-info + project-name: sdc-sdc-distribution-client + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-distribution-client + branch: master diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 540da4199..273fda71a 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -35,3 +35,11 @@ # archive-artifacts: '' # build-node: ubuntu1604-docker-arm64-4c-2g # maven-version: 'mvn35' + +- project: + name: sdc-sdc-docker-base-info + project-name: sdc-sdc-docker-base + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-docker-base + branch: master diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 66a86d029..92f948202 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -31,3 +31,11 @@ project-name: 'sdc-sdc-titan-cassandra' branch: 'master' mvn-settings: 'sdc-sdc-titan-cassandra-settings' + +- project: + name: sdc-sdc-titan-cassandra-info + project-name: sdc-sdc-titan-cassandra + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-titan-cassandra + branch: master diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index ab25246db..f1ef58c98 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -45,3 +45,11 @@ project-name: 'sdc-sdc-tosca' branch: 'master' mvn-settings: 'sdc-sdc-tosca-settings' + +- project: + name: sdc-sdc-tosca-info + project-name: sdc-sdc-tosca + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-tosca + branch: master diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 21ece3462..b20422991 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -69,3 +69,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'sdc-sdc-workflow-designer-settings' + +- project: + name: sdc-sdc-workflow-designer-info + project-name: sdc-sdc-workflow-designer + jobs: + - gerrit-info-yaml-verify + project: sdc/sdc-workflow-designer + branch: master diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index d0a110e79..a6e2dd58b 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -96,3 +96,11 @@ build-node: ubuntu1604-docker-8c-8g branch: 'master' mvn-settings: 'sdc-settings' + +- project: + name: sdc-info + project-name: sdc + jobs: + - gerrit-info-yaml-verify + project: sdc + branch: master diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 3b82a9bea..85242bafa 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -94,3 +94,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'sdnc-apps-settings' + +- project: + name: sdnc-apps-info + project-name: sdnc-apps + jobs: + - gerrit-info-yaml-verify + project: sdnc/apps + branch: master diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index dbbfb7c17..dd76bd4f9 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -8,10 +8,10 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' functionality: - 'healthcheck': trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' + - 'sdnc_netconf_tls_post_deploy': + trigger_jobs: '{project-name}-{stream}-release-java-daily-checkstyle' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index a2bf9a994..4bc5abe03 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -52,3 +52,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'sdnc-northbound-settings' + +- project: + name: sdnc-northbound-info + project-name: sdnc-northbound + jobs: + - gerrit-info-yaml-verify + project: sdnc/northbound + branch: master diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 4be63a24f..5e9add5e6 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -69,3 +69,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'sdnc-oam-settings' + +- project: + name: sdnc-oam-info + project-name: sdnc-oam + jobs: + - gerrit-info-yaml-verify + project: sdnc/oam + branch: master diff --git a/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index b194d853a..47a8e7f01 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' functionality: - 'integration-testing': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index faaeb60f9..f39545d26 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -10,8 +10,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' 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 @@ -43,3 +43,11 @@ project-name: 'so-libs' branch: 'master' mvn-settings: 'so-libs-settings' + +- project: + name: so-libs-info + project-name: so-libs + jobs: + - gerrit-info-yaml-verify + project: so/libs + branch: master diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 4d3e169c2..e69cb5b37 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'so-settings' files: '**' archive-artifacts: '' @@ -52,6 +52,14 @@ stream: - 'master': branch: 'master' - - 'casablanca': - branch: 'casablanca' + - 'dublin': + branch: 'dublin' mvn-settings: 'so-settings' + +- project: + name: so-info + project-name: so + jobs: + - gerrit-info-yaml-verify + project: so + branch: master diff --git a/jjb/testsuite/testsuite-heatbridge-master.yaml b/jjb/testsuite/testsuite-heatbridge-master.yaml index 16ee0d90e..fd6ec4ccc 100644 --- a/jjb/testsuite/testsuite-heatbridge-master.yaml +++ b/jjb/testsuite/testsuite-heatbridge-master.yaml @@ -28,3 +28,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'testsuite-heatbridge-settings' + +- project: + name: testsuite-heatbridge-info + project-name: testsuite-heatbridge + jobs: + - gerrit-info-yaml-verify + project: testsuite/heatbridge + branch: master diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index 400170c21..541359793 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -2,16 +2,41 @@ - project: name: testsuite-python-testing-utils project-name: 'testsuite-python-testing-utils' - subproject: - - python-testing-utils: - path: '.' - pattern: '**' + python-version: python2 jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - + - '{project-name}-{subproject}-python-staging-{stream}' + - '{project-name}-{subproject}-python-release-{stream}' project: 'testsuite/python-testing-utils' + subproject: + - 'robotframework-onap': + tox-dir: robotframework-onap/ + tox-envs: '' + + stream: + - 'master': + branch: 'master' + mvn-settings: 'testsuite-python-testing-utils-settings' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-builder-4c-4g' +- project: + name: testsuite-python-testing-utils-master-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: testsuite/python-testing-utils + project-name: 'testsuite-python-testing-utils' + build-node: 'ubuntu1604-builder-4c-4g' stream: - 'master': branch: 'master' mvn-settings: 'testsuite-python-testing-utils-settings' + +- project: + name: testsuite-python-testing-utils-info + project-name: testsuite-python-testing-utils + jobs: + - gerrit-info-yaml-verify + project: testsuite/python-testing-utils + branch: master diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index bc1aef22f..c573c708d 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -36,3 +36,11 @@ - 'casablanca': branch: 'casablanca' mvn-settings: 'testsuite-settings' + +- project: + name: testsuite-info + project-name: testsuite + jobs: + - gerrit-info-yaml-verify + project: testsuite + branch: master diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index b97a5528d..92e4eb78e 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -44,3 +44,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-server-settings' + +- project: + name: usecase-ui-server-info + project-name: usecase-ui-server + jobs: + - gerrit-info-yaml-verify + project: usecase-ui/server + branch: master diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 0de519538..d0e8809f5 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -36,3 +36,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'usecase-ui-settings' + +- project: + name: usecase-ui-info + project-name: usecase-ui + jobs: + - gerrit-info-yaml-verify + project: usecase-ui + branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index f4037920e..2442077ef 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -55,3 +55,11 @@ build-node: centos7-redis-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnflcm-settings' + +- project: + name: vfc-gvnfm-vnflcm-info + project-name: vfc-gvnfm-vnflcm + jobs: + - gerrit-info-yaml-verify + project: vfc/gvnfm/vnflcm + branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 502dc4102..1264efda5 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -49,3 +49,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnfmgr-settings' + +- project: + name: vfc-gvnfm-vnfmgr-info + project-name: vfc-gvnfm-vnfmgr + jobs: + - gerrit-info-yaml-verify + project: vfc/gvnfm/vnfmgr + branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 8d444bea6..e9fa8fe5c 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -50,3 +50,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-gvnfm-vnfres-settings' + +- project: + name: vfc-gvnfm-vnfres-info + project-name: vfc-gvnfm-vnfres + jobs: + - gerrit-info-yaml-verify + project: vfc/gvnfm/vnfres + branch: master diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index b88633eb5..81b452742 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -50,3 +50,11 @@ build-node: centos7-redis-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-catalog-settings' + +- project: + name: vfc-nfvo-catalog-info + project-name: vfc-nfvo-catalog + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/catalog + branch: master diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 9e8570d5d..86f9e5cb2 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -19,3 +19,11 @@ !include-raw-escape: 'build-nfvo-db-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + +- project: + name: vfc-nfvo-db-info + project-name: vfc-nfvo-db + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/db + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 6b9abf76e..e2955519b 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -49,3 +49,11 @@ build-node: ubuntu1604-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 + project: vfc/nfvo/driver/ems + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-sfc.yaml b/jjb/vfc/vfc-nfvo-driver-sfc.yaml index 00fc285da..10ea310aa 100644 --- a/jjb/vfc/vfc-nfvo-driver-sfc.yaml +++ b/jjb/vfc/vfc-nfvo-driver-sfc.yaml @@ -49,3 +49,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-sfc-settings' + +- project: + name: vfc-nfvo-driver-sfc-info + project-name: vfc-nfvo-driver-sfc + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/sfc + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 8121f1b0c..46a0e3c1f 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -44,3 +44,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + +- project: + name: vfc-nfvo-driver-svnfm-huawei-info + project-name: vfc-nfvo-driver-svnfm-huawei + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/vnfm/svnfm + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index a4e53e55c..ac8c87e0f 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -50,3 +50,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-driver-vnfm-gvnfm-settings' + +- project: + name: vfc-nfvo-driver-vnfm-gvnfm-info + project-name: vfc-nfvo-driver-vnfm-gvnfm + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/vnfm/gvnfm + branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml deleted file mode 100644 index fcf552e6b..000000000 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-nokia.yaml +++ /dev/null @@ -1,46 +0,0 @@ ---- -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokia - project-name: 'vfc-nfvo-driver-svnfm-nokia' - project: 'vfc/nfvo/driver/vnfm/svnfm' - stream: - - 'master': - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - subproject: - - 'drv-vnfm-nokia': - pom: 'nokia/vnfmdriver/pom.xml' - pattern: 'nokia/vnfmdriver/**' - jobs: - - '{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: vfc-nfvo-driver-vnfm-svnfm-nokia-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - mvn-params: '-f nokia/vnfmdriver/pom.xml' - build-node: ubuntu1604-builder-4c-4g - project: 'vfc/nfvo/driver/vnfm/svnfm' - project-name: 'vfc-nfvo-driver-vnfm-svnfm-nokia' - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: vfc-nfvo-driver-vnfm-svnfm-nokia-clm - jobs: - - gerrit-maven-clm: - mvn-params: '-f nokia/pom.xml' - nexus-iq-namespace: 'onap-' - project: vfc/nfvo/driver/vnfm/svnfm - project-name: 'vfc-nfvo-driver-svnfm-nokia' - build-node: ubuntu1604-builder-4c-4g - branch: 'master' - mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml index a5cbe022d..1dd3cff8d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-root.yaml @@ -18,3 +18,11 @@ - '{project-name}-{stream}-release-version-profile-java-daily' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g + +- project: + name: vfc-nfvo-driver-svnfm-root-info + project-name: vfc-nfvo-driver-svnfm-root + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/driver/vnfm/svnfm + branch: master diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index f209bbfc6..2805ea95f 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -44,3 +44,11 @@ build-node: centos7-redis-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' + +- project: + name: vfc-nfvo-lcm-info + project-name: vfc-nfvo-lcm + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/lcm + branch: master diff --git a/jjb/vfc/vfc-nfvo-multivimproxy.yaml b/jjb/vfc/vfc-nfvo-multivimproxy.yaml index b848b1f4e..935ffcaad 100644 --- a/jjb/vfc/vfc-nfvo-multivimproxy.yaml +++ b/jjb/vfc/vfc-nfvo-multivimproxy.yaml @@ -42,3 +42,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-multivimproxy-settings' + +- project: + name: vfc-nfvo-multivimproxy-info + project-name: vfc-nfvo-multivimproxy + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/multivimproxy + branch: master diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index 4d54d0eb5..7ebfd06cf 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -42,3 +42,11 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vfc-nfvo-resmanagement-settings' + +- project: + name: vfc-nfvo-resmanagement-info + project-name: vfc-nfvo-resmanagement + jobs: + - gerrit-info-yaml-verify + project: vfc/nfvo/resmanagement + branch: master diff --git a/jjb/vfc/vfc-nfvo-wfengine-java.yaml b/jjb/vfc/vfc-nfvo-wfengine-java.yaml index 0e9bcf864..9664d08e9 100644 --- a/jjb/vfc/vfc-nfvo-wfengine-java.yaml +++ b/jjb/vfc/vfc-nfvo-wfengine-java.yaml @@ -65,3 +65,11 @@ build-node: ubuntu1604-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 + project: vfc/nfvo/wfengine + branch: master diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index 997965db6..d3ffe6837 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -66,6 +66,7 @@ mvn-settings: 'vid-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-params: '-Dskip.npm' - project: name: vid-clm @@ -77,3 +78,12 @@ build-node: ubuntu1604-builder-4c-4g branch: 'master' mvn-settings: 'vid-settings' + mvn-params: '-Dskip.npm' + +- project: + name: vid-info + project-name: vid + jobs: + - gerrit-info-yaml-verify + project: vid + branch: master diff --git a/jjb/vnfrqts/pre-build-needs.sh b/jjb/vnfrqts/pre-build-needs.sh index da1d5e2d1..c5fb7b64e 100644 --- a/jjb/vnfrqts/pre-build-needs.sh +++ b/jjb/vnfrqts/pre-build-needs.sh @@ -5,4 +5,5 @@ source $WORKSPACE/venv-tox/bin/activate pip install --upgrade pip pip install -r etc/requirements.txt ls +wget -O $WORKSPACE/docs/data/needs.json "https://nexus.onap.org/content/sites/raw/org.onap.vnfrqts.requirements/master/needs.json" tox -e needs
\ No newline at end of file diff --git a/jjb/wss-unified-agent.config b/jjb/wss-unified-agent.config new file mode 100644 index 000000000..4a9f091c7 --- /dev/null +++ b/jjb/wss-unified-agent.config @@ -0,0 +1,236 @@ +####################################################################
+# WhiteSource Unified-Agent configuration file
+####################################################################
+##########################################
+# GENERAL SCAN MODE: Files and Package Managers
+##########################################
+
+checkPolicies=false
+forceCheckAllDependencies=false
+forceUpdate=false
+forceUpdate.failBuildOnPolicyViolation=false
+offline=false
+#ignoreSourceFiles=true
+#scanComment=
+#updateInventory=false
+#resolveAllDependencies=false
+#failErrorLevel=ALL
+#requireKnownSha1=false
+#generateProjectDetailsJson=true
+#generateScanReport=true
+#scanReportTimeoutMinutes=10
+#excludeDependenciesFromNodes=.*commons-io.*,.*maven-model
+
+#projectPerFolder=true
+#projectPerFolderIncludes=
+#projectPerFolderExcludes=
+
+#wss.connectionTimeoutMinutes=60
+# Change the below URL to your WhiteSource server.
+# Use the 'WhiteSource Server URL' which can be retrieved
+# from your 'Profile' page on the 'Server URLs' panel.
+# Then, add the '/agent' path to it.
+wss.url=https://saas.whitesourcesoftware.com/agent
+
+#npm.resolveDependencies=false
+#npm.ignoreSourceFiles=false
+#npm.includeDevDependencies=true
+#npm.runPreStep=true
+#npm.ignoreNpmLsErrors=true
+#npm.ignoreScripts=true
+#npm.yarnProject=true
+#npm.accessToken=
+#npm.identifyByNameAndVersion=true
+
+#bower.resolveDependencies=false
+#bower.ignoreSourceFiles=true
+#bower.runPreStep=true
+
+#nuget.resolvePackagesConfigFiles=false
+#nuget.resolveCsProjFiles=false
+#nuget.resolveDependencies=false
+#nuget.restoreDependencies=true
+#nuget.preferredEnvironment=
+#nuget.packagesDirectory=
+#nuget.ignoreSourceFiles=true
+#nuget.runPreStep=true
+#nuget.resolveNuspecFiles=false
+
+#python.resolveDependencies=false
+#python.ignoreSourceFiles=false
+#python.ignorePipInstallErrors=true
+#python.installVirtualenv=true
+#python.resolveHierarchyTree=false
+#python.requirementsFileIncludes=requirements.txt
+#python.resolveSetupPyFiles=true
+#python.runPipenvPreStep=true
+#python.pipenvDevDependencies=true
+#python.IgnorePipenvInstallErrors=true
+
+#maven.ignoredScopes=test provided
+#maven.resolveDependencies=false
+#maven.ignoreSourceFiles=true
+#maven.aggregateModules=true
+#maven.ignorePomModules=false
+#maven.runPreStep=true
+#maven.ignoreMvnTreeErrors=true
+#maven.environmentPath=
+#maven.m2RepositoryPath=
+
+#gradle.ignoredScopes=
+#gradle.resolveDependencies=false
+#gradle.runAssembleCommand=false
+#gradle.runPreStep=true
+#gradle.ignoreSourceFiles=true
+#gradle.aggregateModules=true
+#gradle.preferredEnvironment=wrapper
+#gradle.localRepositoryPath=
+
+#paket.resolveDependencies=false
+#paket.ignoredGroups=
+#paket.ignoreSourceFiles=false
+#paket.runPreStep=true
+#paket.exePath=
+
+#go.resolveDependencies=false
+#go.collectDependenciesAtRuntime=true
+#go.dependencyManager=
+#go.ignoreSourceFiles=true
+#go.glide.ignoreTestPackages=false
+#go.gogradle.enableTaskAlias=true
+
+#ruby.resolveDependencies = false
+#ruby.ignoreSourceFiles = false
+#ruby.installMissingGems = true
+#ruby.runBundleInstall = true
+#ruby.overwriteGemFile = true
+
+#sbt.resolveDependencies=false
+#sbt.ignoreSourceFiles=true
+#sbt.aggregateModules=true
+#sbt.runPreStep=true
+#sbt.targetFolder=
+
+#php.resolveDependencies=false
+#php.runPreStep=true
+#php.includeDevDependencies=true
+
+#html.resolveDependencies=false
+
+#cocoapods.resolveDependencies=false
+#cocoapods.runPreStep=true
+#cocoapods.ignoreSourceFiles=false
+
+#hex.resolveDependencies=false
+#hex.runPreStep=true
+#hex.ignoreSourceFiles=false
+#hex.aggregateModules=true
+
+##################################
+# Organization tokens:
+##################################
+apiKey=
+
+#userKey is required if WhiteSource administrator has enabled "Enforce user level access" option
+#userKey=
+
+projectName=
+projectVersion=
+projectToken=
+
+productName=
+productVersion=
+productToken=
+#updateType=APPEND
+#requesterEmail=user@provider.com
+
+#########################################################################################
+# Includes/Excludes Glob patterns - PLEASE USE ONLY ONE EXCLUDE LINE AND ONE INCLUDE LINE
+#########################################################################################
+includes=**/*.c **/*.cc **/*.cp **/*.cpp **/*.cxx **/*.c++ **/*.h **/*.hpp **/*.hxx **/*.go **/*.py
+
+#includes=**/*.m **/*.mm **/*.js **/*.php
+#includes=**/*.jar
+#includes=**/*.gem **/*.rb
+#includes=**/*.dll **/*.cs **/*.nupkg
+#includes=**/*.tgz **/*.deb **/*.gzip **/*.rpm **/*.tar.bz2
+#includes=**/*.zip **/*.tar.gz **/*.egg **/*.whl **/*.py
+
+## Exclude file extensions or specific directories by adding **/*.<extension> or **<excluded_dir>/**
+excludes=**/*sources.jar **/*javadoc.jar
+
+case.sensitive.glob=false
+followSymbolicLinks=true
+
+##################################
+# Archive properties
+##################################
+#archiveExtractionDepth=2
+#archiveIncludes=**/*.war **/*.ear
+#archiveExcludes=**/*sources.jar
+
+##################################
+# Proxy settings
+##################################
+#proxy.host=
+#proxy.port=
+#proxy.user=
+#proxy.pass=
+
+##################################
+# SCM settings
+##################################
+#scm.type=
+#scm.user=
+#scm.pass=
+#scm.ppk=
+#scm.url=
+#scm.branch=
+#scm.tag=
+#scm.npmInstall=
+#scm.npmInstallTimeoutMinutes=
+#scm.repositoriesFile=
+
+##############################################
+# SCAN MODE: Linux package manager settings
+##############################################
+#scanPackageManager=true
+
+##################################
+# SCAN MODE: Docker images
+##################################
+#docker.scanImages=true
+#docker.includes=.*.*
+#docker.excludes=
+#docker.pull.enable=true
+#docker.pull.images=.*.*
+#docker.pull.maxImages=10
+#docker.pull.tags=.*.*
+#docker.pull.digest=
+#docker.delete.force=true
+#docker.login.sudo=false
+
+#docker.aws.enable=true
+#docker.aws.registryIds=
+
+#docker.azure.enable=true
+#docker.azure.userName=
+#docker.azure.userPassword=
+#docker.azure.registryNames=
+
+##################################
+# SCAN MODE: Docker containers
+##################################
+#docker.scanContainers=true
+#docker.containerIncludes=.*.*
+#docker.containerExcludes=
+
+################################
+# Serverless settings
+################################
+#serverless.provider=
+#serverless.scanFunctions=true
+#serverless.includes=
+#serverless.excludes=
+#serverless.region=
+#serverless.maxFunctions=10
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index bc7c19bc0..37ca313aa 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -9,10 +9,21 @@ docker_compose_version: 1.17.1 glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c glide_version: v0.13.1 - golang_checksum: sha256:07d81c6b6b4c2dcf1b5ef7c27aaebd3691cdb40548500941f92b221147c5d9c7 golang_version: 1.9.1 tasks: + - name: "Checking for x86_64" + set_fact: + host_arch: "amd64" + golang_checksum: sha256:07d81c6b6b4c2dcf1b5ef7c27aaebd3691cdb40548500941f92b221147c5d9c7 + when: "'x86_64' in ansible_architecture" + + - name: "Checking for aarch64" + set_fact: + host_arch: "arm64" + golang_checksum: sha256:d31ecae36efea5197af271ccce86ccc2baf10d2e04f20d0fb75556ecf0614dad + when: "'aarch64' in ansible_architecture" + - name: 'Install Docker Compose {{docker_compose_version}}' command: curl -o /usr/local/bin/docker-compose -L "https://github.com/docker/compose/releases/download/{{docker_compose_version}}/docker-compose-Linux-x86_64" become: true @@ -24,14 +35,14 @@ - name: 'Install GoLang {{golang_version}}' block: - - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-amd64.tar.gz' + - name: 'Fetch golang {{golang_version}} to /tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz' get_url: - url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-amd64.tar.gz' - dest: '/tmp/go{{golang_version}}.linux-amd64.tar.gz' + url: 'https://storage.googleapis.com/golang/go{{golang_version}}.linux-{{host_arch}}.tar.gz' + dest: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz' checksum: '{{golang_checksum}}' - name: 'Install golang {{golang_version}} to /usr/local' unarchive: - src: '/tmp/go{{golang_version}}.linux-amd64.tar.gz' + src: '/tmp/go{{golang_version}}.linux-{{host_arch}}.tar.gz' dest: /usr/local remote_src: true become: true diff --git a/shell/apply-submodule-patch-oom.sh b/shell/apply-submodule-patch-oom.sh new file mode 100644 index 000000000..ad818fb80 --- /dev/null +++ b/shell/apply-submodule-patch-oom.sh @@ -0,0 +1,18 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2019 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## + +# Update kubernetes submodule under oom with patch to be verified + +echo '--> apply-submodule-patch-oom.sh' +cd kubernetes/${HELM_MODULE} +remote_path=`git remote -v | grep fetch | awk '{print $2}'` +git fetch ${remote_path} $GERRIT_REFSPEC && git cherry-pick FETCH_HEAD +cd ../.. |