diff options
Diffstat (limited to 'jjb')
43 files changed, 525 insertions, 193 deletions
diff --git a/jjb/ci-management/ci-management-macros.yaml b/jjb/ci-management/ci-management-macros.yaml deleted file mode 100644 index e79cf8a23..000000000 --- a/jjb/ci-management/ci-management-macros.yaml +++ /dev/null @@ -1,22 +0,0 @@ ---- -# vim: sw=2 ts=2 sts=2 et : -- builder: - name: packer-validate - builders: - - config-file-provider: - files: - - file-id: 'packer-cloud-env' - variable: 'CLOUDENV' - - shell: !include-raw: raw-include-packer-validate.sh - -- builder: - name: packer-build - builders: - - shell: | - cd packer - export PACKER_LOG="yes" - export PACKER_LOG_PATH="packer-build.log" - packer.io build -color=false \ - -var-file=$CLOUDENV \ - -var-file=vars/{platform}.json \ - templates/{template}.json diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 141731bc4..c1dea93fe 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -3,8 +3,6 @@ name: ci-management-jobs jobs: - '{project-name}-ci-jobs' - - '{project}-verify-packer' - - '{project}-merge-packer-{platforms}-{templates}' project: 'ci-management' project-name: 'ci-management' @@ -12,15 +10,25 @@ branch: 'master' build-timeout: '60' build-node: 'centos7-basebuild-2c-1g' + +- project: + name: packer-jobs + # packer jobs templates are defined in global-jjb + jobs: + - '{project-name}-packer-jobs' + project: 'ci-management' + project-name: 'ci-management' + branch: master + archive-artifacts: '**/*.log' + build-node: 'centos7-basebuild-2c-1g' platforms: - centos - ubuntu-16.04 - templates: - basebuild - docker + - memcached - redis - exclude: # only build the docker image on ubuntu at present - platforms: centos @@ -130,87 +138,3 @@ publishers: - infra-shiplogs: maven-version: '{maven-version}' - -- job-template: - name: '{project}-verify-packer' - project-type: freestyle - node: '{build-node}' - concurrent: true - - properties: - - infra-properties: - build-days-to-keep: 14 - - parameters: - - infra-parameters: - project: '{project}' - branch: 'master' - refspec: 'refs/heads/master' - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '{project}' - branch: 'master' - files: 'packer/**' - - builders: - - packer-validate - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' -- job-template: - name: '{project}-merge-packer-{platforms}-{templates}' - project-type: freestyle - node: '{build-node}' - concurrent: true - - properties: - - infra-properties: - build-days-to-keep: 14 - - parameters: - - infra-parameters: - project: '{project}' - branch: 'master' - refspec: 'refs/heads/master' - artifacts: '{archive-artifacts}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-merged: - server: '{server-name}' - project: '{project}' - branch: 'master' - files: 'packer/**' - - builders: - - packer-validate - - packer-build: - platform: '{platforms}' - template: '{templates}' - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' diff --git a/jjb/ci-management/raw-include-packer-validate.sh b/jjb/ci-management/raw-include-packer-validate.sh deleted file mode 100644 index 01984dd7a..000000000 --- a/jjb/ci-management/raw-include-packer-validate.sh +++ /dev/null @@ -1,19 +0,0 @@ -cd packer -varfiles="../packer/vars/*" -templates="../packer/templates/*" -provision="../packer/provision/*.sh" -for v in $varfiles; do - [[ "${v##*/}" =~ ^(cloud-env.*)$ ]] && continue - for t in $templates; do - export PACKER_LOG="yes" && \ - export PACKER_LOG_PATH="packer-validate-${v##*/}-${t##*/}.log" && \ - packer.io validate -var-file=$CLOUDENV \ - -var-file=$v $t - if [ $? -ne 0 ]; then - break - fi - done -done -for p in $provision; do - /bin/bash -n $p > provision-validate-${p##*/}.log 2>&1 -done diff --git a/jjb/clamp/clamp-csit.yaml b/jjb/clamp/clamp-csit.yaml new file mode 100644 index 000000000..9847abc12 --- /dev/null +++ b/jjb/clamp/clamp-csit.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: clamp-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'clamp' + stream: 'master' + functionality: + - 'TCA': + trigger_jobs: + - 'UIs': + trigger_jobs: + robot-options: '' + branch: 'master' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index d7685b963..896198f5e 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -11,13 +11,10 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - maven-properties: | - skip.docker.build=false - skip.docker.tag=false - skip.docker.push=false + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'deployment/docker/pom.xml' + mvn-goals: 'docker:build' + docker-image-name: 'onap/cli' project: 'cli' stream: diff --git a/jjb/dcaegen2/apod-analytics.yaml b/jjb/dcaegen2/apod-analytics.yaml index d79679018..ee00ef6b1 100644 --- a/jjb/dcaegen2/apod-analytics.yaml +++ b/jjb/dcaegen2/apod-analytics.yaml @@ -1,9 +1,9 @@ ---
- project:
- name: dcaegen2-analytics
+ name: dcaegen2-analytics-tca
# job template iterators
- project-name: 'dcaegen2-analytics'
+ project-name: 'dcaegen2-analytics-tca'
stream:
- 'master':
branch: 'master'
diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml new file mode 100644 index 000000000..64d98f15d --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-analytics + project-name: 'dcaegen2-analytics' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/analytics' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-analytics-settings' + # due to a strange macro / variable translation problem this needs + # to be passed as a string block to properly get the properties + # correctly defined in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml new file mode 100644 index 000000000..371b5e01d --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-collectors-snmptrap + project-name: 'dcaegen2-collectors-snmptrap' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/collectors/snmptrap' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-collectors-snmptrap-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: '' diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml new file mode 100644 index 000000000..74d9a243d --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-collectors-ves + project-name: 'dcaegen2-collectors-ves' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/collectors/ves' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-collectors-ves-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: '' diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml new file mode 100644 index 000000000..cc9fb1f51 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-collectors + project-name: 'dcaegen2-collectors' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/collectors' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-collectors-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: '' diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml new file mode 100644 index 000000000..1291c4dec --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-deployments + project-name: 'dcaegen2-deployments' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/deployments' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-deployments-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml new file mode 100644 index 000000000..616093089 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-blueprints.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-blueprints + project-name: 'dcaegen2-platform-blueprints' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/blueprints' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-blueprints-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml new file mode 100644 index 000000000..52e7ce37b --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-cdapbroker.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-cdapbroker + project-name: 'dcaegen2-platform-cdapbroker' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/cdapbroker' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-cdapbroker-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml new file mode 100644 index 000000000..f200bb1df --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -0,0 +1,21 @@ +--- +- 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' + 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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml new file mode 100644 index 000000000..bdc3c8b40 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-deployment-handler.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-deployment-handler + project-name: 'dcaegen2-platform-deployment-handler' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/deployment-handler' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-deployment-handler-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml new file mode 100644 index 000000000..67f3fe3f9 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-inventory-api + project-name: 'dcaegen2-platform-inventory-api' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/inventory-api' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-inventory-api-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-plugins.yaml b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml new file mode 100644 index 000000000..9d29b8318 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-plugins.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-plugins + project-name: 'dcaegen2-platform-plugins' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/plugins' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-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 in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml new file mode 100644 index 000000000..0104543f5 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-policy-handler.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-policy-handler + project-name: 'dcaegen2-platform-policy-handler' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/policy-handler' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-policy-handler-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml new file mode 100644 index 000000000..7aceae098 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform-servicechange-handler + project-name: 'dcaegen2-platform-servicechange-handler' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform/servicechange-handler' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-servicechange-handler-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: '' diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml new file mode 100644 index 000000000..b1830e6cd --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-platform + project-name: 'dcaegen2-platform' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/platform' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-platform-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: '' diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml new file mode 100644 index 000000000..594978ea8 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2-utils + project-name: 'dcaegen2-utils' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2/utils' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-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 in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml new file mode 100644 index 000000000..62d24bcc5 --- /dev/null +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: dcaegen2 + project-name: 'dcaegen2' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + + project: 'dcaegen2' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcaegen2-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: '' diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 4589c4f4c..6e8a84602 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -2,22 +2,21 @@ - project: name: dmaap-datarouter project-name: 'dmaap-datarouter' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'dmaap/datarouter/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + mvn-goals: 'clean install' project: 'dmaap/datarouter' stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dmaap-datarouter-settings' - subproject: - - 'datarouter-prov': - pom: 'datarouter-prov/pom.xml' - pattern: 'datarouter-prov/**' - mvn-goals: 'clean install' - - 'datarouter-node': - pom: 'datarouter-node/pom.xml' - pattern: 'datarouter-node/**' - mvn-goals: 'clean install' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index c1f6159d1..c6bec58ec 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -31,10 +31,17 @@ maven-version: '{maven-version}' scm: - - gerrit-trigger-scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '$GIT_BASE' refspec: '' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' + choosing-strategy: 'default' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true + submodule: + recursive: '{submodule-recursive}' wrappers: - infra-wrappers: @@ -103,13 +110,19 @@ - maven-exec: maven-version: '{maven-version}' - scm: - - gerrit-trigger-scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '$GIT_BASE' refspec: '' - choosing-strategy: 'gerrit' + choosing-strategy: 'default' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true submodule-recursive: '{submodule-recursive}' + wrappers: - infra-wrappers: build-timeout: '{build-timeout}' diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 2662ce4c4..f73f27328 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -11,6 +11,9 @@ build-artifact-days-to-keep: -1 build-artifact-num-to-keep: 5 + # lf-infra defaults + lftools-version: <1.0.0 + # default gerrit server definition server-name: 'Primary' gerrit-server-name: 'Primary' diff --git a/jjb/global-jjb b/jjb/global-jjb -Subproject 409ce6156aa5e7b6c24eaac6dc414c0f013983b +Subproject 0ee567bb454432e6e4ca1bc6f45431b68e95bad diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 454d056ef..826b6041d 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -109,6 +109,16 @@ # yamllint enable description: 'Maven selector to be used by shell scripts' +- parameter: + name: docker-image-name + parameters: + - string: + name: DOCKER_IMAGE_NAME + # yamllint disable rule:line-length + default: '{docker-image-name}' + # yamllint enable + description: 'Docker image name, e.g. onap/appc' + # PROPERTIES - property: name: infra-properties diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 21a227b27..23d74c6bc 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1342,6 +1342,7 @@ name: '{project-name}-{stream}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + docker-image-name: '' properties: - infra-properties: @@ -1355,6 +1356,8 @@ artifacts: '{archive-artifacts}' - maven-exec: maven-version: '{maven-version}' + - docker-image-name: + docker-image-name: '{docker-image-name}' scm: - gerrit-trigger-scm: diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh index 57a0264bb..df42fa7b9 100644..100755 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -20,40 +20,34 @@ RELEASE_VERSION_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$"; SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP}; STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP}; -if [[ $PROJECT =~ $SEARCH ]] ; then - REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai; - - docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG; - docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG; +# Set REPO_PATH variable - if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then - STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2); - docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - else - docker push $REPO_PATH:latest; - fi +if [ ! -z "$DOCKER_IMAGE_NAME" ]; then + REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME}; - docker push $REPO_PATH:$STAGING_TAG; - docker push $REPO_PATH:$SNAPSHOT_TAG; + # tag image with nexus3 proxy prefix + docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH +elif [[ $PROJECT =~ $SEARCH ]] ; then + REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai; else # Cut the prefix aai/ in example aai/model-loader DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-); REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME}; +fi - docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG; - docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG; - if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then - STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2); - docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - else - docker push $REPO_PATH:latest; - fi +docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG; +docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG; - docker push $REPO_PATH:$SNAPSHOT_TAG; - docker push $REPO_PATH:$STAGING_TAG; +if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then + STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2); + docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; + docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; +else + docker push $REPO_PATH:latest; fi + +docker push $REPO_PATH:$SNAPSHOT_TAG; +docker push $REPO_PATH:$STAGING_TAG; diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml new file mode 100644 index 000000000..3e88bf058 --- /dev/null +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: msb-swagger-sdk + project-name: 'msb-swagger-sdk' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + + project: 'msb/swagger-sdk' + stream: + - 'master': + branch: 'master' + mvn-settings: 'msb-swagger-sdk-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/multicloud/multicloud-csit.yaml b/jjb/multicloud/multicloud-csit.yaml new file mode 100644 index 000000000..44a69f548 --- /dev/null +++ b/jjb/multicloud/multicloud-csit.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: multicloud-csit + jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' + - '{project-name}-{stream}-csit-{functionality}' + project-name: 'multicloud-framework' + stream: 'master' + functionality: + - 'provision': + trigger_jobs: + - '{project-name}-{stream}-multivimbroker-merge-java' + robot-options: '' + branch: 'master' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml new file mode 100644 index 000000000..fa1911233 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -0,0 +1,20 @@ +--- +- project: + name: multicloud-openstack + project-name: 'multicloud-openstack' + project: 'multicloud/openstack' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-settings' + subproject: + - 'newton': + path: 'newton' + pattern: 'newton/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-memcached-4c-4g' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e657192b4..8ee95e674 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -4,13 +4,10 @@ project-name: 'policy-engine' jobs: - '{project-name}-{stream}-clm': - build-node: 'ubuntu1604-basebuild-4c-4g' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - build-node: 'ubuntu1604-basebuild-4c-4g' - '{project-name}-{stream}-stage-site-java': - build-node: 'ubuntu1604-basebuild-4c-4g' site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' @@ -21,6 +18,7 @@ mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' + build-node: 'ubuntu1604-basebuild-4c-4g' - project: name: policy-engine-release-1.0.0 project-name: 'policy-engine' diff --git a/jjb/portal/docker-build-deploy.sh b/jjb/portal/docker-build-deploy.sh index dd114af76..5e211fefc 100644 --- a/jjb/portal/docker-build-deploy.sh +++ b/jjb/portal/docker-build-deploy.sh @@ -3,5 +3,5 @@ echo $CURRENTDIR ls -ltr cd deliveries ls -ltr -chmod 755 *.* -./run.sh +chmod 755 *.sh +./build_portalapps_dockers.sh diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh index c3851dd48..d05190c26 100644 --- a/jjb/portal/docker-build-push.sh +++ b/jjb/portal/docker-build-push.sh @@ -3,5 +3,5 @@ echo $CURRENTDIR ls -ltr cd deliveries ls -ltr -chmod 755 *.* +chmod 755 *.sh ./os_docker_push.sh diff --git a/jjb/portal/docker-build-release.sh b/jjb/portal/docker-build-release.sh index 89a5fc131..0bbd2c8e4 100644 --- a/jjb/portal/docker-build-release.sh +++ b/jjb/portal/docker-build-release.sh @@ -3,5 +3,5 @@ echo $CURRENTDIR ls -ltr cd deliveries ls -ltr -chmod 755 *.* +chmod 755 *.sh ./os_docker_release.sh diff --git a/jjb/portal/portal-sdk.yaml b/jjb/portal/portal-sdk.yaml index 6839543ce..dc79848d6 100644 --- a/jjb/portal/portal-sdk.yaml +++ b/jjb/portal/portal-sdk.yaml @@ -19,6 +19,8 @@ stream: - 'master': branch: 'master' + - 'release-1.3.0': + branch: 'release-1.3.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml new file mode 100644 index 000000000..a5830d797 --- /dev/null +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: sdc-sdc-workflow-designer + project-name: 'sdc-sdc-workflow-designer' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + + project: 'sdc/sdc-workflow-designer' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-workflow-designer-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 022ee6b9a..c56617849 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -18,6 +18,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'ui-dmaapbc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml index c58f5bfa1..991848acb 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-gvnfm-vnflcm-settings' - build-node: ubuntu1604-redis-4c-4g + build-node: centos7-redis-4c-4g subproject: - 'lcm': path: 'lcm' diff --git a/jjb/vfc/vfc-nfvo-catalog.yaml b/jjb/vfc/vfc-nfvo-catalog.yaml index 834d2a898..2856dd649 100644 --- a/jjb/vfc/vfc-nfvo-catalog.yaml +++ b/jjb/vfc/vfc-nfvo-catalog.yaml @@ -18,4 +18,4 @@ - '{project-name}-{stream}-merge-java' files: '**' archive-artifacts: '' - build-node: ubuntu1604-redis-4c-4g
\ No newline at end of file + build-node: centos7-redis-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 8c38d48d2..ef5518732 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -10,11 +10,12 @@ mvn-settings: 'vfc-nfvo-driver-ems-settings'
subproject:
- 'drv-ems-boco':
- pom: 'ems/boco/pom.xml'
- pattern: 'ems/boco/**'
+ pom: 'ems/pom.xml'
+ pattern: 'ems/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml index 8ce9eb181..8fc3b9e1b 100644 --- a/jjb/vfc/vfc-nfvo-lcm-python.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' - build-node: ubuntu1604-redis-4c-4g + build-node: centos7-redis-4c-4g subproject: - 'lcm': path: '.' |