diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml | 1 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-deployments.yaml | 3 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-cli.yaml | 56 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml | 3 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml (renamed from jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml) | 24 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml | 33 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml | 15 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml | 3 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 2 | ||||
| -rw-r--r-- | jjb/integration/integration-csit.yaml | 8 | ||||
| -rw-r--r-- | jjb/lf-infra-releasedockerhub.yaml | 68 | ||||
| -rwxr-xr-x | jjb/multicloud/build-multicloud-openstack-docker-image.sh | 2 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-hpa-csit.yaml | 14 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack.yaml | 23 | ||||
| -rw-r--r-- | jjb/so/so-libs.yaml | 5 | ||||
| -rw-r--r-- | jjb/so/so.yaml | 5 |
16 files changed, 193 insertions, 72 deletions
diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index e2d63007f..28cc673ab 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -6,6 +6,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk11 - 'elalto': branch: 'elalto' # apply to all jobs diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index cb0f944a3..18f6feffa 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/deployments' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml deleted file mode 100644 index 613ef12d3..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -- project: - name: dcaegen2-platform-cli - project-name: 'dcaegen2-platform-cli' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - project: 'dcaegen2/platform/cli' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' - # due to a strange macro / variable translation problem this needs - # to be passed as a string block to properly get the properties - # correctly defined in the job - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-platform-cli-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-cli-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform/cli - build-node: ubuntu1604-docker-8c-8g - project-name: 'dcaegen2-platform-cli' - branch: 'master' - mvn-settings: 'dcaegen2-platform-cli-settings' - -- project: - name: dcaegen2-platform-cli-info - project-name: dcaegen2-platform-cli - jobs: - - gerrit-info-yaml-verify - project: dcaegen2/platform/cli - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml index 3851bb6fc..4973e6dc1 100644 --- a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/deployment-handler' stream: - 'master': diff --git a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml index 22a68a2a0..859badcdc 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli-bp-gen.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-bpgenerator.yaml @@ -1,8 +1,8 @@ --- - project: - name: dcaegen2-platform-cli-bp-gen - project: 'dcaegen2/platform/cli' - project-name: 'dcaegen2-platform-cli' + name: dcaegen2-platform-mod-bpgenerator + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' @@ -12,20 +12,18 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - version-properties-file: 'blueprint-generator/version.properties' - mvn-pom: 'blueprint-generator/pom.xml' - mvn-params: '-f blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' + version-properties-file: 'mod/bpgenerator/version.properties' + mvn-pom: 'mod/bpgenerator/pom.xml' + mvn-params: '-f mod/bpgenerator/pom.xml' + pattern: 'mod/bpgenerator/**' subproject: - - 'blueprint-gen': - pom: 'blueprint-generator/pom.xml' - pattern: 'blueprint-generator/**' + - 'bpgenerator': + pom: 'mod/bpgenerator/pom.xml' + pattern: 'mod/bpgenerator/**' stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dcaegen2-platform-cli-settings' + mvn-settings: 'dcaegen2-platform-settings' maven-deploy-properties: | deployAtEnd=true files: '**' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml new file mode 100644 index 000000000..2402dd06c --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: dcaegen2-platform-mod-designtool + project-name: dcaegen2-platform-mod + # git repo + project: dcaegen2/platform + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' + subproject: + - designtool: + pom: 'mod/designtool/pom.xml' + pattern: 'mod/designtool/**' + stream: + - 'master': + branch: 'master' + mvn-settings: dcaegen2-platform-settings + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-docker-8c-8g + + +- project: + name: dcaegen2-platform-mod-designtool-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: dcaegen2/platform + build-node: ubuntu1604-docker-8c-8g + project-name: 'dcaegen2-platform-mod-designtool' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml index e476fbfeb..d94cb2758 100644 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml @@ -21,6 +21,20 @@ build-node: ubuntu1604-docker-8c-8g - project: + name: dcaegen2-platform-mod-genprocessor-sonar + jobs: + - gerrit-maven-sonar + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'dcaegen2/platform' + project-name: 'dcaegen2-platform-mod-genprocessor' + branch: 'master' + mvn-settings: 'dcaegen2-platform-settings' + mvn-params: '-f mod/genprocessor/pom.xml' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: name: dcaegen2-platform-mod-genprocessor-clm jobs: - gerrit-maven-clm @@ -31,3 +45,4 @@ mvn-params: '-f mod/genprocessor/pom.xml' branch: 'master' mvn-settings: 'dcaegen2-platform-settings' + diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml index a93fd571b..4d6da5365 100644 --- a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -6,7 +6,8 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dcaegen2/platform/policy-handler' stream: - 'master': diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 57f4a1ad7..05f266401 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -16,6 +16,8 @@ mvn-goals: 'clean package -P docker docker:build docker:push' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'dmaap/buscontroller' stream: diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index 5a0eedd61..8f8e0947f 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -15,3 +15,11 @@ - 'vCPE': trigger_jobs: robot-options: '' + +- project: + name: integration-csit-info + project-name: integration-csit + jobs: + - gerrit-info-yaml-verify + project: integration/csit + branch: master diff --git a/jjb/lf-infra-releasedockerhub.yaml b/jjb/lf-infra-releasedockerhub.yaml new file mode 100644 index 000000000..ca2ea85b0 --- /dev/null +++ b/jjb/lf-infra-releasedockerhub.yaml @@ -0,0 +1,68 @@ +--- +- builder: + name: lf-onap-releasedockerhub-macro + builders: + - shell: !include-raw-escape: + - ../shell/run_releasedockerhub.sh + ##- ../shell/run_releasedockerhub.sh "{org} {summary} {verbose} {copy}" + + +- job: + name: lf-onap-release-docker-hub + build-timeout: 90 + + project-type: freestyle + node: ubuntu1604-docker-8c-8g ## Probably don't need this much + disable-job: false + disabled: '{disable-job}' + + # Runs once a week + triggers: + - timed: '@weekly' + +# Define needed parameters for lf-infra-docker-login + parameters: + - string: + name: DOCKER_REGISTRY + default: 'nexus3.onap.org' + - string: + name: REGISTRY_PORTS + default: '10002' + - string: + name: DOCKERHUB_REGISTRY + default: 'docker.io' + +# Define needed parameters for lf-onap-releasedockerhub-macro + - string: + name: RELEASEDOCKERHUB_ORG + default: 'onap' + description: '' + - string: + name: RELEASEDOCKERHUB_REPO + default: '' + description: 'Only match repos that contains this string' + - string: + name: RELEASEDOCKERHUB_EXACT + default: '' + description: 'Repo has to exactly match RELEASEDOCKERHUB_REPO ' + - string: + name: RELEASEDOCKERHUB_SUMMARY + default: 'Yes' + description: 'Provides a brief statistic summary of what it found, and what it should do. Activate with Yes' + - string: + name: RELEASEDOCKERHUB_VERBOSE + default: '' + description: 'Provides a verbose output of the operations. Activate with Yes' + - string: + name: RELEASEDOCKERHUB_COPY + default: 'Yes' + description: 'If a copy operation should be done from Nexus3 to docker hub. Activate with Yes' + + + builders: + - lf-infra-pre-build ## shell/python-tools-install.sh + - lf-infra-docker-login: + global-settings-file: 'global-settings' + settings-file: 'onap-releasedockerhub-authz-settings' + - lf-onap-releasedockerhub-macro: + diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 8d8b72e07..472325a4d 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -10,9 +10,11 @@ chmod 755 ./pike/docker/*.* chmod 755 ./starlingx/docker/*.* #chmod 755 ./lenovo/docker/*.* chmod 755 ./fcaps/docker/*.* +chmod 755 ./hpa/docker/*.* ./windriver/docker/build_image.sh ./pike/docker/build_image.sh ./starlingx/docker/build_image.sh #./lenovo/docker/build_image.sh ./fcaps/docker/build_image.sh +./hpa/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-openstack-hpa-csit.yaml b/jjb/multicloud/multicloud-openstack-hpa-csit.yaml new file mode 100644 index 000000000..3972d6956 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-hpa-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: multicloud-openstack-hpa-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-hpa' + recipients: 'haibin.huang@intel.com' + stream: 'master' + functionality: + - 'functionality1': + trigger_jobs: 'multicloud-openstack-master-docker-java-version-shell-daily' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index eefdc7721..1df9046d3 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -52,6 +52,10 @@ # path: 'lenovo' # pattern: 'share/**' # pom: 'lenovo/pom.xml' + - 'hpa': + path: 'hpa' + pattern: 'hpa/**' + pom: 'hpa/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' @@ -199,6 +203,25 @@ # mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: + name: multicloud-openstack-hpa-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + cron: '@daily' + build-node: ubuntu1604-builder-4c-4g + project: 'multicloud/openstack' + project-name: 'multicloud-openstack-hpa' + branch: 'master' + mvn-params: '-f hpa/pom.xml' + 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: diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 8ad44cb8d..acc45f14d 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -30,6 +30,11 @@ name: so-libs-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' build-node: ubuntu1604-builder-4c-4g project: 'so/libs' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 9d7d894ce..4b63bf417 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -38,6 +38,11 @@ name: so-sonar jobs: - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" cron: '@daily' max-git-repo-age-hours: 48 build-node: ubuntu1604-builder-4c-4g |